Changeset 1144:4af82896ca3d for admin/js

Timestamp:

06/04/13 22:51:35 (12 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Remplacement de l'upload utilisant swfupload par le plugin jQuery-File-Upload

Todo:

• Gestion des suppressions
• Gestion des annulations
• Gestion des mises de l'interface sans rechargement de la page
• Simplification (moins de javascript) ?

Location:

admin/js

Files:

• _media.js (modified) (1 diff)
• jquery/jquery-ui.custom.js (modified) (1 prop)
• jquery/jquery.candyUpload.js (deleted)
• jquery/jquery.js (modified) (1 prop)
• jsUpload/jquery.fileupload-process.js (added)
• jsUpload/jquery.fileupload-resize.js (added)
• jsUpload/jquery.fileupload-ui.js (added)
• jsUpload/jquery.fileupload.js (added)
• jsUpload/jquery.iframe-transport.js (added)
• jsUpload/load-image.js (added)
• jsUpload/tmpl.js (added)
• jsUpload/vendor/jquery.ui.widget.js (added)

admin/js/_media.js

@@ -1 +1 @@
 $(function() {
-     // Replace remove links by a POST on hidden form
-     fileRemoveAct();
-     
-     function fileRemoveAct() {
-          $('a.media-remove').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))) {
-                    var f = $('#media-remove-hide').get(0);
-                    f.elements['remove'].value = this.href.replace(/^(.*)&remove=(.*?)(&|$)/,'$2');
-                    this.href = '';
-                    f.submit();
-               }
-               return false;
-          });
-     }
-     
-     if (!$.browser.opera) {
-          var upldr = $('<a href="#" id="cu-enable">' + dotclear.msg.activate_enhanced_uploader + '</a>').click( function() {
-               candyUploadInit();
-               return false;
-          });
-          $('#media-upload').append($('<div></div>').append(upldr));
-          if ((dotclear.candyUpload_force_init == '1') || (($.cookie('dc_candy_upl') == 1))) {
-               candyUploadInit();
-          }
-     }
-     
-     function candyUploadInit()
-     {
-          var candy_upload_success = false;
-          var candy_upload_form_url = $('#media-upload').attr('action') + '&file_sort=date-desc&d=' + $('#media-upload input[name=d]').val();
-          var candy_upload_limit = $('#media-upload input[name=MAX_FILE_SIZE]').val();
-          $('#media-upload').candyUpload({
-               upload_url: dotclear.candyUpload.base_url + '/media.php',
-               flash_movie: dotclear.candyUpload.movie_url,
-               file_size_limit: candy_upload_limit + 'b',
-               params: 'swfupload=1&amp;' + dotclear.candyUpload.params,
-               
-               callbacks: {
-                    createControls: function() {
-                         var _this = this;
-                         this.ctrl.btn_browse.hide();
-                         this.ctrl.msg.html(dotclear.msg.load_enhanced_uploader);
-                         var l = $('<a href="#">' + dotclear.msg.disable_enhanced_uploader + '</a>').click(function() {
-                              _this.upldr.destroy();
-                              _this.ctrl.block.empty().remove();
-                              $('#media-upload').show();
-                              delete _this;
-                              $.cookie('dc_candy_upl','',{expires:-1});
-                              return false;
-                         });
-                         this.ctrl.disable = $('<div class="cu-disable"></div>').append(l).appendTo(this.ctrl.block);
-                    },
-                    flashReady: function() {
-                         var _this = this;
-                         this.ctrl.msg.fadeOut('fast',function() {
-                              $(this).text(_this.locales.no_file_in_queue).fadeIn('fast');
-                              _this.ctrl.btn_browse.fadeIn('fast',function() {
-                                   _this.upldr.container.children().css({
-                                        width: $('.cu-btn-browse').width(),
-                                        height: $('.cu-btn-browse').height()
-                                   });
-                              });
-                         });
-                    },
-                    uploadSuccess: function(o,data) {
-                         if (data == 'ok') {
-                              candy_upload_success = true;
-                              this.fileMsg(o.id,this.locales.file_uploaded);
-                         } else {
-                              this.fileErrorMsg(o.id,data);
-                         }
-                         
-                         // uploads finished and at least one success
-                         if (candy_upload_success && $('div.cu-file:has(span.cu-filecancel a)',this.ctrl.files).length == 0) {
-                              $.cookie('dc_candy_upl','1',{expires: 30});
-                              $.get(candy_upload_form_url,function(data) {
-                                   var media = $('div.media-list');
-                                   media.after($('div.media-list',data)).remove();
-                                   fileRemoveAct();
-                              });
-                         }
-                    },
-                    fileQueued: function() {
-                         ;
-                    }
-               }
-          });
-     }
+    $('#fileupload')
+     .fileupload({
+         url: $('#fileupload').attr('action'),
+         autoUpload: false
+     });
+
+    // 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});
+    });
+
+    // Replace remove links by a POST on hidden form
+    fileRemoveAct();
+
+    function fileRemoveAct() {
+     $('a.media-remove').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))) {
+          var f = $('#media-remove-hide').get(0);
+          f.elements['remove'].value = this.href.replace(/^(.*)&remove=(.*?)(&|$)/,'$2');
+          this.href = '';
+          f.submit();
+         }
+         return false;
+     });
+    }
 });