Merge branch 'android' of github.com:okfocus/stone-island into android

2 files changed, 21 insertions, 4 deletions

diff --git a/StoneIsland/platforms/android/assets/www/js/lib/nav/FooterView.js b/StoneIsland/platforms/android/assets/www/js/lib/nav/FooterView.js
index 74b249e6..8641668f 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/nav/FooterView.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/nav/FooterView.js
@@ -10,6 +10,7 @@ var FooterView = View.extend({
   initialize: function(){
     this.$ok = this.$(".ok")
     this.$cancel = this.$(".cancel")
+    this.hide()
   },
   
   show: function(ok, cancel){
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/nav/IntroView.js b/StoneIsland/platforms/android/assets/www/js/lib/nav/IntroView.js
index 8797241f..5e5ea908 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/nav/IntroView.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/nav/IntroView.js
@@ -41,9 +41,25 @@ var IntroView = View.extend({
     this.compass.style[transformProp] = "translateZ(0) translateX(-50%) translateY(-50%) rotate(" + heading + "deg)"
   },
   
-  store: function(){ app.router.go("store") },
-  hub: function(){ app.router.go("hub") },
-  story: function(){ app.router.go("story") },
-  archive: function(){ app.router.go("archive") },
+  store: function(e){ 
+    e.preventDefault()
+    e.stopPropagation()
+    app.router.go("store")
+  },
+  hub: function(e){ 
+    e.preventDefault()
+    e.stopPropagation()
+    app.router.go("hub") 
+  },
+  story: function(e){ 
+    e.preventDefault()
+    e.stopPropagation()
+    app.router.go("story") 
+  },
+  archive: function(e){ 
+    e.preventDefault()
+    e.stopPropagation()
+    app.router.go("archive") 
+  },
 
 })