]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Change _init to override defaultQueries if user provided ones exist 8192/head
authorMerlin Patterson <merlinpatt@users.noreply.github.com>
Thu, 18 Feb 2016 20:24:57 +0000 (15:24 -0500)
committerMerlin Patterson <merlinpatt@users.noreply.github.com>
Thu, 18 Feb 2016 20:24:57 +0000 (15:24 -0500)
js/foundation.util.mediaQuery.js

index 658eaa64a9221531a6d8239c8dc27a2ae2683b7f..6ca3233079f82d5f966377275f263a95efd1e7cb 100644 (file)
@@ -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();