From 4262f23fd2cc5be6380fb276fd75d079a397961b Mon Sep 17 00:00:00 2001
From: popcorner <351633+popcorner@user.noreply.gitee.com>
Date: Fri, 5 Feb 2021 17:53:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=B7=A5=E5=85=B7=E4=B8=8E=E5=8F=A6=E5=A4=96?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E7=9A=84jQuery=E6=9E=81=E6=98=93=E4=BA=A7?=
 =?UTF-8?q?=E7=94=9F=E5=86=B2=E7=AA=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upload/static/avatar/avatar.js                       | 9 +++++++--
 upload/template/default/home/spacecp_avatar.htm      | 4 ++--
 upload/template/default/home/spacecp_avatar_body.htm | 7 +++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/upload/static/avatar/avatar.js b/upload/static/avatar/avatar.js
index 2da7e3ae3..c285660df 100644
--- a/upload/static/avatar/avatar.js
+++ b/upload/static/avatar/avatar.js
@@ -1,4 +1,5 @@
-jQuery.noConflict();
+(function(){
+var jQuery = window.jQuery.noConflict(true);
 var dwidth = data[data.indexOf('width')+1];
 var dheight = data[data.indexOf('height')+1];
 jQuery('#avatardesigner').width(dwidth-20);
@@ -18,6 +19,9 @@ jQuery('#avatardisplaycanvas').attr('width', dwidth-20);
 jQuery('#avatardisplaycanvas').attr('height', dheight-25);
 $('avatarform').target ='uploadframe';
 $('avatarfile').onchange = uploadAvatarDone;
+$('avatarimage').onload = forceSelectorInsideAvatar;
+$('backfileselection').onclick = showAvatarFileSelector;
+$('avconfirm').onclick = saveAvatar;
 
 jQuery(document).ready(function () {
     jQuery("#selector")
@@ -301,4 +305,5 @@ function rectAvatarDone(res) {
     } else if (res == 'failure') {
         alert('上传失败');
     }
-}
\ No newline at end of file
+}
+})();
\ No newline at end of file
diff --git a/upload/template/default/home/spacecp_avatar.htm b/upload/template/default/home/spacecp_avatar.htm
index d2a431e78..f80549d28 100644
--- a/upload/template/default/home/spacecp_avatar.htm
+++ b/upload/template/default/home/spacecp_avatar.htm
@@ -11,7 +11,7 @@
 			</script>
 			<form id="avatarform" enctype="multipart/form-data" method="post" autocomplete="off" action="home.php?mod=spacecp&ac=avatar&ref">
 				<table cellspacing="0" cellpadding="0" class="tfm">
-					<caption>
+					<caption>
 						<span id="retpre" class="y xi2"></span>
 						<h2 class="xs2">{lang current_my_space}</h2>
 						<p>{lang setting_avatar_message}</p>
@@ -49,7 +49,7 @@
 	<script type="text/javascript">
 		var redirecturl = loadUserdata('avatar_redirect');
 		if(redirecturl) {
-			jQuery('retpre').innerHTML = '<a href="' + redirecturl + '">{lang previous_page}</a>';
+			document.getElementById('retpre').innerHTML = '<a href="' + redirecturl + '">{lang previous_page}</a>';
 		}
 	</script>
 	<div class="appl">
diff --git a/upload/template/default/home/spacecp_avatar_body.htm b/upload/template/default/home/spacecp_avatar_body.htm
index 07e15399a..884c178e2 100644
--- a/upload/template/default/home/spacecp_avatar_body.htm
+++ b/upload/template/default/home/spacecp_avatar_body.htm
@@ -3,7 +3,7 @@
 		<input type="file" name="Filedata" id="avatarfile" accept="image/*" />
 	</div>
 	<div id="avataradjuster">
-		<img id="avatarimage" style="visibility: hidden;" onload="forceSelectorInsideAvatar();" />
+		<img id="avatarimage" style="visibility: hidden;" />
 		<canvas id="avatarcanvas" style="position: absolute; top: 0px; left: 0px;"></canvas>
 		<div id="widgetparent" style="position: absolute; left: 0px; top: 0px;">
 			<div id="selector" class='ui-widget-content' style="position: absolute; width: 120px; height: 120px; overflow:hidden; cursor: move; border: 1px solid lightgrey; background-color: transparent; background-image: none;">
@@ -11,13 +11,13 @@
 		</div>
 		
 		<div class="backfileselectiondiv">
-				<input type="button" name="backfileselection" class="backfileselection" value="Select File" onclick="showAvatarFileSelector();" />
+				<input type="button" id="backfileselection" name="backfileselection" class="backfileselection" value="Select File" />
 		</div>
 		
 		<div id="slider" style="height: 0px; position: absolute; right: 9px; top: 105px; width: 100px;"></div>
 		
 		<div class="saveAvatardiv">
-			<input type="submit" name="confirm" value="{lang confirms}" class="saveAvatar" style="" onclick="saveAvatar();" />
+			<input type="submit" id="avconfirm" name="confirm" value="{lang confirms}" class="saveAvatar" style="" />
 		</div>
 		
 		<input type="hidden" id="avatar1" name="avatar1" />
@@ -35,7 +35,6 @@
 
 <script src="{STATICURL}js/mobile/jquery.min.js?{VERHASH}"></script>
 <script type="text/javascript">
-	jQuery.noConflict();
 	var data = "{echo implode(",", $uc_avatarflash);}".split(',');
 </script>
 
-- 
Gitee