From: Kristofer Krause Date: Tue, 19 Apr 2016 18:53:49 +0000 (-0400) Subject: s.no_pip vs. self.settings.no_pip X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F8632%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git s.no_pip vs. self.settings.no_pip We would like this change in our project. However, !s.no_pip was accidentally over written. In both top: and bottom: is should be !s.no_pip and not !self.settings.no_pip. --- diff --git a/js/foundation/foundation.dropdown.js b/js/foundation/foundation.dropdown.js index ae16c2d1e..8779baaa9 100644 --- a/js/foundation/foundation.dropdown.js +++ b/js/foundation/foundation.dropdown.js @@ -331,7 +331,7 @@ p.left = p.left - thisOuterWidth + tOuterWidth; } - if (!self.settings.no_pip && tOuterWidth < thisOuterWidth || self.small() || this.hasClass(s.mega_menu)) { + if (!s.no_pip && tOuterWidth < thisOuterWidth || self.small() || this.hasClass(s.mega_menu)) { self.adjust_pip(this, t, s, p); } @@ -354,7 +354,7 @@ p.left = p.left - thisOuterWidth + tOuterWidth; } - if (!self.settings.no_pip && tOuterWidth < thisOuterWidth || self.small() || this.hasClass(s.mega_menu)) { + if (!s.no_pip && tOuterWidth < thisOuterWidth || self.small() || this.hasClass(s.mega_menu)) { self.adjust_pip(this, t, s, p); }