Changeset 1159:887a30463ee0 for admin/js

Timestamp:

06/20/13 13:58:24 (11 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Improve upload multiple
Restore option to enable/disable enhanced interface

File:

• admin/js/_media.js (modified) (2 diffs)

admin/js/_media.js

@@ -1 +1 @@
 $(function() {
-    $('#fileupload')
-     .fileupload({
-         url: $('#fileupload').attr('action'),
-         autoUpload: false
-     });
+    var jqXHR = null;
+    $('#fileupload').fileupload({
+     url: $('#fileupload').attr('action'),
+     autoUpload: false,
+     disabled: true
+    }).bind('fileuploaddone', function(e, data) {
+     if (data.result.files[0].html !==undefined) {
+         $('.media-list').append(data.result.files[0].html);
+     }
+    });
 
-    // Load existing files:
-    $('#fileupload').addClass('fileupload-processing');
-    $.ajax({
-        url: $('#fileupload').fileupload('option', 'url'),
-        dataType: 'json',
-        context: $('#fileupload')[0]
-    }).always(function (result) {
-        $(this).removeClass('fileupload-processing');
-    }).done(function (result) {
-        $(this).fileupload('option', 'done')
-            .call(this, null, {result: result});
-    });
+    if (!$.browser.opera) {
+     var $container = $('#fileupload').parent().parent();
+     var $msg;
+
+     if ($container.hasClass('enhanced_uploader')) {
+         $msg = dotclear.msg.enhanced_uploader_disable;
+         $('#fileupload').fileupload({disabled:false});
+     } else {
+         $msg = dotclear.msg.enhanced_uploader_activate;
+     }
+
+     $('<div><a href="#">' + $msg + '</a></div>').click( function() {
+         if ($container.hasClass('enhanced_uploader')) {
+          $msg = dotclear.msg.enhanced_uploader_activate;
+          $('#upfile').attr('multiple', false);
+
+          // when a user has clicked enhanced_uploader, and has added files
+          // We must remove files in table
+          $('.table-files tr', '#fileupload').remove();
+          $('#fileupload').fileupload({disabled:true});
+         } else {
+          $msg = dotclear.msg.enhanced_uploader_disable;
+          $('#upfile').attr('multiple', true);
+          $('#fileupload').fileupload({disabled:false});
+         }
+         $(this).find('a').text($msg);
+
+         $container.toggleClass('enhanced_uploader');
+     }).appendTo($('#fileupload'));
+    }
 
     // Replace remove links by a POST on hidden form
@@ -23 +46 @@
 
     function fileRemoveAct() {
-     $('a.media-remove').click(function() {
+     $('a.media-remove').live('click', function() {
          var m_name = $(this).parents('ul').find('li:first>a').text();
          if (window.confirm(dotclear.msg.confirm_delete_media.replace('%s',m_name))) {