fix fx.js dasherize bug

LEV7n · Apr 26, 2016 · 8596fe9 · 8596fe9
1 parent 601372a
commit 8596fe9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/fx.js b/src/fx.js
@@ -12,7 +12,7 @@
     animationName, animationDuration, animationTiming, animationDelay,
     cssReset = {}
 
-  function dasherize(str) { return str.replace(/([a-z])([A-Z])/, '$1-$2').toLowerCase() }
+  function dasherize(str) { return str.replace(/([A-Z])/g, '-$1').toLowerCase() }
   function normalizeEvent(name) { return eventPrefix ? eventPrefix + name : name.toLowerCase() }
 
   $.each(vendors, function(vendor, event){

diff --git a/test/fx.html b/test/fx.html
@@ -138,7 +138,8 @@ <h1>Zepto Fx unit tests</h1>
           rotateZ: '90deg',
           scale: '0.8',
           opacity: 0.5,
-          backgroundColor: '#BADA55'
+          backgroundColor: '#BADA55',
+          backgroundPositionY: '50%'
         }, 200, 'ease-out')
 
         el2.animate({
@@ -153,6 +154,7 @@ <h1>Zepto Fx unit tests</h1>
         t.assertStyle('ease-out', el, 'transition-timing-function')
         t.assertStyle('0.2s', el, 'transition-duration')
         t.assertStyle(/\bbackground-color\b/, el, 'transition-property')
+        t.assertStyle(/\bbackground-position-y\b/, el, 'transition-property')
         t.assertStyle(/\btransform\b/, el, 'transition-property')
         t.assertStyle('0.18s', el2, 'transition-duration')
 
@@ -161,6 +163,7 @@ <h1>Zepto Fx unit tests</h1>
           t.resume(function(){
             t.assertStyle('translate3d(80px, 20px, 100px) rotateZ(90deg) scale(0.8)', el, 'transform')
             t.assertStyle('0.5', el, 'opacity')
+            t.assertStyle('50%', el, 'background-position-y')
             t.assertEqual('#BADA55', colorToHex(el.get(0).style.backgroundColor).toUpperCase())
           })
         })