v0.2.0 release

zhaoda · Nov 27, 2013 · 2561382 · 2561382
1 parent a60c322
commit 2561382
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/dist/spa.js b/dist/spa.js
@@ -1,5 +1,5 @@
 /*!
- * SPA v0.1.1
+ * SPA v0.2.0
  * A webapp framework for routing control and view transitions
  * Copyright 2013 zhaoda <http://zhaoda.net>
  * Licensed under MIT https://raw.github.com/zhaoda/spa/master/LICENSE
@@ -1089,7 +1089,8 @@
     }
 
     //如果是返回之前的页面，强制设置为之前页面的反相动画效果
-    if($curPage && $curPage.data('prevPage.spa') && $curPage.data('prevPage.spa').data('id.spa') == $page.data('id.spa')) {
+    //但是，pushData.animate的优先级更高
+    if(!pushData.animate && $curPage && $curPage.data('prevPage.spa') && $curPage.data('prevPage.spa').data('id.spa') == $page.data('id.spa')) {
       var prevAnimate = $curPage.data('prevAnimate.spa')
       if(prevAnimate && !$.isFunction(prevAnimate)) {
         animate = transitPageAnimatesName[prevAnimate]