Replace OR with AND operator

Changed the operators in flexboxIE.js and flexboxOld.js. This resolves issues in pages which don't have a display attribute. Closes #70
robinweser · Mar 7, 2016 · d3c0d13 · d3c0d13
1 parent ae4a0d7
commit d3c0d13
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/modules/plugins/flexboxIE.js b/modules/plugins/flexboxIE.js
@@ -26,7 +26,7 @@ const properties = Object.keys(alternativeProps).reduce((result, prop) => {
 
 export default function flexboxIE({ property, value, styles, browserInfo: { browser, version }, prefix: { css }, keepUnprefixed }) {
   if (
-    (properties[property] || property === 'display' && value.indexOf('flex') > -1) &&
+    (properties[property] && property === 'display' && value.indexOf('flex') > -1) &&
     (
     (browser === 'ie_mob' || browser === 'ie') && version == 10)
   ) {

diff --git a/modules/plugins/flexboxOld.js b/modules/plugins/flexboxOld.js
@@ -26,7 +26,7 @@ const properties = Object.keys(alternativeProps).concat(otherProps).reduce((resu
 
 export default function flexboxOld({ property, value, styles, browserInfo: { browser, version }, prefix: { css }, keepUnprefixed }) {
   if (
-    (properties[property] || property === 'display' && value.indexOf('flex') > -1) &&
+    (properties[property] && property === 'display' && value.indexOf('flex') > -1) &&
     (
     browser === 'firefox' && version < 22 ||
     browser === 'chrome' && version < 21 ||