fixes #10675

fc7049b1 · fat · 3161acd7 · fc7049b1 · fc7049b1 · fc7049b1
Commit fc7049b1 authored 11 years ago by fat
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 4 deletions
+4 -4
--- a/dist/js/bootstrap.js
+++ b/dist/js/bootstrap.js
@@ -1591,7 +1591,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
    this.activeTarget = target

    $(this.selector)
-      .parents('.active')
+      .parentsUntil(this.options.target, '.active')
      .removeClass('active')

    var selector = this.selector +

--- a/dist/js/bootstrap.min.js
+++ b/dist/js/bootstrap.min.js
--- a/docs-assets/js/raw-files.js
+++ b/docs-assets/js/raw-files.js
--- a/js/scrollspy.js
+++ b/js/scrollspy.js
@@ -85,7 +85,7 @@
    this.activeTarget = target

    $(this.selector)
-      .parents('.active')
+      .parentsUntil(this.options.target, '.active')
      .removeClass('active')

    var selector = this.selector +