Merge branch 'szzh' into develop

public/javascripts/avatars.js

@@ -2,7 +2,10 @@
    Copyright (C) 2006-2013  Jean-Philippe Lang 
    Modified by Jianfeng Tao, to upload one avatar for user*/
 
-function addFile(inputEl, file, eagerUpload) {
+
+(function(){
+
+    function addFile(inputEl, file, eagerUpload) {
 
         var fileSpan = $('#avatar_file');
 
@@ -16,9 +19,9 @@ function addFile(inputEl, file, eagerUpload) {
         }
 
         return 1;
-}
+    }
 
-function ajaxUpload(file, fileSpan, inputEl) {
+    function ajaxUpload(file, fileSpan, inputEl) {
 
         function onLoadstart(e) {
             fileSpan.removeClass('ajax-waiting');
@@ -70,16 +73,16 @@ function ajaxUpload(file, fileSpan, inputEl) {
             actualUpload(file, fileSpan, inputEl);
         else
             $(inputEl).parents('form').queue('upload', actualUpload.bind(this, file, fileSpan, inputEl));
-}
+    }
 
-ajaxUpload.uploading = 0;
+    ajaxUpload.uploading = 0;
 
-function removeFile() {
+    function removeFile() {
         $(this).parent('span').remove();
         return false;
-}
+    }
 
-function uploadBlob(blob, uploadUrl, source_type,source_id, options) {
+    function uploadBlob(blob, uploadUrl, source_type,source_id, options) {
 
         var actualOptions = $.extend({
             loadstartEventHandler: $.noop,
@@ -107,9 +110,9 @@ function uploadBlob(blob, uploadUrl, source_type,source_id, options) {
             cache: false,
             processData: false
         });
-}
+    }
 
-function addInputAvatar(inputEl) {
+    window.addInputAvatar = function(inputEl) {
 //  var clearedFileInput = $(inputEl).clone().val('');
 
         if (inputEl.files) {
@@ -127,10 +130,9 @@ function addInputAvatar(inputEl) {
         }
 
         //clearedFileInput.insertAfter('#avatars_fields');
-}
+    }
-
 
-function uploadAndAttachFiles(files, inputEl) {
+    function uploadAndAttachFiles(files, inputEl) {
 
         var maxFileSize = $(inputEl).data('max-file-size');
         var maxFileSizeExceeded = $(inputEl).data('max-file-size-message');
@@ -145,9 +147,9 @@ function uploadAndAttachFiles(files, inputEl) {
             uploadAndTypeFiles(files,inputEl);
             //$.each(files, function() {addFile(inputEl, this, true);});
         }
-}
+    }
 
-function uploadAndTypeFiles(files, inputEl) {
+    function uploadAndTypeFiles(files, inputEl) {
 
         var enableType = $(inputEl).data('file-type');
         var typeSupportrdMessage = $(inputEl).data('type-support-message');
@@ -168,29 +170,32 @@ function uploadAndTypeFiles(files, inputEl) {
         } else {
             window.alert(typeSupportrdMessage + enableType);
         }
-}
+    }
+
 
-function handleFileDropEvent(e) {
 
+
+    function handleFileDropEvent(e) {
         $(this).removeClass('fileover');
         blockEventPropagation(e);
 
         if ($.inArray('Files', e.dataTransfer.types) > -1) {
             uploadAndAttachFiles(e.dataTransfer.files, $('input:file.file_selector'));
         }
-}
+    }
 
-function dragOverHandler(e) {
+    function dragOverHandler(e) {
         $(this).addClass('fileover');
         blockEventPropagation(e);
-}
+    }
 
-function dragOutHandler(e) {
+    function dragOutHandler(e) {
         $(this).removeClass('fileover');
         blockEventPropagation(e);
-}
+    }
 
-function setupFileDrop() {
+    function setupFileDrop() {
+        console.log("setupFileDrop");
         $('#avatar_image').on('click', function(){
             console.log("click");
         });
@@ -206,6 +211,8 @@ function setupFileDrop() {
                 });
             });
         }
-}
+    }
+
+    $(document).ready(setupFileDrop);
+})();
 
-$(document).ready(setupFileDrop);