diff --git a/src/lib/utils/auto-prefixer.spec.ts b/src/lib/utils/auto-prefixer.spec.ts index 78e33591b..6880c1bc7 100644 --- a/src/lib/utils/auto-prefixer.spec.ts +++ b/src/lib/utils/auto-prefixer.spec.ts @@ -27,8 +27,9 @@ describe('auto-prefixer for ', () => { let actual = applyCssPrefixes(input); expect(Array.isArray(actual['display'])).toBeTruthy(); expect(actual['display'][0]).toEqual('-webkit-box'); - expect(actual['display'][4]).toEqual('flex'); + expect(actual['display'][3]).toEqual('flex'); }); + }); /** diff --git a/src/lib/utils/auto-prefixer.ts b/src/lib/utils/auto-prefixer.ts index e8a22fcf2..4db9d4f28 100644 --- a/src/lib/utils/auto-prefixer.ts +++ b/src/lib/utils/auto-prefixer.ts @@ -17,7 +17,6 @@ export function applyCssPrefixes(target) { if (value === 'flex') { target['display'] = [ '-webkit-box', - '-moz-box', '-ms-flexbox', '-webkit-flex', 'flex' @@ -25,7 +24,6 @@ export function applyCssPrefixes(target) { } else if (value === 'inline-flex') { target['display'] = [ '-webkit-inline-box', - '-moz-inline-box', '-ms-inline-flexbox', '-webkit-inline-flex', 'inline-flex' @@ -39,18 +37,17 @@ export function applyCssPrefixes(target) { target['-ms-flex'] = value; target['-webkit-flex'] = value; target['-webkit-box-flex'] = value.split(" ")[0]; - target['-moz-box-flex'] = value.split(" ")[0]; break; case 'flex-direction': value = value || "row"; - target['flex-direction'] = value; target['-ms-flex-direction'] = value; target['-webkit-flex-direction'] = value; target['-webkit-box-orient'] = toBoxOrient(value); target['-moz-box-orient'] = toBoxOrient(value); target['-webkit-box-direction'] = toBoxDirection(value); target['-moz-box-direction'] = toBoxDirection(value); + target['flex-direction'] = value; break; case 'flex-wrap': @@ -78,24 +75,21 @@ export function applyCssPrefixes(target) { if (isNaN(value)) { value = "0"; } - target['order'] = value; - target['-webkit-order'] = value; target['-ms-flex-order'] = value; - target['-moz-box-ordinal-group'] = toBoxOrdinal(value); target['-webkit-box-ordinal-group'] = toBoxOrdinal(value); + target['-webkit-order'] = value; + target['order'] = value; break; case 'justify-content': target['-ms-flex-pack'] = toBoxValue(value); target['-webkit-box-pack'] = toBoxValue(value); - target['-moz-box-pack'] = toBoxValue(value); target['-webkit-justify-content'] = value; break; case 'align-items': target['-ms-flex-align'] = toBoxValue(value); target['-webkit-box-align'] = toBoxValue(value); - target['-moz-box-align'] = toBoxValue(value); target['-webkit-align-items'] = toBoxValue(value); break;