Replace OR with AND operator

tintin1343 · tintin1343 · commit 39230ed7bc04 · 2016-03-07T12:35:53.000-06:00
Changed the operators in flexboxIE.js and flexboxOld.js
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 ||

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ const properties = Object.keys(alternativeProps).reduce((result, prop) => {`
`26`	`26`
`27`	`27`	`export default function flexboxIE({ property, value, styles, browserInfo: { browser, version }, prefix: { css }, keepUnprefixed }) {`
`28`	`28`	`if (`
`29`		`- (properties[property] \|\| property === 'display' && value.indexOf('flex') > -1) &&`
	`29`	`+ (properties[property] && property === 'display' && value.indexOf('flex') > -1) &&`
`30`	`30`	`(`
`31`	`31`	`(browser === 'ie_mob' \|\| browser === 'ie') && version == 10)`
`32`	`32`	`) {`