From: Kevin Ball Date: Thu, 7 Apr 2016 18:31:50 +0000 (-0700) Subject: Revert "Update MediaQueries to initialize if not initialized already." X-Git-Tag: v6.2.1~10^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8547%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git Revert "Update MediaQueries to initialize if not initialized already." --- diff --git a/js/foundation.util.mediaQuery.js b/js/foundation.util.mediaQuery.js index 6649a35fc..baa1f0b87 100644 --- a/js/foundation.util.mediaQuery.js +++ b/js/foundation.util.mediaQuery.js @@ -4,11 +4,6 @@ // Default set of media queries const defaultQueries = { - small : 'only screen and (min-width: 0em)', - medium : 'only screen and (min-width: 40em)', - large : 'only screen and (min-width: 64em)', - xlarge : 'only screen and (min-width: 75em)', - xxlarge : 'only screen and (min-width: 90em)', 'default' : 'only screen', landscape : 'only screen and (orientation: landscape)', portrait : 'only screen and (orientation: portrait)', @@ -35,22 +30,13 @@ var MediaQuery = { var extractedStyles = $('.foundation-mq').css('font-family'); var namedQueries; - if (extractedStyles) { - namedQueries = parseStyleToObject(extractedStyles); - } - - for (var key in defaultQueries) { - if (key in namedQueries) { - self.queries.push({ - name: key, - value: `only screen and (min-width: ${namedQueries[key]})` - }); - } else { - self.queries.push({ - name: key, - value: defaultQueries[key] - }); - } + namedQueries = parseStyleToObject(extractedStyles); + + for (var key in namedQueries) { + self.queries.push({ + name: key, + value: `only screen and (min-width: ${namedQueries[key]})` + }); } this.current = this._getCurrentSize(); @@ -81,10 +67,6 @@ var MediaQuery = { * @returns {String|null} - The media query of the breakpoint, or `null` if the breakpoint doesn't exist. */ get(size) { - if (! this.queries.length) { - this._init(); - } - for (var i in this.queries) { var query = this.queries[i]; if (size === query.name) return query.value;