Changeset 2471:c1ec37564ab9

Timestamp:

10/21/13 16:45:01 (12 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

2.6

Message:

Must not change tab when ones if openend and clicking an anchor
Add tests.
Closes #1794

Files:

• admin/js/jquery/jquery.pageTabs.js (modified) (1 diff)
• tests/functional/spec/page_tabs.js (modified) (2 diffs)

admin/js/jquery/jquery.pageTabs.js

@@ -74 +74 @@
      
      $.pageTabs.clickTab = function(tab) {
-          if (tab=='' || $('#'+$.pageTabs.options.idTabPrefix+tab, '.'+$.pageTabs.options.containerClass).length==0) {
+          if (tab=='') {
+               tab = getHash($('ul li a', '.'+$.pageTabs.options.containerClass+':eq(0)').attr('href'));
+          } else if (($('#'+$.pageTabs.options.idTabPrefix+tab, '.'+$.pageTabs.options.containerClass).length==0)
+                  && ($('ul li.'+$.pageTabs.options.activeClass, '.'+$.pageTabs.options.containerClass).length==0)){
                tab = getHash($('ul li a', '.'+$.pageTabs.options.containerClass+':eq(0)').attr('href'));
           }

tests/functional/spec/page_tabs.js

@@ -154 +154 @@
      });
 
+     /* ticket 1794 */
+     /*
+      * The problem occurs when cliking an anchor in the page 
+      */
+     it("Must not change opened tab when hash does not refer to an existing div content", function() {
+          loadFixtures('tabs.html');
+          loadStyleFixtures('default.css');
+          
+          $.pageTabs('user-profile');
+          expect($('#part-user-options')).not.toBeVisible();
+          expect($('#part-user-profile')).toBeVisible();
+          expect($('#part-user-favorites')).not.toBeVisible();
+
+          spyOn(jQuery.pageTabs, 'getLocationHash').andReturn('dummy');
+          jQuery.event.trigger('hashchange');
+          expect($('#part-user-options')).not.toBeVisible();
+          expect($('#part-user-profile')).toBeVisible();
+          expect($('#part-user-favorites')).not.toBeVisible();
+     });
+
      /* ticket 1723 */
-     it("Must open first tab when hash does not refer to an existing div content", function() {
+     it("Must open first tab when hash does not refer to an existing div content and no tab is opened", function() {
           loadFixtures('tabs.html');
           loadStyleFixtures('default.css');
@@ -164 +184 @@
           expect($('#part-user-profile')).not.toBeVisible();
           expect($('#part-user-favorites')).not.toBeVisible();
-     });
+     });  
 });