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

10 files changed, 20 insertions, 8 deletions

diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml
index 83d0c594..f75605ea 100755
--- a/StoneIsland/config.xml
+++ b/StoneIsland/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="us.okfoc.stoneisland" version="0.4.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="us.okfoc.stoneisland" version="0.4.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Stone Island</name>
     <description>
         Stone Island
diff --git a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
index 723b3cc3..df85b60f 100755
--- a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
index 7af2be2c..e72b52b5 100755
--- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
+++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
@@ -57,7 +57,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.0</string>
+	<string>0.4.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -70,7 +70,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>0.4.0</string>
+	<string>0.4.1</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>youtube</string>
diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml
index fd9f66a6..9af7f246 100755
--- a/StoneIsland/platforms/ios/Stone Island/config.xml
+++ b/StoneIsland/platforms/ios/Stone Island/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="us.okfoc.stoneisland" version="0.4.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="us.okfoc.stoneisland" version="0.4.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <preference name="AllowInlineMediaPlayback" value="false" />
     <preference name="BackupWebStorage" value="cloud" />
     <preference name="DisallowOverscroll" value="false" />
diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/PageView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/PageView.js
index c399a2a9..f5f8ab2e 100755
--- a/StoneIsland/platforms/ios/www/js/lib/blogs/PageView.js
+++ b/StoneIsland/platforms/ios/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/ios/www/js/lib/nav/FooterView.js b/StoneIsland/platforms/ios/www/js/lib/nav/FooterView.js
index 74b249e6..8641668f 100755
--- a/StoneIsland/platforms/ios/www/js/lib/nav/FooterView.js
+++ b/StoneIsland/platforms/ios/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/ios/www/js/lib/products/Selector.js b/StoneIsland/platforms/ios/www/js/lib/products/Selector.js
index 17278a06..4e23ba1f 100755
--- a/StoneIsland/platforms/ios/www/js/lib/products/Selector.js
+++ b/StoneIsland/platforms/ios/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]
diff --git a/StoneIsland/www/js/lib/blogs/PageView.js b/StoneIsland/www/js/lib/blogs/PageView.js
index c399a2a9..f5f8ab2e 100755
--- a/StoneIsland/www/js/lib/blogs/PageView.js
+++ b/StoneIsland/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/www/js/lib/nav/FooterView.js b/StoneIsland/www/js/lib/nav/FooterView.js
index 74b249e6..8641668f 100755
--- a/StoneIsland/www/js/lib/nav/FooterView.js
+++ b/StoneIsland/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/www/js/lib/products/Selector.js b/StoneIsland/www/js/lib/products/Selector.js
index 17278a06..4e23ba1f 100755
--- a/StoneIsland/www/js/lib/products/Selector.js
+++ b/StoneIsland/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]