Changeset 1792:3ad2e47ed52d for admin/js

Timestamp:

09/11/13 10:08:47 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Children:

1793:a25f8d0fd400, 1829:db77f6bb5df9, 1899:840b0d73f60c

Parents:

1790:13dd14dd5254 (diff), 1791:39acc93c9d30 (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 2.5 into default

Files:

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

admin/js/jquery/jquery.pageTabs.js

@@ -9 +9 @@
           breakerClassName: 'clear'
      };
-     
+
      var index = start_tab ? start_tab : 0;
      var hash = document.location.hash.split('#').join('');

admin/js/jquery/jquery.pageTabs.js

@@ -15 +15 @@
           var index = hash;
      }
-
+     
      this.params = jQuery.extend(defaults,settings);
      this.divs = jQuery('div.'+this.params.className);
@@ -78 +78 @@
           var i = 0;
           var to_trigger = null;
+          var exists = false;
 
           this.divs.each(function() {
                if ((this.id != '' && this.id == index) || i == index) {
-                    jQuery(this).show(0);
-                    This.items[i].className = This.params.listClassName+'-active';
-                    to_trigger = i;
-               } else {
-                    jQuery(this).hide(0);
-                    This.items[i].className = '';
+                    exists = true;
                }
-
                i++;
           });
+          
+          i = 0;
+          
+          if( exists ) {
+               this.divs.each(function() {
+                    if ((this.id != '' && this.id == index) || i == index) {
+                         jQuery(this).show(0);
+                         This.items[i].className = This.params.listClassName+'-active';
+                         to_trigger = i;
+                    } else {
+                         jQuery(this).hide(0);
+                         This.items[i].className = '';
+                    }
+     
+                    i++;
+               });
+          }
 
           if (to_trigger != null) {