Changeset 343:f9fcb964c910 for admin/js

Timestamp:

06/07/11 08:57:44 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

default

Parents:

342:a5d04d2da753 (diff), 341:796cb01c7120 (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:

Merged with 2.3 latest bugfixes

Location:

admin/js

Files:

• _index.js (modified) (1 diff)
• common.js (modified) (4 diffs)
• common.js (modified) (1 diff)

admin/js/_index.js

@@ -65 +65 @@
      // allow to hide quick entry div, and remember choice
      $('#quick h3').toggleWithLegend($('#quick').children().not('h3'),{
-          cookie: 'dcx_quick_entry',
-     });
+          cookie: 'dcx_quick_entry'
+     }, positionFooter);
 });

admin/js/common.js

@@ -57 +57 @@
 }
 
-jQuery.fn.toggleWithLegend = function(target,s, callback) {
+jQuery.fn.toggleWithLegend = function(target,s) {
      var defaults = {
           img_on_src: dotclear.img_plus_src,
@@ -79 +79 @@
      }
 
-     var toggle = function(i,speed, callback) {
+     var toggle = function(i,speed) {
           speed = speed || 0;
           if (p.hide) {
                $(i).get(0).src = p.img_on_src;
                $(i).get(0).alt = p.img_on_alt;
-               target.hide(speed, callback);
+               target.hide(speed, positionFooter);
           } else {
                $(i).get(0).src = p.img_off_src;
                $(i).get(0).alt = p.img_off_alt;
-               target.show(speed, callback);
+               target.show(speed, positionFooter);
                if (p.fn) {
                     p.fn.apply(target);
@@ -122 +122 @@
           $(ctarget).css('cursor','pointer');
           $(ctarget).click(function() {
-               toggle(i,p.speed, callback);
+               toggle(i,p.speed, positionFooter);
                return false;
           });
@@ -356 +356 @@
      }
      $('#blog-menu h3:first').toggleWithLegend($('#blog-menu ul:first'),
-          $.extend({cookie:'dc_blog_menu'},menu_settings),
-          positionFooter
+          $.extend({cookie:'dc_blog_menu'},menu_settings)
      );
      $('#system-menu h3:first').toggleWithLegend($('#system-menu ul:first'),
-          $.extend({cookie:'dc_system_menu'},menu_settings),
-          positionFooter
+          $.extend({cookie:'dc_system_menu'},menu_settings)
      );
      $('#plugins-menu h3:first').toggleWithLegend($('#plugins-menu ul:first'),
-          $.extend({cookie:'dc_plugins_menu'},menu_settings),
-          positionFooter
+          $.extend({cookie:'dc_plugins_menu'},menu_settings)
      );
      $('#favorites-menu h3:first').toggleWithLegend($('#favorites-menu ul:first'),
-          $.extend({cookie:'dc_favorites_menu',hide:false,reverse_cookie:true},menu_settings),
-          positionFooter
+          $.extend({cookie:'dc_favorites_menu',hide:false,reverse_cookie:true},menu_settings)
      );
 

admin/js/common.js

@@ -335 +335 @@
                position: "static",
                padding: ".75em 0",
-               width: "auto",
+               width: "auto"
           });
      }