From: Jacob <jacobthornton@gmail.com>
Date: Fri, 14 Mar 2014 04:44:05 +0000 (-0700)
Subject: Merge pull request #11453 from moodyroto/patch-1
X-Git-Tag: v3.2.0~363
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c9739d4773c268b114296d90e61b5f4e2932517;p=thirdparty%2Fbootstrap.git

Merge pull request #11453 from moodyroto/patch-1

fix scrollspy for targets within tabs
---

8c9739d4773c268b114296d90e61b5f4e2932517
diff --cc js/tests/unit/scrollspy.js
index 694af95c62,126b5c9d7e..09ec547571
--- a/js/tests/unit/scrollspy.js
+++ b/js/tests/unit/scrollspy.js
@@@ -1,36 -1,74 +1,73 @@@
  $(function () {
  
 -    module("scrollspy")
 +  module('scrollspy')
  
 -      test("should provide no conflict", function () {
 -        var scrollspy = $.fn.scrollspy.noConflict()
 -        ok(!$.fn.scrollspy, 'scrollspy was set back to undefined (org value)')
 -        $.fn.scrollspy = scrollspy
 -      })
 +  test('should provide no conflict', function () {
 +    var scrollspy = $.fn.scrollspy.noConflict()
 +    ok(!$.fn.scrollspy, 'scrollspy was set back to undefined (org value)')
 +    $.fn.scrollspy = scrollspy
 +  })
  
 -      test("should be defined on jquery object", function () {
 -        ok($(document.body).scrollspy, 'scrollspy method is defined')
 -      })
 +  test('should be defined on jquery object', function () {
 +    ok($(document.body).scrollspy, 'scrollspy method is defined')
 +  })
  
 -      test("should return element", function () {
 -        ok($(document.body).scrollspy()[0] == document.body, 'document.body returned')
 -      })
 +  test('should return element', function () {
 +    ok($(document.body).scrollspy()[0] == document.body, 'document.body returned')
 +  })
  
 -      test("should switch active class on scroll", function () {
 -        var sectionHTML = '<div id="masthead"></div>'
 -          , $section = $(sectionHTML).append('#qunit-fixture')
 -          , topbarHTML ='<div class="topbar">'
 -          + '<div class="topbar-inner">'
 -          + '<div class="container">'
 -          + '<h3><a href="#">Bootstrap</a></h3>'
 -          + '<ul class="nav">'
 -          + '<li><a href="#masthead">Overview</a></li>'
 -          + '</ul>'
 -          + '</div>'
 -          + '</div>'
 -          + '</div>'
 -          , $topbar = $(topbarHTML).scrollspy()
 +  test('should switch active class on scroll', function () {
 +    var sectionHTML = '<div id="masthead"></div>',
 +        $section = $(sectionHTML).append('#qunit-fixture'),
 +        topbarHTML = '<div class="topbar">' +
 +        '<div class="topbar-inner">' +
 +        '<div class="container">' +
 +        '<h3><a href="#">Bootstrap</a></h3>' +
 +        '<li><a href="#masthead">Overview</a></li>' +
 +        '</ul>' +
 +        '</div>' +
 +        '</div>' +
 +        '</div>',
 +        $topbar = $(topbarHTML).scrollspy()
  
 -        ok($topbar.find('.active', true))
 -      })
 +    ok($topbar.find('.active', true))
 +  })
  
+       test("should only switch active class on current target", function () {
+         var
+           sectionHTML = '<div id="root" class="active">'
+           + '<div class="topbar">'
+           + '<div class="topbar-inner">'
+           + '<div class="container" id="ss-target">'
+           + '<ul class="nav">'
+           + '<li><a href="#masthead">Overview</a></li>'
+           + '<li><a href="#detail">Detail</a></li>'
+           + '</ul>'
+           + '</div>'
+           + '</div>'
+           + '</div>'
+           + '<div id="scrollspy-example" style="height: 100px; overflow: auto;">'
+           + '<div style="height: 200px;">'
+           + '<h4 id="masthead">Overview</h4>'
+           + '<p style="height: 200px">'
+           + 'Ad leggings keytar, brunch id art party dolor labore.'
+           + '</p>'
+           + '</div>'
+           + '<div style="height: 200px;">'
+           + '<h4 id="detail">Detail</h4>'
+           + '<p style="height: 200px">'
+           + 'Veniam marfa mustache skateboard, adipisicing fugiat velit pitchfork beard.'
+           + '</p>'
+           + '</div>'
+           + '</div>'
+           + '</div>'
+           , $section = $(sectionHTML).appendTo("#qunit-fixture")        
+           , $scrollSpy = $section
+             .show()
+             .find("#scrollspy-example")
+             .scrollspy({target: "#ss-target"})
+ 
+         $scrollSpy.scrollTop(350);
+         ok($section.hasClass("active"), "Active class still on root node")
+       })
  })