Changeset 2479:6883db18a27e

Timestamp:

10/22/13 14:22:06 (12 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

2.6

Message:

Fix issue when hash not refer to existing div content. Closes #1794
Improve the way ton find anchor related to a div content, addresses #1723

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

@@ -76 +76 @@
           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'));
+          } else if ($('#'+$.pageTabs.options.idTabPrefix+tab, '.'+$.pageTabs.options.containerClass).length==0) {
+               // try to find anchor in a .multi-part div
+               if ($('#'+tab).length==1) {
+                    var div_content = $('#'+tab).parents('.'+$.pageTabs.options.contentClass);
+                    if (div_content.length==1) {
+                         tab = div_content.attr('id').replace($.pageTabs.options.partPrefix,'');
+                    } else {
+                         tab = getHash($('ul li a', '.'+$.pageTabs.options.containerClass+':eq(0)').attr('href'));
+                    }
+               } else {
+                    tab = getHash($('ul li a', '.'+$.pageTabs.options.containerClass+':eq(0)').attr('href'));
+               }
           }
 

tests/functional/spec/page_tabs.js

@@ -153 +153 @@
           expect($('#part-user-favorites')).not.toBeVisible();
      });
-
-     /* ticket 1794 */
-     /*
+     
+     /* ticket 1723 and 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() {
+     it("Must try to find tab to open in page when hash refer ton an anchor and not to an existing div content", function() {
           loadFixtures('tabs.html');
           loadStyleFixtures('default.css');
+          
+          var anchor_name = 'anchor-in-favorites';
+          $('<div id="anchor-in-favorites"></div>').appendTo($('#user-favorites'));
           
           $.pageTabs('user-profile');
@@ -167 +170 @@
           expect($('#part-user-favorites')).not.toBeVisible();
 
-          spyOn(jQuery.pageTabs, 'getLocationHash').andReturn('dummy');
+          spyOn(jQuery.pageTabs, 'getLocationHash').andReturn(anchor_name);
           jQuery.event.trigger('hashchange');
           expect($('#part-user-options')).not.toBeVisible();
-          expect($('#part-user-profile')).toBeVisible();
-          expect($('#part-user-favorites')).not.toBeVisible();
+          expect($('#part-user-profile')).not.toBeVisible();
+          expect($('#part-user-favorites')).toBeVisible();
      });
 
-     /* ticket 1723 */
-     it("Must open first tab when hash does not refer to an existing div content and no tab is opened", function() {
+     it("Must open first tab when hash does not refer to an existing div content", function() {
           loadFixtures('tabs.html');
           loadStyleFixtures('default.css');