Skip to content

Replace OR with AND operator #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robinweser merged 1 commit into from
Mar 7, 2016
+10 −2
Merged

Replace OR with AND operator #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/plugins/flexboxIE.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' && typeof value==='string' && value.indexOf('flex') > -1) &&
(
(browser === 'ie_mob' || browser === 'ie') && version == 10)
) {
Expand Down
2 changes: 1 addition & 1 deletion modules/plugins/flexboxOld.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' && typeof value==='string' && value.indexOf('flex') > -1) &&
(
browser === 'firefox' && version < 22 ||
browser === 'chrome' && version < 21 ||
Expand Down
8 changes: 8 additions & 0 deletions test/prefixer-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,14 @@ describe('Prefixing display', () => {
display: 'block'
})).to.eql({ display: 'block' })
})
it('should not throw if display is null or undefined', () => {
expect(new Prefixer({ userAgent: Chrome45 }).prefix({
display: null
})).to.eql({ display: null })
expect(new Prefixer({ userAgent: Chrome45 }).prefix({
display: undefined
})).to.eql({ display: undefined })
})
})

describe('Using Prefixer.prefixAll', () => {
Expand Down
⚡