From: Merlin Patterson <merlinpatt@users.noreply.github.com>
Date: Thu, 18 Feb 2016 20:24:57 +0000 (-0500)
Subject: Change _init to override defaultQueries if user provided ones exist
X-Git-Tag: v6.2.1~19^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8192%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Change _init to override defaultQueries if user provided ones exist
---

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();