Fix prefix on server with css style

FormidableLabs · May 15, 2015 · a8e6b13 · a8e6b13
1 parent bcdf04d
commit a8e6b13
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/modules/prefix.js b/modules/prefix.js
@@ -17,7 +17,7 @@ var jsCssMap = {
 };
 var testProp = 'Transform';
 
-var domStyle;
+var domStyle = {};
 var prefixedPropertyCache = {};
 var prefixedValueCache = {};
 var jsVendorPrefix = '';
@@ -26,10 +26,10 @@ var cssVendorPrefix = '';
 if (ExecutionEnvironment.canUseDOM) {
   domStyle = document.createElement('p').style;
 
-  for (var js in jsCssMap) {
-    if ((js + testProp) in domStyle) {
-      jsVendorPrefix = js;
-      cssVendorPrefix = jsCssMap[js];
+  for (var jsPrefix in jsCssMap) {
+    if ((jsPrefix + testProp) in domStyle) {
+      jsVendorPrefix = jsPrefix;
+      cssVendorPrefix = jsCssMap[jsPrefix];
       break;
     }
   }
@@ -40,7 +40,10 @@ var _getPrefixedProperty = function (property) {
     return prefixedPropertyCache[property];
   }
 
-  if (property in domStyle) {
+  if (
+    !ExecutionEnvironment.canUseDOM ||
+    property in domStyle
+  ) {
     // unprefixed
     prefixedPropertyCache[property] = {
       css: kebabCase(property),
@@ -109,10 +112,6 @@ var _getPrefixedValue = function (property, value) {
 // and values.
 /*eslint-disable no-console */
 var prefix = function (style, mode /* 'css' or 'js' */) {
-  if (!ExecutionEnvironment.canUseDOM) {
-    return style;
-  }
-
   mode = mode || 'js';
   var newStyle = {};
   Object.keys(style).forEach(function (property) {

diff --git a/modules/resolve-styles.js b/modules/resolve-styles.js
@@ -57,7 +57,11 @@ var _onMediaQueryChange = function (component, query, mediaQueryList) {
 };
 
 var _resolveMediaQueryStyles = function (component, style) {
-  if (!ExecutionEnvironment.canUseDOM) {
+  if (
+    !ExecutionEnvironment.canUseDOM ||
+    !window ||
+    !window.matchMedia
+  ) {
     return style;
   }