diff --git a/upload/static/avatar/avatar.js b/upload/static/avatar/avatar.js index 2da7e3ae3c5df6ef6f59f2359914b3443c29561a..c285660df29c27faa0072c776644206f8af49a85 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 d2a431e78118780d747929ba68d71c2d4f71068e..f80549d2836eddd4894a69a8890f5a46b577fd15 100644 --- a/upload/template/default/home/spacecp_avatar.htm +++ b/upload/template/default/home/spacecp_avatar.htm @@ -11,7 +11,7 @@
-
+

{lang current_my_space}

{lang setting_avatar_message}

@@ -49,7 +49,7 @@
diff --git a/upload/template/default/home/spacecp_avatar_body.htm b/upload/template/default/home/spacecp_avatar_body.htm index 07e15399a50fde4e21122aa7f461dfd932644dd8..884c178e24b4b0f64c94965ec4024361c69cf8cf 100644 --- a/upload/template/default/home/spacecp_avatar_body.htm +++ b/upload/template/default/home/spacecp_avatar_body.htm @@ -3,7 +3,7 @@
- +
@@ -11,13 +11,13 @@
- +
- +
@@ -35,7 +35,6 @@