Merge branch 'v4' of github.com:twbs/derpstrap into v4

js/dist/scrollspy.js

@@ -45,18 +45,23 @@ var ScrollSpy = (function ($) {
   };
 
   var ClassName = {
-    DROPDOWN_TOGGLE: 'dropdown-toggle',
     DROPDOWN_ITEM: 'dropdown-item',
     DROPDOWN_MENU: 'dropdown-menu',
+    NAV_LINK: 'nav-link',
+    NAV: 'nav',
     ACTIVE: 'active'
   };
 
   var Selector = {
     DATA_SPY: '[data-spy="scroll"]',
     ACTIVE: '.active',
+    LIST_ITEM: '.list-item',
+    LI: 'li',
     LI_DROPDOWN: 'li.dropdown',
     NAV_LINKS: '.nav-link',
-    DROPDOWN_ITEMS: '.dropdown-item'
+    DROPDOWN: '.dropdown',
+    DROPDOWN_ITEMS: '.dropdown-item',
+    DROPDOWN_TOGGLE: '.dropdown-toggle'
   };
 
   var OffsetMethod = {
@@ -229,14 +234,18 @@ var ScrollSpy = (function ($) {
         queries = queries.map(function (selector) {
           return selector + '[data-target="' + target + '"],' + (selector + '[href="' + target + '"]');
         });
+
         var $link = $(queries.join(','));
 
         if ($link.hasClass(ClassName.DROPDOWN_ITEM)) {
-          $link.parent().find(ClassName.DROPDOWN_TOGGLE).addClass(ClassName.ACTIVE);
+          $link.closest(Selector.DROPDOWN).find(Selector.DROPDOWN_TOGGLE).addClass(ClassName.ACTIVE);
+          $link.addClass(ClassName.ACTIVE);
+        } else {
+          // todo (fat) this is kinda sus…
+          // recursively add actives to tested nav-links
+          $link.parents(Selector.LI).find(Selector.NAV_LINKS).addClass(ClassName.ACTIVE);
         }
 
-        $link.addClass(ClassName.ACTIVE);
-
         $(this._scrollElement).trigger(Event.ACTIVATE, {
           relatedTarget: target
         });
@@ -244,8 +253,7 @@ var ScrollSpy = (function ($) {
     }, {
       key: '_clear',
       value: function _clear() {
-        debugger;
-        $(this._selector).filter(ClassName.ACTIVE).removeClass(Selector.ACTIVE);
+        $(this._selector).filter(Selector.ACTIVE).removeClass(ClassName.ACTIVE);
       }
 
       // static