Skip to content

Commit

Permalink
Fix fx module on IE10/11, references madrobby#869.
Browse files Browse the repository at this point in the history
No vendor prefixes are required on these browsers.
  • Loading branch information
madrobby committed Dec 2, 2013
1 parent 5d473d3 commit f134d3a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/fx.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

;(function($, undefined){
var prefix = '', eventPrefix, endEventName, endAnimationName,
vendors = { Webkit: 'webkit', Moz: '', O: 'o', ms: 'MS' },
vendors = { Webkit: 'webkit', Moz: '', O: 'o' },
document = window.document, testEl = document.createElement('div'),
supportedTransforms = /^((translate|rotate|scale)(X|Y|Z|3d)?|matrix(3d)?|perspective|skew(X|Y)?)$/i,
transform,
Expand Down
16 changes: 15 additions & 1 deletion test/fx.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,22 @@
opacity: 0.5;
}
}
@keyframes animName {
from {
transform: rotate(180deg) scale(.8) translate(0, 0);
opacity: 1;
}
to {
transform: rotate(0deg) scale(1) translate(80px, 20px);
opacity: 0.5;
}
}

#keyframetest {
opacity: 0.5;
-webkit-transform: translate3d(80px, 20px, 0);
-moz-transform: translate3d(80px, 20px, 0);
transform: translate3d(80px, 20px, 0);
}

.fixtures-left {
Expand Down Expand Up @@ -111,7 +122,10 @@ <h1>Zepto effects tests</h1>
var actual = object.style[camelize(property)],
expression = expected instanceof RegExp ? expected.test(actual) : expected === actual

this._assertExpression(expression, message || 'Failed assertion.', 'Expected %s, got %s.', expected, actual)
this._assertExpression(expression, message || 'Failed assertion.',
'Expected '+property+' to be '+expected+', got '+actual+'.\n'+
$.fx.stylePrefix +':\n' +
object.style.cssText)
}

Evidence('ZeptoFXTest', {
Expand Down

0 comments on commit f134d3a

Please sign in to comment.