Changeset 1280:d9627cb1cb02 for admin/js

Timestamp:

08/06/13 10:03:57 (11 years ago)

Author:

Dsls

Branch:

default

Message:

Backed out merge changeset: 48c827f9db99

Backed out merge revision to its first parent (5ceeeb6f5454)

Location:

admin/js

Files:

• _media.js (modified) (2 diffs)
• _post.js (modified) (1 diff)
• jquery/jquery.pageTabs.js (modified) (1 diff)

admin/js/_media.js

@@ -40 +40 @@
      });
 
-     var $container = $('#add-file-f').parent().parent();
+     var $container = $('#fileupload').parent().parent();
      var $msg,label;
 
@@ -75 +75 @@
 
           $container.toggleClass('enhanced_uploader');
-     }).appendTo($('#add-file-f'));
+     }).appendTo($('#fileupload'));
 
      // Replace remove links by a POST on hidden form

admin/js/_post.js

@@ -79 +79 @@
           // Get document format and prepare toolbars
           var formatField = $('#post_format').get(0);
-          var last_post_format = $(formatField).val();
           $(formatField).change(function() {
-               // Confirm post format change
-               if(window.confirm(dotclear.msg.confirm_change_post_format_noconvert)){
-                    excerptTb.switchMode(this.value);
-                    contentTb.switchMode(this.value);
-                    last_post_format = $(this).val();
-               }else{
-                    // Restore last format if change cancelled
-                    $(this).val(last_post_format);
-               }
+               excerptTb.switchMode(this.value);
+               contentTb.switchMode(this.value);
           });
           

admin/js/jquery/jquery.pageTabs.js

@@ -39 +39 @@
                     li = document.createElement('li');
                     a = document.createElement('a');
-                    $(a).html(this.title);
+                    a.appendChild(document.createTextNode(this.title));
                     this.title = '';
                     a.href = '#';
                     a.fn = This.showDiv;
                     a.index = this.id || i;
-                    li.id = "part-tabs-"+a.index;
                     a.obj = This;
                     jQuery(a).click(function() { this.fn.call(this.obj,this.index); return false; });