From 35fdd147bbe3f89193c99eb07974b4aca82795cd Mon Sep 17 00:00:00 2001 From: Merlin Patterson Date: Thu, 18 Feb 2016 15:24:57 -0500 Subject: [PATCH] Change _init to override defaultQueries if user provided ones exist --- js/foundation.util.mediaQuery.js | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/js/foundation.util.mediaQuery.js b/js/foundation.util.mediaQuery.js index 658eaa64a..6ca323307 100644 --- a/js/foundation.util.mediaQuery.js +++ b/js/foundation.util.mediaQuery.js @@ -37,15 +37,20 @@ var MediaQuery = { if (extractedStyles) { namedQueries = parseStyleToObject(extractedStyles); - } else { - namedQueries = defaultQueries; - } - - for (var key in namedQueries) { - self.queries.push({ - name: key, - value: `only screen and (min-width: ${namedQueries[key]})` - }); + } + + 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] + }); + } } this.current = this._getCurrentSize(); -- 2.47.2