diff options
Diffstat (limited to 'StoneIsland/platforms/android/assets/www/js')
5 files changed, 30 insertions, 7 deletions
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/blogs/PageView.js b/StoneIsland/platforms/android/assets/www/js/lib/blogs/PageView.js index c399a2a9..f5f8ab2e 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/blogs/PageView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/blogs/PageView.js @@ -1,7 +1,7 @@ var PageView = ScrollableView.extend({ events: { - "touchstart a": "follow_link" + "click a": "follow_link" }, initialize: function(opt){ @@ -31,8 +31,11 @@ var PageView = ScrollableView.extend({ }, follow_link: function(e){ + e.stopPropagation() + e.preventDefault() var href = $(e.currentTarget).attr("href") - window.open(row.link, '_system') + console.log(href) + window.open(href, '_system') }, })
\ No newline at end of file diff --git a/StoneIsland/platforms/android/assets/www/js/lib/etc/deeplink.js b/StoneIsland/platforms/android/assets/www/js/lib/etc/deeplink.js index 0522fbc5..7667cfcd 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/etc/deeplink.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/etc/deeplink.js @@ -1,4 +1,5 @@ function handleOpenURL (url) { console.log("DEEP LINKING DETECTED", url) - this.parseRoute( url ) + url = url.replace("stoneisland:/", "") + app.router.parseRoute( url ) }
\ No newline at end of file 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") + }, }) diff --git a/StoneIsland/platforms/android/assets/www/js/lib/products/Selector.js b/StoneIsland/platforms/android/assets/www/js/lib/products/Selector.js index 17278a06..4e23ba1f 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/products/Selector.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/products/Selector.js @@ -44,6 +44,8 @@ var Selector = View.extend({ }, pick: function(e){ + e.preventDefault() + e.stopPropagation() var $option = $(e.currentTarget) var id = String($option.data("id")) var selection = this.lookup[id] |