]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Merge branch 'feature-MediaQuery-is-method' of git://github.com/auginator/foundation...
authorKevin Ball <kmball11@gmail.com>
Thu, 6 Oct 2016 20:51:56 +0000 (13:51 -0700)
committerKevin Ball <kmball11@gmail.com>
Thu, 6 Oct 2016 20:51:56 +0000 (13:51 -0700)
1  2 
js/foundation.equalizer.js
js/foundation.sticky.js
js/foundation.tooltip.js
js/foundation.util.mediaQuery.js

Simple merge
index 69ddd97ae69d041477077e6e68549636971c5e4c,9241bd7c23deb9a05dba09aa6383eef6db6cde74..8fd5c6563139dc82e89a36de894a5dd69f5b63ea
@@@ -266,10 -267,8 +266,10 @@@ class Sticky 
     * @private
     */
    _setSizes(cb) {
-     this.canStick = Foundation.MediaQuery.atLeast(this.options.stickyOn);
+     this.canStick = Foundation.MediaQuery.is(this.options.stickyOn);
 -    if (!this.canStick) { cb(); }
 +    if (!this.canStick) {
 +      if (cb && typeof cb === 'function') { cb(); }
 +    }
      var _this = this,
          newElemWidth = this.$container[0].getBoundingClientRect().width,
          comp = window.getComputedStyle(this.$container[0]),
Simple merge
Simple merge