Changeset 250:6f7f02e0b22b

Timestamp:

05/12/11 19:15:15 (14 years ago)

Author:

Franck <carnet.franck.paul@…>

Branch:

default

Parents:

249:d0a17b7ca6e0 (diff), 248:b4b985c686c8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge

File:

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

admin/js/_media.js

@@ -17 +17 @@
      
      if (!$.browser.opera) {
-          var cue = $('<a/>').attr({'id':'candyupload-enable','href':'#'}).append(dotclear.msg.activate_enhanced_uploader)
-          .click(function() {
-               candyUploadInit();
-               return false;
-          });
-          $('#media-upload>fieldset').append($('<div></div>').append(cue));
-          
-          if ($.cookie('dc_candy_upl') == 1) {
+          if (dotclear.candyUpload_force_init == '1') {
                candyUploadInit();
           }
@@ -43 +36 @@
                     createControls: function() {
                          var _this = this;
-                         var cud = $('<a/>').attr({'id':'candyupload-disable','href':'#'}).append(dotclear.msg.disable_enhanced_uploader)
-                         .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.btn_browse.hide();
                          this.ctrl.msg.html(dotclear.msg.load_enhanced_uploader);
-                         this.ctrl.disable = $('<div class="cu-disable"></div>').append(cud).appendTo(this.ctrl.block);
                     },
                     flashReady: function() {
@@ -67 +50 @@
                               });
                          });
-                         this.ctrl.block.append(this.ctrl.disable);
                     },
                     uploadSuccess: function(o,data) {