focusing working bettr

12 files changed, 48 insertions, 18 deletions

diff --git a/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist b/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist
index daa4d171..54b0db05 100644
--- a/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -12,7 +12,7 @@
 		<key>CordovaLib.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>3</integer>
 		</dict>
 	</dict>
 </dict>
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist
index daf78f6b..198c3695 100644
--- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist
+++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist
@@ -18,7 +18,7 @@
 	<key>ArchiveVersion</key>
 	<integer>2</integer>
 	<key>CreationDate</key>
-	<date>2018-06-21T22:58:24Z</date>
+	<date>2018-06-21T23:22:26Z</date>
 	<key>Name</key>
 	<string>Stone Island</string>
 	<key>SchemeName</key>
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car
index 916de651..32bd3db9 100644
--- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car
+++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib
index 1d9e85bd..07a1d924 100644
--- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib
+++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib
index 57b1d2a6..497b0cdc 100644
--- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib
+++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib
index c30081f9..3db631eb 100644
--- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib
+++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island
index 0b651e30..abea5955 100755
--- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island
+++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources
index db5a8c7c..67d2289d 100644
--- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources
+++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources
@@ -94,11 +94,11 @@
 		</data>
 		<key>Assets.car</key>
 		<data>
-		6YFsup9uxKu+q6c8MCRtdiUB6Bk=
+		6C0AqKrBdIj7NDvIHxPy3irseQo=
 		</data>
 		<key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key>
 		<data>
-		0gwflVeEAocGrPzvKblHyerAfyE=
+		53NwHKSF1zQFbxoQOuz0jsmVX1c=
 		</data>
 		<key>CDVLaunchScreen.storyboardc/Info.plist</key>
 		<data>
@@ -106,7 +106,7 @@
 		</data>
 		<key>CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib</key>
 		<data>
-		auskx/PAlkGOr0Oj0ZR7I62F20k=
+		V0Os/SR1q6ZKVMYuD+jVLsp95e8=
 		</data>
 		<key>CDVNotification.bundle/beep.wav</key>
 		<data>
@@ -118,7 +118,7 @@
 		</data>
 		<key>MainViewController.nib</key>
 		<data>
-		BDB6nn8KLGc6NK/z5yf+j1eftTI=
+		5ylL/4JoCw8kfKlsYNOvvpQYiwA=
 		</data>
 		<key>PkgInfo</key>
 		<data>
@@ -426,7 +426,7 @@
 		</data>
 		<key>www/js/lib/cart/CartPayment.js</key>
 		<data>
-		5jOTXbe2o+4F+StNkwVrE7OOS88=
+		Q6dl+xHp26jK5yZsRxUeWfYhnrA=
 		</data>
 		<key>www/js/lib/cart/CartShipping.js</key>
 		<data>
@@ -941,22 +941,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			6YFsup9uxKu+q6c8MCRtdiUB6Bk=
+			6C0AqKrBdIj7NDvIHxPy3irseQo=
 			</data>
 			<key>hash2</key>
 			<data>
-			RYy2TUEcuPR9v6MjJTBHw4tk3kMdXoa2xaydYeWpww4=
+			AciqYuzu6JjZKdxH7EPhNcHQmvtYTO6oC1WKDbhZKtA=
 			</data>
 		</dict>
 		<key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			0gwflVeEAocGrPzvKblHyerAfyE=
+			53NwHKSF1zQFbxoQOuz0jsmVX1c=
 			</data>
 			<key>hash2</key>
 			<data>
-			GPzDd3a5/sXBsz4e8Wi+j5p1ELDS+CXZP1313bj5pAI=
+			c7zXcqGGh/Coq/rh/vX4Tc4MN9VsoKheXI959z4yyaE=
 			</data>
 		</dict>
 		<key>CDVLaunchScreen.storyboardc/Info.plist</key>
@@ -974,11 +974,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			auskx/PAlkGOr0Oj0ZR7I62F20k=
+			V0Os/SR1q6ZKVMYuD+jVLsp95e8=
 			</data>
 			<key>hash2</key>
 			<data>
-			EDPFV0VGr3yT+iwamv1Qz1VOyQtiqMtwn4j7Ld7vjQA=
+			OfBYP5rBXdE2yeA9O0SoVG4A8gbjMOiQ71iQ7vSuZjI=
 			</data>
 		</dict>
 		<key>CDVNotification.bundle/beep.wav</key>
@@ -996,11 +996,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			BDB6nn8KLGc6NK/z5yf+j1eftTI=
+			5ylL/4JoCw8kfKlsYNOvvpQYiwA=
 			</data>
 			<key>hash2</key>
 			<data>
-			Cawef8zrsYZy8LalR8zVbjFATzOs4spAHxNw5jCBBGk=
+			sHTTBo/Ldq5J9NY5+dOcyWmfQOkyb9/wcmf/UW9KFbo=
 			</data>
 		</dict>
 		<key>config.xml</key>
@@ -1832,11 +1832,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			5jOTXbe2o+4F+StNkwVrE7OOS88=
+			Q6dl+xHp26jK5yZsRxUeWfYhnrA=
 			</data>
 			<key>hash2</key>
 			<data>
-			rsZ1sk73QPvIePk0xmWq5EAz6GMtvInWXYVx2z1AY+8=
+			yg7Sy/c2nFbHZiSlMsHl2Q3d/T29J2LINh+SQCjXO9M=
 			</data>
 		</dict>
 		<key>www/js/lib/cart/CartShipping.js</key>
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/cart/CartPayment.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/cart/CartPayment.js
index 884b9d5a..3a9e6412 100755
--- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/cart/CartPayment.js
+++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/cart/CartPayment.js
@@ -35,6 +35,11 @@ var CartPayment = FormView.extend({
     this.address = new AddressView ({ parent: this, checkPhone: false })
     this.cc = new CreditCardView ({ parent: this })
     this.scroller = new IScroll('#cart_payment', app.iscroll_options)
+    this.scroller.on('scrollStart', function(){
+      if (document.activeElement.tagName === 'INPUT' || document.activeElement.tagName === 'SELECT') {
+        document.activeElement.blur()
+      }
+    })
     this.address.disabled = true
     this.cc.disabled = true
   },
@@ -85,6 +90,11 @@ var CartPayment = FormView.extend({
 
   focus_on_cc: function(e){
     this.scroller.scrollToElement(e.currentTarget)
+    if (e.currentTarget.textShadow === '') {
+      e.currentTarget.textShadow = 'rgba(0,0,0,0) 0 0 0';
+    } else {
+      e.currentTarget.textShadow = '';
+    }
   },
 
   populate: function(){
diff --git a/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist b/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist
index d744b66e..371cb20d 100644
--- a/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>Stone Island.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>2</integer>
 		</dict>
 	</dict>
 </dict>
diff --git a/StoneIsland/platforms/ios/www/js/lib/cart/CartPayment.js b/StoneIsland/platforms/ios/www/js/lib/cart/CartPayment.js
index 884b9d5a..3a9e6412 100755
--- a/StoneIsland/platforms/ios/www/js/lib/cart/CartPayment.js
+++ b/StoneIsland/platforms/ios/www/js/lib/cart/CartPayment.js
@@ -35,6 +35,11 @@ var CartPayment = FormView.extend({
     this.address = new AddressView ({ parent: this, checkPhone: false })
     this.cc = new CreditCardView ({ parent: this })
     this.scroller = new IScroll('#cart_payment', app.iscroll_options)
+    this.scroller.on('scrollStart', function(){
+      if (document.activeElement.tagName === 'INPUT' || document.activeElement.tagName === 'SELECT') {
+        document.activeElement.blur()
+      }
+    })
     this.address.disabled = true
     this.cc.disabled = true
   },
@@ -85,6 +90,11 @@ var CartPayment = FormView.extend({
 
   focus_on_cc: function(e){
     this.scroller.scrollToElement(e.currentTarget)
+    if (e.currentTarget.textShadow === '') {
+      e.currentTarget.textShadow = 'rgba(0,0,0,0) 0 0 0';
+    } else {
+      e.currentTarget.textShadow = '';
+    }
   },
 
   populate: function(){
diff --git a/StoneIsland/www/js/lib/cart/CartPayment.js b/StoneIsland/www/js/lib/cart/CartPayment.js
index 884b9d5a..3a9e6412 100755
--- a/StoneIsland/www/js/lib/cart/CartPayment.js
+++ b/StoneIsland/www/js/lib/cart/CartPayment.js
@@ -35,6 +35,11 @@ var CartPayment = FormView.extend({
     this.address = new AddressView ({ parent: this, checkPhone: false })
     this.cc = new CreditCardView ({ parent: this })
     this.scroller = new IScroll('#cart_payment', app.iscroll_options)
+    this.scroller.on('scrollStart', function(){
+      if (document.activeElement.tagName === 'INPUT' || document.activeElement.tagName === 'SELECT') {
+        document.activeElement.blur()
+      }
+    })
     this.address.disabled = true
     this.cc.disabled = true
   },
@@ -85,6 +90,11 @@ var CartPayment = FormView.extend({
 
   focus_on_cc: function(e){
     this.scroller.scrollToElement(e.currentTarget)
+    if (e.currentTarget.textShadow === '') {
+      e.currentTarget.textShadow = 'rgba(0,0,0,0) 0 0 0';
+    } else {
+      e.currentTarget.textShadow = '';
+    }
   },
 
   populate: function(){