From 0bef350be2ea4ea67655e83633c6f8f5b6c04695 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 11 Dec 2015 13:07:09 -0600 Subject: fix youtube link! --- StoneIsland/config.xml | 2 +- .../user.xcuserdatad/UserInterfaceState.xcuserstate | Bin 42472 -> 41624 bytes .../ios/Stone Island/Stone Island-Info.plist | 8 ++++++-- StoneIsland/platforms/ios/Stone Island/config.xml | 2 +- StoneIsland/platforms/ios/www/index.html | 12 ++++++++++++ .../platforms/ios/www/js/lib/auth/SignupView.js | 2 +- .../platforms/ios/www/js/lib/blogs/PageView.js | 6 ++++++ StoneIsland/platforms/ios/www/js/lib/nav/NavView.js | 1 + StoneIsland/www/index.html | 12 ++++++++++++ StoneIsland/www/js/lib/auth/SignupView.js | 2 +- StoneIsland/www/js/lib/blogs/PageView.js | 6 ++++++ StoneIsland/www/js/lib/nav/NavView.js | 1 + 12 files changed, 48 insertions(+), 6 deletions(-) diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml index 0aa98a1c..37d59b36 100755 --- a/StoneIsland/config.xml +++ b/StoneIsland/config.xml @@ -1,5 +1,5 @@ - + Stone Island 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 b15d7fbf..542af4ac 100755 Binary files a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate and b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist index 0301b456..71fe8f36 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 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.3.5 + 0.3.6 CFBundleSignature ???? CFBundleURLTypes @@ -70,7 +70,7 @@ CFBundleVersion - 0.3.5 + 0.3.6 LSRequiresIPhoneOS NSAppTransportSecurity @@ -205,5 +205,9 @@ UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown + LSApplicationQueriesSchemes + + youtube + \ No newline at end of file diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml index 3269c200..83a47836 100755 --- a/StoneIsland/platforms/ios/Stone Island/config.xml +++ b/StoneIsland/platforms/ios/Stone Island/config.xml @@ -1,5 +1,5 @@ - + diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index 75a546d1..5b949646 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/www/index.html @@ -367,6 +367,18 @@ + +
+
+

Newsletter

+ Receive Stone Island Newsletter +
+
+ + +
+
+
diff --git a/StoneIsland/platforms/ios/www/js/lib/auth/SignupView.js b/StoneIsland/platforms/ios/www/js/lib/auth/SignupView.js index ff5fa6bb..599f57c7 100755 --- a/StoneIsland/platforms/ios/www/js/lib/auth/SignupView.js +++ b/StoneIsland/platforms/ios/www/js/lib/auth/SignupView.js @@ -64,7 +64,7 @@ var SignupView = FormView.extend({ // if (data.Gender === "NONE") { errors.push([ "Gender", "Please supply your gender." ]) } if (data.DataProfiling !== "true") { errors.push([ "DataProfiling", "You must consent to use this service." ]) } if (data.DataProfiling2 !== "true") { errors.push([ "DataProfiling2", "You must consent to use this service." ]) } - if (! data.YooxLetter) { data.YooxLetter = false } + data.YooxLetter = this.$("[name=YooxLetter]").prop("checked") }, finalize: function(data){ diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/PageView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/PageView.js index fab3ff53..c399a2a9 100755 --- a/StoneIsland/platforms/ios/www/js/lib/blogs/PageView.js +++ b/StoneIsland/platforms/ios/www/js/lib/blogs/PageView.js @@ -1,6 +1,7 @@ var PageView = ScrollableView.extend({ events: { + "touchstart a": "follow_link" }, initialize: function(opt){ @@ -28,5 +29,10 @@ var PageView = ScrollableView.extend({ $(this).attr("target", "_system") }) }, + + follow_link: function(e){ + var href = $(e.currentTarget).attr("href") + window.open(row.link, '_system') + }, }) \ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/js/lib/nav/NavView.js b/StoneIsland/platforms/ios/www/js/lib/nav/NavView.js index 71314559..1c12e7a1 100755 --- a/StoneIsland/platforms/ios/www/js/lib/nav/NavView.js +++ b/StoneIsland/platforms/ios/www/js/lib/nav/NavView.js @@ -155,6 +155,7 @@ var NavView = View.extend({ window.open("https://twitter.com/stoneisland", '_system') }, yt: function(){ + console.log("youtube") window.open("https://www.youtube.com/user/StoneIslandOfficial", '_system') }, diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html index 75a546d1..5b949646 100755 --- a/StoneIsland/www/index.html +++ b/StoneIsland/www/index.html @@ -367,6 +367,18 @@
+ +
+
+

Newsletter

+ Receive Stone Island Newsletter +
+
+ + +
+
+
diff --git a/StoneIsland/www/js/lib/auth/SignupView.js b/StoneIsland/www/js/lib/auth/SignupView.js index ff5fa6bb..599f57c7 100755 --- a/StoneIsland/www/js/lib/auth/SignupView.js +++ b/StoneIsland/www/js/lib/auth/SignupView.js @@ -64,7 +64,7 @@ var SignupView = FormView.extend({ // if (data.Gender === "NONE") { errors.push([ "Gender", "Please supply your gender." ]) } if (data.DataProfiling !== "true") { errors.push([ "DataProfiling", "You must consent to use this service." ]) } if (data.DataProfiling2 !== "true") { errors.push([ "DataProfiling2", "You must consent to use this service." ]) } - if (! data.YooxLetter) { data.YooxLetter = false } + data.YooxLetter = this.$("[name=YooxLetter]").prop("checked") }, finalize: function(data){ diff --git a/StoneIsland/www/js/lib/blogs/PageView.js b/StoneIsland/www/js/lib/blogs/PageView.js index fab3ff53..c399a2a9 100755 --- a/StoneIsland/www/js/lib/blogs/PageView.js +++ b/StoneIsland/www/js/lib/blogs/PageView.js @@ -1,6 +1,7 @@ var PageView = ScrollableView.extend({ events: { + "touchstart a": "follow_link" }, initialize: function(opt){ @@ -28,5 +29,10 @@ var PageView = ScrollableView.extend({ $(this).attr("target", "_system") }) }, + + follow_link: function(e){ + var href = $(e.currentTarget).attr("href") + window.open(row.link, '_system') + }, }) \ No newline at end of file diff --git a/StoneIsland/www/js/lib/nav/NavView.js b/StoneIsland/www/js/lib/nav/NavView.js index 71314559..1c12e7a1 100755 --- a/StoneIsland/www/js/lib/nav/NavView.js +++ b/StoneIsland/www/js/lib/nav/NavView.js @@ -155,6 +155,7 @@ var NavView = View.extend({ window.open("https://twitter.com/stoneisland", '_system') }, yt: function(){ + console.log("youtube") window.open("https://www.youtube.com/user/StoneIslandOfficial", '_system') }, -- cgit v1.2.3-70-g09d2