修复了$.fn.emulateTransition可能和其他框架造成冲突的问题

zhaoda · Sep 23, 2015 · febd056 · febd056
1 parent 6d8bd00
commit febd056
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/dist/spa-apis.js b/dist/spa-apis.js
@@ -448,7 +448,7 @@
     requestAnimationFrame(function() {
       $el.get(0).offsetWidth
       properties[transitionName] = '0.4s'
-      $el.css(properties).emulateTransitionEnd(function() {
+      $el.css(properties).emulateTransitionEndBySpa(function() {
         // 过渡动画结束后移除 transition
         properties = {}
         properties[transitionName] = ''
@@ -466,7 +466,7 @@
   }
 
   // transitionEnd 回调
-  $.fn.emulateTransitionEnd = function(callback, duration) {
+  $.fn.emulateTransitionEndBySpa = function(callback, duration) {
     var called = false,
         $el = $(this),
         endtimer

diff --git a/dist/spa-apis.min.js b/dist/spa-apis.min.js
diff --git a/dist/spa.js b/dist/spa.js
@@ -448,7 +448,7 @@
     requestAnimationFrame(function() {
       $el.get(0).offsetWidth
       properties[transitionName] = '0.4s'
-      $el.css(properties).emulateTransitionEnd(function() {
+      $el.css(properties).emulateTransitionEndBySpa(function() {
         // 过渡动画结束后移除 transition
         properties = {}
         properties[transitionName] = ''
@@ -466,7 +466,7 @@
   }
 
   // transitionEnd 回调
-  $.fn.emulateTransitionEnd = function(callback, duration) {
+  $.fn.emulateTransitionEndBySpa = function(callback, duration) {
     var called = false,
         $el = $(this),
         endtimer

diff --git a/dist/spa.min.js b/dist/spa.min.js
diff --git a/src/spa.js b/src/spa.js
@@ -441,7 +441,7 @@
     requestAnimationFrame(function() {
       $el.get(0).offsetWidth
       properties[transitionName] = '0.4s'
-      $el.css(properties).emulateTransitionEnd(function() {
+      $el.css(properties).emulateTransitionEndBySpa(function() {
         // 过渡动画结束后移除 transition
         properties = {}
         properties[transitionName] = ''
@@ -459,7 +459,7 @@
   }
 
   // transitionEnd 回调
-  $.fn.emulateTransitionEnd = function(callback, duration) {
+  $.fn.emulateTransitionEndBySpa = function(callback, duration) {
     var called = false,
         $el = $(this),
         endtimer