Merge remote-tracking branch 'origin/dev' into dev

alibaba · Jul 7, 2016 · 51653f3 · 51653f3
2 parents eba7648 + acb559a
commit 51653f3
Show file tree

Hide file tree

Showing 88 changed files with 7,457 additions and 43,429 deletions.
diff --git a/android/playground/app/src/main/assets/animation.js b/android/playground/app/src/main/assets/animation.js
@@ -1052,7 +1052,7 @@
 	      },
 	      "shown": function () {return !this.rightItemSrc},
 	      "events": {
-	        "click": "onclickrigthitem"
+	        "click": "onclickrightitem"
 	      }
 	    },
 	    {

diff --git a/android/playground/app/src/main/assets/archive/activity.js b/android/playground/app/src/main/assets/archive/activity.js