From 07110d25804af240bd4c8f3eab0138d66cce8d0a Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Tue, 1 Aug 2017 12:19:23 +0800
Subject: [PATCH] Fix adding event listener using jQuery

---
 resources/assets/src/js/skinlib/upload.js | 24 +++++++++++------------
 resources/assets/src/js/user/player.js    | 24 ++++++++++-------------
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/resources/assets/src/js/skinlib/upload.js b/resources/assets/src/js/skinlib/upload.js
index 85120ba9..3a6c7acc 100644
--- a/resources/assets/src/js/skinlib/upload.js
+++ b/resources/assets/src/js/skinlib/upload.js
@@ -2,18 +2,18 @@
 
 'use strict';
 
-$('#private').on('ifToggled', function () {
-    $(this).prop('checked') ? $('#msg').show() : $('#msg').hide();
-});
-
-$('#type-skin').on('ifToggled', function () {
-    $(this).prop('checked') ? $('#skin-type').show() : $('#skin-type').hide();
-});
-
-$('body').on('change', '#file', () => handleFiles()).on('ifToggled', '#type-cape', () => {
-    MSP.clear();
-    handleFiles();
-});
+$('body')
+    .on('change', '#file', () => handleFiles())
+    .on('ifToggled', '#type-cape', () => {
+        MSP.clear();
+        handleFiles();
+    })
+    .on('ifToggled', '#type-skin', function () {
+        $(this).prop('checked') ? $('#skin-type').show() : $('#skin-type').hide();
+    })
+    .on('ifToggled', '#private', function () {
+        $(this).prop('checked') ? $('#msg').show() : $('#msg').hide();
+    });
 
 // Real-time preview
 function handleFiles(files, type) {
diff --git a/resources/assets/src/js/user/player.js b/resources/assets/src/js/user/player.js
index 7931355e..6158972a 100644
--- a/resources/assets/src/js/user/player.js
+++ b/resources/assets/src/js/user/player.js
@@ -7,10 +7,17 @@ $('body').on('click', '.player', function () {
     $(this).addClass('player-selected');
 
     showPlayerTexturePreview(this.id);
-});
-
-$('body').on('click', '#preview-switch', () => {
+}).on('click', '#preview-switch', () => {
     TexturePreview.previewType == '3D' ? TexturePreview.show2dPreview() : TexturePreview.show3dPreview();
+}).on('change', '#preference', function () {
+    fetch({
+        type: 'POST',
+        url: url('user/player/preference'),
+        dataType: 'json',
+        data: { pid: $(this).attr('pid'), preference: $(this).val() }
+    }).then(({ errno, msg }) => {
+        (errno == 0) ? toastr.success(msg) : toastr.warning(msg);
+    }).catch(err => showAjaxError(err));
 });
 
 function showPlayerTexturePreview(pid) {
@@ -44,17 +51,6 @@ function showPlayerTexturePreview(pid) {
     }).catch(err => showAjaxError(err));
 }
 
-$('body').on('change', '#preference', function () {
-    fetch({
-        type: 'POST',
-        url: url('user/player/preference'),
-        dataType: 'json',
-        data: { pid: $(this).attr('pid'), preference: $(this).val() }
-    }).then(({ errno, msg }) => {
-        (errno == 0) ? toastr.success(msg) : toastr.warning(msg);
-    }).catch(err => showAjaxError(err));
-});
-
 function changePlayerName(pid) {
     let newPlayerName = '';
     const $playerName = $(`td:contains("${pid}")`).next();