From c59c448e57c051372bee3a4ee5540b60b404957e Mon Sep 17 00:00:00 2001
From: unknown <martinlo@DSTIBPICO34243F.stations.paris.mdp>
Date: Thu, 16 Jun 2016 14:57:30 +0200
Subject: [PATCH 1/4] Improvement of plugin to work in back office,
 modification of  data displaying

---
 webapp/WEB-INF/plugins/asynchronousupload.xml |  15 +
 .../skin/plugins/asynchronousupload/main.js   | 324 +++++++++---------
 2 files changed, 177 insertions(+), 162 deletions(-)

diff --git a/webapp/WEB-INF/plugins/asynchronousupload.xml b/webapp/WEB-INF/plugins/asynchronousupload.xml
index e300170..5f2b39f 100644
--- a/webapp/WEB-INF/plugins/asynchronousupload.xml
+++ b/webapp/WEB-INF/plugins/asynchronousupload.xml
@@ -38,4 +38,19 @@
 <!--         <javascript-file>asynchronousupload/jquery.fileupload-video.js</javascript-file> -->
         <javascript-file>asynchronousupload/jquery.fileupload-validate.js</javascript-file>
     </javascript-files>
+	
+	<admin-javascript-files>
+        <admin-javascript-file>js/plugins/asynchronousupload/vendor/jquery.ui.widget.js</admin-javascript-file>
+        <admin-javascript-file>js/plugins/asynchronousupload/jquery.iframe-transport.js</admin-javascript-file>
+        <admin-javascript-file>js/plugins/asynchronousupload/load-image.min.js</admin-javascript-file> 
+        <admin-javascript-file>js/plugins/asynchronousupload/jquery.fileupload.js</admin-javascript-file>
+        <admin-javascript-file>js/plugins/asynchronousupload/jquery.fileupload-process.js</admin-javascript-file>
+        <admin-javascript-file>js/plugins/asynchronousupload/jquery.fileupload-image.js</admin-javascript-file>
+        <admin-javascript-file>js/plugins/asynchronousupload/canvas-to-blob.min.js</admin-javascript-file>
+<!--         <admin-javascript-file>js/plugins/asynchronousupload/jquery.fileupload-audio.js</admin-javascript-file> -->
+<!--         <admin-javascript-file>js/plugins/asynchronousupload/jquery.fileupload-video.js</admin-javascript-file> -->
+	<admin-javascript-file>js/plugins/asynchronousupload/jquery.fileupload-validate.js</admin-javascript-file>
+    </admin-javascript-files>
+	
+    
 </plug-in>
\ No newline at end of file
diff --git a/webapp/WEB-INF/templates/skin/plugins/asynchronousupload/main.js b/webapp/WEB-INF/templates/skin/plugins/asynchronousupload/main.js
index 68d1e40..7ac30e4 100644
--- a/webapp/WEB-INF/templates/skin/plugins/asynchronousupload/main.js
+++ b/webapp/WEB-INF/templates/skin/plugins/asynchronousupload/main.js
@@ -10,212 +10,212 @@
  */
 
 /* global $, window */
+Array.prototype.contains = function (object){
+    
+  for(i in this){
+      if(this[i] == object){
+          return true;
+      }
+  }
+  return false;
+}
+if(typeof(handlerList)==='undefined'){
+handlerList=[]    
+}
 
+if (!handlerList.contains('${handler_name}')){
+    
+    handlerList.push('${handler_name}');
+    
 $(function () {
-    'use strict';
-
-    var uploadButton = $('<button/>')
-    .addClass('btn btn-primary')
-    .prop('disabled', true)
-    .text('Processing...')
-    .on('click', function () {
+'use strict';
+        var uploadButton = $('<button/>')
+        .addClass('btn btn-primary')
+        .prop('disabled', true)
+        .text('Processing...')
+        .on('click', function () {
         var $this = $(this),
-            data = $this.data();
-        $this
-            .off('click')
-            .text('Abort')
-            .on('click', function () {
+                data = $this.data();
+                $this
+                .off('click')
+                .text('Abort')
+                .on('click', function () {
                 $this.remove();
-                data.abort();
-            });
-        data.submit().always(function () {
-            $this.remove();
+                        data.abort();
+                });
+                data.submit().always(function () {
+        $this.remove();
         });
-    });
-    
-    // Initialize the jQuery File Upload widget:
-	$(document).on('click','.${handler_name}${fieldname}', {} ,function() {
-    	$(this).fileupload({
-    			// Uncomment the following to send cross-domain cookies:
-    			//xhrFields: {withCredentials: true},
-    			dataType: 'json',
-    			url: '${base_url}${upload_url}',
-    			disableImageResize: /Android(?!.*Chrome)|Opera/
-        		.test(window.navigator && navigator.userAgent),
-    			imageMaxWidth: ${imageMaxWidth},
-    			imageMaxHeight: ${imageMaxHeight},
-    			previewMaxWidth: ${previewMaxWidth},
-    			previewMaxHeight: ${previewMaxHeight},
-    			imageCrop: false, // Force cropped images
-    			dropZone: $(this),
-    			maxFileSize: ${maxFileSize},
-    			formData: [{name:'fieldname',value:$(this)[0].name}, {name:'asynchronousupload.handler', value:'${handler_name}'}],
-    			messages: {
-    		        maxFileSize: "#i18n{asynchronousupload.error.fileTooLarge}",
-			
-    		    }
-    	    }).on('fileuploadprocessalways', function (e, data) {
-    	        var index = data.index,
-    	            file = data.files[index],
-    	            fieldName = data.formData[0].value;
+        });
+        // Initialize the jQuery File Upload widget:
+        $(document).on('click', '.${handler_name}${fieldname}', {}, function() {
+$(this).fileupload({
+// Uncomment the following to send cross-domain cookies:
+//xhrFields: {withCredentials: true},
+dataType: 'json',
+        url: '${base_url}${upload_url}',
+        disableImageResize: /Android(?!.*Chrome)|Opera/
+        .test(window.navigator && navigator.userAgent),
+        imageMaxWidth: ${imageMaxWidth},
+        imageMaxHeight: ${imageMaxHeight},
+        previewMaxWidth: ${previewMaxWidth},
+        previewMaxHeight: ${previewMaxHeight},
+        imageCrop: false, // Force cropped images
+        dropZone: $(this),
+        maxFileSize: ${maxFileSize},
+        formData: [{name:'fieldname', value:$(this)[0].name}, {name:'asynchronousupload.handler', value:'${handler_name}'}],
+        messages: {
+        maxFileSize: "#i18n{asynchronousupload.error.fileTooLarge}",
+        }
+}).on('fileuploadprocessalways', function (e, data) {
+var index = data.index,
+        file = data.files[index],
+        fieldName = data.formData[0].value;
 //    	        if (file.preview) {
 //    	            node
 //    	                .prepend('<br>')
 //    	                .prepend(file.preview);
 //    	        }
-    	        if (file.error) {
-    	        	updateErrorBox( file.error, fieldName )
-    	        }
+        if (file.error) {
+updateErrorBox(file.error, fieldName)
+}
 //    	        if (index + 1 === data.files.length) {
 //    	            data.context.find('button')
 //    	                .text('Upload')
 //    	                .prop('disabled', !!data.files.error);
 //    	        }
-    	    }).on('fileuploadprogressall', function (e, data) {
-    	        var progress = parseInt(data.loaded / data.total * 100, 10);
-    	        var fieldName = this.name;
-    	        var bar = $(' #progress-bar_' + fieldName);
-    	        bar.html( progress + '%'  );
-    	        bar.css( 'width', progress + '%' );
-    	         	        
-    	        $(' #progress_' + fieldName).show( );
-    	        
-    	        if ( progress >= 100 )
-    	        {
-    	        	$(' #progress_' + fieldName).hide();
-    	        }
-    	    }).on('fileuploaddone', function (e, data) {
-    	    	formDisplayUploadedFiles${fieldname}( data.result, data.files, '${checkBoxPrefix}' );
-    	    }).on('fileuploadfail', function (e, data) {
-    	    	var fieldName = data.formData[0].value;
-    	    	updateErrorBox( 'Une erreur est survenue lors de l\'upload du fichier', fieldName );
-    	    	$(' #progress_' + fieldName).hide();
-    	    }).prop('disabled', !$.support.fileInput)
-    	        .parent().addClass($.support.fileInput ? undefined : 'disabled');
-    	this.parentNode.className=this.parentNode.className + ' fileinput-button';
-    	
-    	var jsonData = {"fieldname":this.name, "asynchronousupload.handler":"${handler_name}"};
-    	
-    	$.getJSON('${base_url}jsp/site/plugins/asynchronousupload/DoRemoveFile.jsp', jsonData,
-    			function(json) {
-    				formDisplayUploadedFiles${fieldname}(json, null, '${checkBoxPrefix}');
-    			}
-    		);
-    });
-    
-    $('[name^="${submitPrefix}"]').click(function(event) {
-		event.preventDefault( );
-	});
-
-    // prevent user from quitting the page before his upload ended.    
-    $(document).on('click','[name^="${deletePrefix}"]', {} ,function() {
-        var fieldName = this.name.match("${deletePrefix}(.*)")[1];
-    	removeFile${checkBoxPrefix}(fieldName, '${handler_name}', '${base_url}');
-    	event.preventDefault( );
-    });
-    
+}).on('fileuploadprogressall', function (e, data) {
+var progress = parseInt(data.loaded / data.total * 100, 10);
+        var fieldName = this.name;
+        var bar = $(' #progress-bar_' + fieldName);
+        bar.html(progress + '%');
+        bar.css('width', progress + '%');
+        $(' #progress_' + fieldName).show();
+        if (progress >= 100)
+{
+$(' #progress_' + fieldName).hide();
+}
+}).on('fileuploaddone', function (e, data) {
+formDisplayUploadedFiles${fieldname}(data.result, data.files, '${checkBoxPrefix}');
+}).on('fileuploadfail', function (e, data) {
+var fieldName = data.formData[0].value;
+        updateErrorBox('Une erreur est survenue lors de l\'upload du fichier', fieldName);
+        $(' #progress_' + fieldName).hide();
+}).prop('disabled', !$.support.fileInput)
+        .parent().addClass($.support.fileInput ? undefined : 'disabled');
+        this.parentNode.className = this.parentNode.className + ' fileinput-button';
+        var jsonData = {"fieldname":this.name, "asynchronousupload.handler":"${handler_name}"};
+        $.getJSON('${base_url}jsp/site/plugins/asynchronousupload/DoRemoveFile.jsp', jsonData,
+                function(json) {
+                formDisplayUploadedFiles${fieldname}(json, null, '${checkBoxPrefix}');
+                }
+        );
+});
+        $('[name^="${submitPrefix}"]').click(function(event) {
+event.preventDefault();
+});
+        // prevent user from quitting the page before his upload ended.    
+        $(document).on('click', '[name^="${deletePrefix}"]', {}, function(event) {
+var fieldName = this.name.match("${deletePrefix}(.*)")[1];
+        removeFile${checkBoxPrefix}(fieldName, '${handler_name}', '${base_url}');
+        event.preventDefault();
 });
+    });
+        }
 
 /**
  * Sets the files list
  * @param jsonData data
  */
-function formDisplayUploadedFiles${fieldname}( jsonData, files, cbPrefix )
-{
-	// create the div
-	var fieldName = jsonData.field_name;
-	
-	updateErrorBox(jsonData.form_error, fieldName);
-	
-	if ( fieldName != null )
-	{
-		if ( jsonData.fileCount == 0 ){
-			// no file uploaded, hiding content
+function formDisplayUploadedFiles${fieldname}(jsonData, files, cbPrefix)
+        {
+        // create the div
+        var fieldName = jsonData.field_name;
+                updateErrorBox(jsonData.form_error, fieldName);
+                if (fieldName != null)
+        {
+        if (jsonData.fileCount == 0){
+        // no file uploaded, hiding content
 //			$("#_file_deletion_" + fieldName ).hide(  );
-			$("#_file_deletion_label_" + fieldName ).hide(  );
+        $("#_file_deletion_label_" + fieldName).hide();
 //			$("#_file_deletion_button_" + fieldName ).hide(  );
-		} else {
+        } else {
 
-			var strContent = "";
-			var checkboxPrefix = cbPrefix + fieldName;
-			
-			// jsonData.uploadedFiles.length is str length when file count is 1 so using fileCount instead.
-			// so if jsonData.fileCount == 1, the index should not be used
-			for ( var index = 0; index < jsonData.fileCount; index++ )
-			{
+        var strContent = "";
+                var checkboxPrefix = cbPrefix + fieldName;
+                // jsonData.uploadedFiles.length is str length when file count is 1 so using fileCount instead.
+                // so if jsonData.fileCount == 1, the index should not be used
+                for (var index = 0; index < jsonData.fileCount; index++)
+        {
 //				if ( jsonData.files[index].is_new )
 //				{
 
-					strContent = strContent + "<div class=\"checkbox\" id=\"_file_uploaded_" + fieldName + index + "\"><label class=\"col-xs-12 col-sm-12 col-md-12 col-lg-12\">  \
+        strContent = strContent + "<div class=\"col-xs-12 col-sm-12 col-md-12 col-lg-12\">" +((((jsonData.fileCount == 1)&&(jsonData.files.preview!=""))||((jsonData.fileCount > 1)&&(jsonData.files[index].preview!=""))) ? " <img src=" + "'" + ((jsonData.fileCount == 1) ? jsonData.files.preview : jsonData.files[index].preview) + "'" + "alt='' " + " width='${previewMaxWidth}' height='${previewMaxHeight}'/>" : "" )+"</div>" + "<label class=\"col-xs-12 col-sm-12 col-md-12 col-lg-12\">  \
 								<input type=\"checkbox\"  \
 									name=\"" + checkboxPrefix + index + "\"  \
 									id=\"" + checkboxPrefix + index + "\"  \
 								/>  \
-								&#160;" + ( (jsonData.fileCount == 1) ? jsonData.files.name : jsonData.files[index].name ) + 
-							"</label></div><div class=\"col-xs-12 col-sm-12 col-md-12 col-lg-12\">"+" <img src="+"'"+ ( (jsonData.fileCount == 1) ? jsonData.files.preview : jsonData.files[index].preview )+"'"+"alt='' "+" width='${previewMaxWidth}' height='${previewMaxHeight}'/></div>";
+								&#160;" + ((jsonData.fileCount == 1) ? jsonData.files.name : jsonData.files[index].name) +" </label></div>";
 //				}
 //				else if ( jsonData.files[index].is_removed )
 //				{
 //					$('#_file_uploaded_' + fieldName + index).remove();
 //				}
-			}
+        }
 
-			$("#_file_deletion_" + fieldName ).html( strContent );
-			// show the hidden div (if not already)
+        $("#_file_deletion_" + fieldName).html(strContent);
+                // show the hidden div (if not already)
 //			$("#_file_deletion_" + fieldName ).show(  );
-			$("#_file_deletion_label_" + fieldName ).show(  );
+                $("#_file_deletion_label_" + fieldName).show();
 //			$("#_file_deletion_button_" + fieldName ).show(  );
-		}
-	}
-}
+        }
+        }
+        }
 
 /**
  * Removes a file
  * @param action the action button name
  */
-function removeFile${checkBoxPrefix}( fieldName, handlerName, baseUrl ) {
-	// build indexes to remove
-	var strIndexes = '';
-	
-	var indexesCount = 0;
-	var checkboxPrefix = '${checkBoxPrefix}' + fieldName;
-	$('[name^="' + checkboxPrefix + '"]:checked' ).each( function() {
-		if (this.checked)
-		{
-			if ( indexesCount > 0 )
-			{
-				strIndexes = strIndexes + ",";
-			}
-			indexesCount++;
-			var index = this.name.match( checkboxPrefix + "(\\d+)")[1];
-			strIndexes = strIndexes + index;
-		}
-	});
-	
-	if ( !indexesCount )
-	{
-		return;
-	}
-	
-	var jsonData = {"fieldname":fieldName, "asynchronousupload.handler":handlerName, "field_index": strIndexes};
-	
-	$.getJSON(baseUrl + 'jsp/site/plugins/asynchronousupload/DoRemoveFile.jsp', jsonData,
-		function(json) {
-			formDisplayUploadedFiles${fieldname}(json, null, '${checkBoxPrefix}');
-		}
-	);
+function removeFile${checkBoxPrefix}(fieldName, handlerName, baseUrl) {
+// build indexes to remove
+var strIndexes = '';
+        var indexesCount = 0;
+        var checkboxPrefix = '${checkBoxPrefix}' + fieldName;
+        $('[name^="' + checkboxPrefix + '"]:checked').each(function() {
+if (this.checked)
+{
+if (indexesCount > 0)
+{
+strIndexes = strIndexes + ",";
 }
-
-function updateErrorBox( errorMessage, fieldName )
+indexesCount++;
+        var index = this.name.match(checkboxPrefix + "(\\d+)")[1];
+        strIndexes = strIndexes + index;
+}
+});
+        if (!indexesCount)
 {
-	if ( errorMessage != null && errorMessage != '' )
-	{
-		var strContent = '<span class="text-danger">' + errorMessage + '</span>'
-		$( '#_file_error_box_' + fieldName ).html( strContent );
-		$( '#_file_error_box_' + fieldName ).show( );
-	}
-	else
-	{
-		$( '#_file_error_box_' + fieldName ).hide( );
-	}
+return;
 }
+
+var jsonData = {"fieldname":fieldName, "asynchronousupload.handler":handlerName, "field_index": strIndexes};
+        $.getJSON(baseUrl + 'jsp/site/plugins/asynchronousupload/DoRemoveFile.jsp', jsonData,
+                function(json) {
+                formDisplayUploadedFiles${fieldname}(json, null, '${checkBoxPrefix}');
+                }
+        );
+        }
+
+function updateErrorBox(errorMessage, fieldName)
+        {
+        if (errorMessage != null && errorMessage != '')
+        {
+        var strContent = '<span class="text-danger">' + errorMessage + '</span>'
+                $('#_file_error_box_' + fieldName).html(strContent);
+                $('#_file_error_box_' + fieldName).show();
+        }
+        else
+        {
+        $('#_file_error_box_' + fieldName).hide();
+        }
+        }

From e58028b3f483a32b753325a673256292e6515b23 Mon Sep 17 00:00:00 2001
From: unknown <martinlo@DSTIBPICO34243F.stations.paris.mdp>
Date: Thu, 16 Jun 2016 15:43:57 +0200
Subject: [PATCH 2/4] Restore previous version of main.js file

---
 .../skin/plugins/asynchronousupload/main.js   | 326 +++++++++---------
 1 file changed, 163 insertions(+), 163 deletions(-)

diff --git a/webapp/WEB-INF/templates/skin/plugins/asynchronousupload/main.js b/webapp/WEB-INF/templates/skin/plugins/asynchronousupload/main.js
index 7ac30e4..5553622 100644
--- a/webapp/WEB-INF/templates/skin/plugins/asynchronousupload/main.js
+++ b/webapp/WEB-INF/templates/skin/plugins/asynchronousupload/main.js
@@ -10,212 +10,212 @@
  */
 
 /* global $, window */
-Array.prototype.contains = function (object){
-    
-  for(i in this){
-      if(this[i] == object){
-          return true;
-      }
-  }
-  return false;
-}
-if(typeof(handlerList)==='undefined'){
-handlerList=[]    
-}
 
-if (!handlerList.contains('${handler_name}')){
-    
-    handlerList.push('${handler_name}');
-    
 $(function () {
-'use strict';
-        var uploadButton = $('<button/>')
-        .addClass('btn btn-primary')
-        .prop('disabled', true)
-        .text('Processing...')
-        .on('click', function () {
+    'use strict';
+
+    var uploadButton = $('<button/>')
+    .addClass('btn btn-primary')
+    .prop('disabled', true)
+    .text('Processing...')
+    .on('click', function () {
         var $this = $(this),
-                data = $this.data();
-                $this
-                .off('click')
-                .text('Abort')
-                .on('click', function () {
+            data = $this.data();
+        $this
+            .off('click')
+            .text('Abort')
+            .on('click', function () {
                 $this.remove();
-                        data.abort();
-                });
-                data.submit().always(function () {
-        $this.remove();
+                data.abort();
+            });
+        data.submit().always(function () {
+            $this.remove();
         });
-        });
-        // Initialize the jQuery File Upload widget:
-        $(document).on('click', '.${handler_name}${fieldname}', {}, function() {
-$(this).fileupload({
-// Uncomment the following to send cross-domain cookies:
-//xhrFields: {withCredentials: true},
-dataType: 'json',
-        url: '${base_url}${upload_url}',
-        disableImageResize: /Android(?!.*Chrome)|Opera/
-        .test(window.navigator && navigator.userAgent),
-        imageMaxWidth: ${imageMaxWidth},
-        imageMaxHeight: ${imageMaxHeight},
-        previewMaxWidth: ${previewMaxWidth},
-        previewMaxHeight: ${previewMaxHeight},
-        imageCrop: false, // Force cropped images
-        dropZone: $(this),
-        maxFileSize: ${maxFileSize},
-        formData: [{name:'fieldname', value:$(this)[0].name}, {name:'asynchronousupload.handler', value:'${handler_name}'}],
-        messages: {
-        maxFileSize: "#i18n{asynchronousupload.error.fileTooLarge}",
-        }
-}).on('fileuploadprocessalways', function (e, data) {
-var index = data.index,
-        file = data.files[index],
-        fieldName = data.formData[0].value;
+    });
+    
+    // Initialize the jQuery File Upload widget:
+	$(document).on('click','.${handler_name}${fieldname}', {} ,function() {
+    	$(this).fileupload({
+    			// Uncomment the following to send cross-domain cookies:
+    			//xhrFields: {withCredentials: true},
+    			dataType: 'json',
+    			url: '${base_url}${upload_url}',
+    			disableImageResize: /Android(?!.*Chrome)|Opera/
+        		.test(window.navigator && navigator.userAgent),
+    			imageMaxWidth: ${imageMaxWidth},
+    			imageMaxHeight: ${imageMaxHeight},
+    			previewMaxWidth: ${previewMaxWidth},
+    			previewMaxHeight: ${previewMaxHeight},
+    			imageCrop: false, // Force cropped images
+    			dropZone: $(this),
+    			maxFileSize: ${maxFileSize},
+    			formData: [{name:'fieldname',value:$(this)[0].name}, {name:'asynchronousupload.handler', value:'${handler_name}'}],
+    			messages: {
+    		        maxFileSize: "#i18n{asynchronousupload.error.fileTooLarge}",
+			
+    		    }
+    	    }).on('fileuploadprocessalways', function (e, data) {
+    	        var index = data.index,
+    	            file = data.files[index],
+    	            fieldName = data.formData[0].value;
 //    	        if (file.preview) {
 //    	            node
 //    	                .prepend('<br>')
 //    	                .prepend(file.preview);
 //    	        }
-        if (file.error) {
-updateErrorBox(file.error, fieldName)
-}
+    	        if (file.error) {
+    	        	updateErrorBox( file.error, fieldName )
+    	        }
 //    	        if (index + 1 === data.files.length) {
 //    	            data.context.find('button')
 //    	                .text('Upload')
 //    	                .prop('disabled', !!data.files.error);
 //    	        }
-}).on('fileuploadprogressall', function (e, data) {
-var progress = parseInt(data.loaded / data.total * 100, 10);
-        var fieldName = this.name;
-        var bar = $(' #progress-bar_' + fieldName);
-        bar.html(progress + '%');
-        bar.css('width', progress + '%');
-        $(' #progress_' + fieldName).show();
-        if (progress >= 100)
-{
-$(' #progress_' + fieldName).hide();
-}
-}).on('fileuploaddone', function (e, data) {
-formDisplayUploadedFiles${fieldname}(data.result, data.files, '${checkBoxPrefix}');
-}).on('fileuploadfail', function (e, data) {
-var fieldName = data.formData[0].value;
-        updateErrorBox('Une erreur est survenue lors de l\'upload du fichier', fieldName);
-        $(' #progress_' + fieldName).hide();
-}).prop('disabled', !$.support.fileInput)
-        .parent().addClass($.support.fileInput ? undefined : 'disabled');
-        this.parentNode.className = this.parentNode.className + ' fileinput-button';
-        var jsonData = {"fieldname":this.name, "asynchronousupload.handler":"${handler_name}"};
-        $.getJSON('${base_url}jsp/site/plugins/asynchronousupload/DoRemoveFile.jsp', jsonData,
-                function(json) {
-                formDisplayUploadedFiles${fieldname}(json, null, '${checkBoxPrefix}');
-                }
-        );
-});
-        $('[name^="${submitPrefix}"]').click(function(event) {
-event.preventDefault();
-});
-        // prevent user from quitting the page before his upload ended.    
-        $(document).on('click', '[name^="${deletePrefix}"]', {}, function(event) {
-var fieldName = this.name.match("${deletePrefix}(.*)")[1];
-        removeFile${checkBoxPrefix}(fieldName, '${handler_name}', '${base_url}');
-        event.preventDefault();
-});
+    	    }).on('fileuploadprogressall', function (e, data) {
+    	        var progress = parseInt(data.loaded / data.total * 100, 10);
+    	        var fieldName = this.name;
+    	        var bar = $(' #progress-bar_' + fieldName);
+    	        bar.html( progress + '%'  );
+    	        bar.css( 'width', progress + '%' );
+    	         	        
+    	        $(' #progress_' + fieldName).show( );
+    	        
+    	        if ( progress >= 100 )
+    	        {
+    	        	$(' #progress_' + fieldName).hide();
+    	        }
+    	    }).on('fileuploaddone', function (e, data) {
+    	    	formDisplayUploadedFiles${fieldname}( data.result, data.files, '${checkBoxPrefix}' );
+    	    }).on('fileuploadfail', function (e, data) {
+    	    	var fieldName = data.formData[0].value;
+    	    	updateErrorBox( 'Une erreur est survenue lors de l\'upload du fichier', fieldName );
+    	    	$(' #progress_' + fieldName).hide();
+    	    }).prop('disabled', !$.support.fileInput)
+    	        .parent().addClass($.support.fileInput ? undefined : 'disabled');
+    	this.parentNode.className=this.parentNode.className + ' fileinput-button';
+    	
+    	var jsonData = {"fieldname":this.name, "asynchronousupload.handler":"${handler_name}"};
+    	
+    	$.getJSON('${base_url}jsp/site/plugins/asynchronousupload/DoRemoveFile.jsp', jsonData,
+    			function(json) {
+    				formDisplayUploadedFiles${fieldname}(json, null, '${checkBoxPrefix}');
+    			}
+    		);
     });
-        }
+    
+    $('[name^="${submitPrefix}"]').click(function(event) {
+		event.preventDefault( );
+	});
+
+    // prevent user from quitting the page before his upload ended.    
+    $(document).on('click','[name^="${deletePrefix}"]', {} ,function() {
+        var fieldName = this.name.match("${deletePrefix}(.*)")[1];
+    	removeFile${checkBoxPrefix}(fieldName, '${handler_name}', '${base_url}');
+    	event.preventDefault( );
+    });
+    
+});
 
 /**
  * Sets the files list
  * @param jsonData data
  */
-function formDisplayUploadedFiles${fieldname}(jsonData, files, cbPrefix)
-        {
-        // create the div
-        var fieldName = jsonData.field_name;
-                updateErrorBox(jsonData.form_error, fieldName);
-                if (fieldName != null)
-        {
-        if (jsonData.fileCount == 0){
-        // no file uploaded, hiding content
+function formDisplayUploadedFiles${fieldname}( jsonData, files, cbPrefix )
+{
+	// create the div
+	var fieldName = jsonData.field_name;
+	
+	updateErrorBox(jsonData.form_error, fieldName);
+	
+	if ( fieldName != null )
+	{
+		if ( jsonData.fileCount == 0 ){
+			// no file uploaded, hiding content
 //			$("#_file_deletion_" + fieldName ).hide(  );
-        $("#_file_deletion_label_" + fieldName).hide();
+			$("#_file_deletion_label_" + fieldName ).hide(  );
 //			$("#_file_deletion_button_" + fieldName ).hide(  );
-        } else {
+		} else {
 
-        var strContent = "";
-                var checkboxPrefix = cbPrefix + fieldName;
-                // jsonData.uploadedFiles.length is str length when file count is 1 so using fileCount instead.
-                // so if jsonData.fileCount == 1, the index should not be used
-                for (var index = 0; index < jsonData.fileCount; index++)
-        {
+			var strContent = "";
+			var checkboxPrefix = cbPrefix + fieldName;
+			
+			// jsonData.uploadedFiles.length is str length when file count is 1 so using fileCount instead.
+			// so if jsonData.fileCount == 1, the index should not be used
+			for ( var index = 0; index < jsonData.fileCount; index++ )
+			{
 //				if ( jsonData.files[index].is_new )
 //				{
 
-        strContent = strContent + "<div class=\"col-xs-12 col-sm-12 col-md-12 col-lg-12\">" +((((jsonData.fileCount == 1)&&(jsonData.files.preview!=""))||((jsonData.fileCount > 1)&&(jsonData.files[index].preview!=""))) ? " <img src=" + "'" + ((jsonData.fileCount == 1) ? jsonData.files.preview : jsonData.files[index].preview) + "'" + "alt='' " + " width='${previewMaxWidth}' height='${previewMaxHeight}'/>" : "" )+"</div>" + "<label class=\"col-xs-12 col-sm-12 col-md-12 col-lg-12\">  \
+					strContent = strContent + "<div class=\"checkbox\" id=\"_file_uploaded_" + fieldName + index + "\"><label class=\"col-xs-12 col-sm-12 col-md-12 col-lg-12\">  \
 								<input type=\"checkbox\"  \
 									name=\"" + checkboxPrefix + index + "\"  \
 									id=\"" + checkboxPrefix + index + "\"  \
 								/>  \
-								&#160;" + ((jsonData.fileCount == 1) ? jsonData.files.name : jsonData.files[index].name) +" </label></div>";
+								&#160;" + ( (jsonData.fileCount == 1) ? jsonData.files.name : jsonData.files[index].name ) + 
+							"</label></div><div class=\"col-xs-12 col-sm-12 col-md-12 col-lg-12\">"+" <img src="+"'"+ ( (jsonData.fileCount == 1) ? jsonData.files.preview : jsonData.files[index].preview )+"'"+"alt='' "+" width='${previewMaxWidth}' height='${previewMaxHeight}'/></div>";
 //				}
 //				else if ( jsonData.files[index].is_removed )
 //				{
 //					$('#_file_uploaded_' + fieldName + index).remove();
 //				}
-        }
+			}
 
-        $("#_file_deletion_" + fieldName).html(strContent);
-                // show the hidden div (if not already)
+			$("#_file_deletion_" + fieldName ).html( strContent );
+			// show the hidden div (if not already)
 //			$("#_file_deletion_" + fieldName ).show(  );
-                $("#_file_deletion_label_" + fieldName).show();
+			$("#_file_deletion_label_" + fieldName ).show(  );
 //			$("#_file_deletion_button_" + fieldName ).show(  );
-        }
-        }
-        }
+		}
+	}
+}
 
 /**
  * Removes a file
  * @param action the action button name
  */
-function removeFile${checkBoxPrefix}(fieldName, handlerName, baseUrl) {
-// build indexes to remove
-var strIndexes = '';
-        var indexesCount = 0;
-        var checkboxPrefix = '${checkBoxPrefix}' + fieldName;
-        $('[name^="' + checkboxPrefix + '"]:checked').each(function() {
-if (this.checked)
-{
-if (indexesCount > 0)
-{
-strIndexes = strIndexes + ",";
-}
-indexesCount++;
-        var index = this.name.match(checkboxPrefix + "(\\d+)")[1];
-        strIndexes = strIndexes + index;
+function removeFile${checkBoxPrefix}( fieldName, handlerName, baseUrl ) {
+	// build indexes to remove
+	var strIndexes = '';
+	
+	var indexesCount = 0;
+	var checkboxPrefix = '${checkBoxPrefix}' + fieldName;
+	$('[name^="' + checkboxPrefix + '"]:checked' ).each( function() {
+		if (this.checked)
+		{
+			if ( indexesCount > 0 )
+			{
+				strIndexes = strIndexes + ",";
+			}
+			indexesCount++;
+			var index = this.name.match( checkboxPrefix + "(\\d+)")[1];
+			strIndexes = strIndexes + index;
+		}
+	});
+	
+	if ( !indexesCount )
+	{
+		return;
+	}
+	
+	var jsonData = {"fieldname":fieldName, "asynchronousupload.handler":handlerName, "field_index": strIndexes};
+	
+	$.getJSON(baseUrl + 'jsp/site/plugins/asynchronousupload/DoRemoveFile.jsp', jsonData,
+		function(json) {
+			formDisplayUploadedFiles${fieldname}(json, null, '${checkBoxPrefix}');
+		}
+	);
 }
-});
-        if (!indexesCount)
-{
-return;
-}
-
-var jsonData = {"fieldname":fieldName, "asynchronousupload.handler":handlerName, "field_index": strIndexes};
-        $.getJSON(baseUrl + 'jsp/site/plugins/asynchronousupload/DoRemoveFile.jsp', jsonData,
-                function(json) {
-                formDisplayUploadedFiles${fieldname}(json, null, '${checkBoxPrefix}');
-                }
-        );
-        }
 
-function updateErrorBox(errorMessage, fieldName)
-        {
-        if (errorMessage != null && errorMessage != '')
-        {
-        var strContent = '<span class="text-danger">' + errorMessage + '</span>'
-                $('#_file_error_box_' + fieldName).html(strContent);
-                $('#_file_error_box_' + fieldName).show();
-        }
-        else
-        {
-        $('#_file_error_box_' + fieldName).hide();
-        }
-        }
+function updateErrorBox( errorMessage, fieldName )
+{
+	if ( errorMessage != null && errorMessage != '' )
+	{
+		var strContent = '<span class="text-danger">' + errorMessage + '</span>'
+		$( '#_file_error_box_' + fieldName ).html( strContent );
+		$( '#_file_error_box_' + fieldName ).show( );
+	}
+	else
+	{
+		$( '#_file_error_box_' + fieldName ).hide( );
+	}
+}
\ No newline at end of file

From 5c34a4f898a800d20f365fd36ebd4dda7964cdd9 Mon Sep 17 00:00:00 2001
From: unknown <martinlo@DSTIBPICO34243F.stations.paris.mdp>
Date: Thu, 16 Jun 2016 15:54:45 +0200
Subject: [PATCH 3/4] Restore previous version of asynchronousuploadfile.xml

---
 webapp/WEB-INF/plugins/asynchronousupload.xml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/webapp/WEB-INF/plugins/asynchronousupload.xml b/webapp/WEB-INF/plugins/asynchronousupload.xml
index 5f2b39f..e300170 100644
--- a/webapp/WEB-INF/plugins/asynchronousupload.xml
+++ b/webapp/WEB-INF/plugins/asynchronousupload.xml
@@ -38,19 +38,4 @@
 <!--         <javascript-file>asynchronousupload/jquery.fileupload-video.js</javascript-file> -->
         <javascript-file>asynchronousupload/jquery.fileupload-validate.js</javascript-file>
     </javascript-files>
-	
-	<admin-javascript-files>
-        <admin-javascript-file>js/plugins/asynchronousupload/vendor/jquery.ui.widget.js</admin-javascript-file>
-        <admin-javascript-file>js/plugins/asynchronousupload/jquery.iframe-transport.js</admin-javascript-file>
-        <admin-javascript-file>js/plugins/asynchronousupload/load-image.min.js</admin-javascript-file> 
-        <admin-javascript-file>js/plugins/asynchronousupload/jquery.fileupload.js</admin-javascript-file>
-        <admin-javascript-file>js/plugins/asynchronousupload/jquery.fileupload-process.js</admin-javascript-file>
-        <admin-javascript-file>js/plugins/asynchronousupload/jquery.fileupload-image.js</admin-javascript-file>
-        <admin-javascript-file>js/plugins/asynchronousupload/canvas-to-blob.min.js</admin-javascript-file>
-<!--         <admin-javascript-file>js/plugins/asynchronousupload/jquery.fileupload-audio.js</admin-javascript-file> -->
-<!--         <admin-javascript-file>js/plugins/asynchronousupload/jquery.fileupload-video.js</admin-javascript-file> -->
-	<admin-javascript-file>js/plugins/asynchronousupload/jquery.fileupload-validate.js</admin-javascript-file>
-    </admin-javascript-files>
-	
-    
 </plug-in>
\ No newline at end of file

From 358efd3dfc30239cee7b85b7c48720f5d5a1544b Mon Sep 17 00:00:00 2001
From: unknown <martinlo@DSTIBPICO34243F.stations.paris.mdp>
Date: Thu, 16 Jun 2016 16:01:16 +0200
Subject: [PATCH 4/4] ASYNCUP-20 : add admin javascript file to allow plugin to
 work in Back-office

---
 webapp/WEB-INF/plugins/asynchronousupload.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/webapp/WEB-INF/plugins/asynchronousupload.xml b/webapp/WEB-INF/plugins/asynchronousupload.xml
index e300170..5f2b39f 100644
--- a/webapp/WEB-INF/plugins/asynchronousupload.xml
+++ b/webapp/WEB-INF/plugins/asynchronousupload.xml
@@ -38,4 +38,19 @@
 <!--         <javascript-file>asynchronousupload/jquery.fileupload-video.js</javascript-file> -->
         <javascript-file>asynchronousupload/jquery.fileupload-validate.js</javascript-file>
     </javascript-files>
+	
+	<admin-javascript-files>
+        <admin-javascript-file>js/plugins/asynchronousupload/vendor/jquery.ui.widget.js</admin-javascript-file>
+        <admin-javascript-file>js/plugins/asynchronousupload/jquery.iframe-transport.js</admin-javascript-file>
+        <admin-javascript-file>js/plugins/asynchronousupload/load-image.min.js</admin-javascript-file> 
+        <admin-javascript-file>js/plugins/asynchronousupload/jquery.fileupload.js</admin-javascript-file>
+        <admin-javascript-file>js/plugins/asynchronousupload/jquery.fileupload-process.js</admin-javascript-file>
+        <admin-javascript-file>js/plugins/asynchronousupload/jquery.fileupload-image.js</admin-javascript-file>
+        <admin-javascript-file>js/plugins/asynchronousupload/canvas-to-blob.min.js</admin-javascript-file>
+<!--         <admin-javascript-file>js/plugins/asynchronousupload/jquery.fileupload-audio.js</admin-javascript-file> -->
+<!--         <admin-javascript-file>js/plugins/asynchronousupload/jquery.fileupload-video.js</admin-javascript-file> -->
+	<admin-javascript-file>js/plugins/asynchronousupload/jquery.fileupload-validate.js</admin-javascript-file>
+    </admin-javascript-files>
+	
+    
 </plug-in>
\ No newline at end of file