build ios

6 files changed, 25 insertions, 16 deletions

diff --git a/StoneIsland/platforms/ios/www/js/lib/account/ProfileView.js b/StoneIsland/platforms/ios/www/js/lib/account/ProfileView.js
index 2b608cb4..d36f7f38 100755
--- a/StoneIsland/platforms/ios/www/js/lib/account/ProfileView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/account/ProfileView.js
@@ -17,7 +17,6 @@ var ProfileView = FormView.extend({
     if (! auth.logged_in()) { return app.router.go("intro") }
     app.footer.show("SAVE")
     document.body.className = "profile"
-    auth.user.DataProfiling2 = auth.user.DataProfiling
     if (auth.user.BirthDay.match(/T/)) {
       auth.user.BirthDay = auth.user.BirthDay.split("T")[0]
     }
diff --git a/StoneIsland/platforms/ios/www/js/lib/auth/SignupView.js b/StoneIsland/platforms/ios/www/js/lib/auth/SignupView.js
index 599f57c7..4645d4d9 100755
--- a/StoneIsland/platforms/ios/www/js/lib/auth/SignupView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/auth/SignupView.js
@@ -15,7 +15,6 @@ var SignupView = FormView.extend({
     "Surname": "TestSurname",
     "BirthDay": "1978-11-12",
     "DataProfiling": true,
-    "DataProfiling2": true,
   },
 */
 
@@ -63,12 +62,10 @@ var SignupView = FormView.extend({
     if (data.Email.toLowerCase() !== data.ConfirmEmail.toLowerCase()) { errors.push([ "ConfirmEmail", "Email addresses don't match." ]) }
     // 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." ]) }
     data.YooxLetter = this.$("[name=YooxLetter]").prop("checked")
   },
   
   finalize: function(data){
-    delete data.DataProfiling2
     delete data.ConfirmEmail
     
     data.Gender = "U"
diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/StoryView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/StoryView.js
index c2a9f4b4..73b7b83b 100755
--- a/StoneIsland/platforms/ios/www/js/lib/blogs/StoryView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/blogs/StoryView.js
@@ -26,7 +26,7 @@ var StoryView = ScrollableView.extend({
   },
   
   populate: function(data){
-    if (this.loaded) {}
+    if (this.loaded) { return }
     this.loaded = true
     this.data = data
     this.$loader.hide()
diff --git a/StoneIsland/platforms/ios/www/js/lib/nav/NavView.js b/StoneIsland/platforms/ios/www/js/lib/nav/NavView.js
index 1c12e7a1..fc373858 100755
--- a/StoneIsland/platforms/ios/www/js/lib/nav/NavView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/nav/NavView.js
@@ -115,7 +115,7 @@ var NavView = View.extend({
     app.router.go("account/settings")
   },
   return_link: function(){
-    window.open("http://www.stoneisland.com/", '_system')
+    window.open("http://www.stoneisland.com/localize.asp?tskay=4036416C&page=help/return&deviceYeti=smartphone", '_system')
   },
 
 
@@ -135,7 +135,7 @@ var NavView = View.extend({
     app.router.go("page/terms")
   },
   care: function(){
-    window.open("http://www.stoneisland.com/localize.asp?tskay=4036416C&page=help/return&deviceYeti=smartphone", '_system')
+    window.open("http://www.stoneisland.com/localize.asp?tskay=4036416C&page=help/home&deviceYeti=smartphone", '_system')
   },
 
 
@@ -146,7 +146,7 @@ var NavView = View.extend({
   
   
   fb: function(){
-    window.open("https://www.facebook.com/StoneIsland", '_system')
+    window.open(is_ios ? "facebook://profile/231623463406" : "https://www.facebook.com/StoneIsland", '_system')
   },
   insta: function(){
     window.open("https://instagram.com/stoneisland_official", '_system')
@@ -155,7 +155,6 @@ 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/platforms/ios/www/js/lib/products/Selector.js b/StoneIsland/platforms/ios/www/js/lib/products/Selector.js
index 4e23ba1f..4e0a5f04 100755
--- a/StoneIsland/platforms/ios/www/js/lib/products/Selector.js
+++ b/StoneIsland/platforms/ios/www/js/lib/products/Selector.js
@@ -27,13 +27,26 @@ var Selector = View.extend({
     this.$el.show()
     app.curtain.show("white")
     this.visible = true
-//     var selectionXY = $("." + origin).offset()
-//     var selectionWidth = $("." + origin).width()
-//     var selectorHeight = $('#selector').height()
-//     console.log(selectionXY.left)
-//     console.log(selectionXY.top)
-// 
-//       $("#selector").css({"top":(selectionXY.top - selectorHeight),"left":selectionXY.left})
+    if ( origin == "wide") {
+      $("#selector").addClass("selector-full")
+    }
+    else {
+      $("#selector").removeClass("selector-full")
+    }
+     var originXY = $("." + origin).offset()
+     var originWidth = $("." + origin).width()
+     var selectorHeight = $('#selector').height()
+     var originHeight = $("." + origin).height()
+     console.log(originXY.left)
+     console.log(originXY.top)
+     console.log(selectorHeight)
+     console.log(origin)
+
+       $("#selector").css({"top":(originXY.top - selectorHeight - originHeight + 20),"left":originXY.left})
+    originXY = null;
+    originWidth = null;
+    originHeight = null;
+    selectorHeight = null;
   },
   
   hide: function(){
diff --git a/StoneIsland/platforms/ios/www/js/vendor/util.js b/StoneIsland/platforms/ios/www/js/vendor/util.js
index e09b6ada..d45c4b98 100755
--- a/StoneIsland/platforms/ios/www/js/vendor/util.js
+++ b/StoneIsland/platforms/ios/www/js/vendor/util.js
@@ -173,6 +173,7 @@ var browser = (function( ua ) {
 // Naive useragent detection pattern
 var is_iphone = (navigator.userAgent.match(/iPhone/i)) || (navigator.userAgent.match(/iPod/i))
 var is_ipad = (navigator.userAgent.match(/iPad/i))
+var is_ios = is_iphone || is_ipad
 var is_android = (navigator.userAgent.match(/Android/i))
 var is_mobile = is_iphone || is_ipad || is_android
 var is_desktop = ! is_mobile;