scroll to cc better...

12 files changed, 33 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 54b0db05..daa4d171 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>3</integer>
+			<integer>2</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 c82bcabf..daf78f6b 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:30:10Z</date>
+	<date>2018-06-21T22:58:24Z</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 727ed429..916de651 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 2842fd31..1d9e85bd 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 fd95b7d2..57b1d2a6 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 96ab0820..c30081f9 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 9360a7fa..0b651e30 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 0fba911f..db5a8c7c 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>
-		cu43nj+J04z/rta1dMH8TTij+T0=
+		6YFsup9uxKu+q6c8MCRtdiUB6Bk=
 		</data>
 		<key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key>
 		<data>
-		yHnwXG3jU9SjcL6ziTTuQqpKw6I=
+		0gwflVeEAocGrPzvKblHyerAfyE=
 		</data>
 		<key>CDVLaunchScreen.storyboardc/Info.plist</key>
 		<data>
@@ -106,7 +106,7 @@
 		</data>
 		<key>CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib</key>
 		<data>
-		w+BhyMMPt6EGyxwouvnmvKnBTDI=
+		auskx/PAlkGOr0Oj0ZR7I62F20k=
 		</data>
 		<key>CDVNotification.bundle/beep.wav</key>
 		<data>
@@ -118,7 +118,7 @@
 		</data>
 		<key>MainViewController.nib</key>
 		<data>
-		6VdkwKA0nvqX/+3OURlkeTNx3mk=
+		BDB6nn8KLGc6NK/z5yf+j1eftTI=
 		</data>
 		<key>PkgInfo</key>
 		<data>
@@ -426,7 +426,7 @@
 		</data>
 		<key>www/js/lib/cart/CartPayment.js</key>
 		<data>
-		A2EVn+ZUB/I8bbynexatJPZ1nzE=
+		5jOTXbe2o+4F+StNkwVrE7OOS88=
 		</data>
 		<key>www/js/lib/cart/CartShipping.js</key>
 		<data>
@@ -941,22 +941,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			cu43nj+J04z/rta1dMH8TTij+T0=
+			6YFsup9uxKu+q6c8MCRtdiUB6Bk=
 			</data>
 			<key>hash2</key>
 			<data>
-			fTx+xKmwMVPX4bK2MMezMDVZ1+eFSGV/oDKMWzxAgsM=
+			RYy2TUEcuPR9v6MjJTBHw4tk3kMdXoa2xaydYeWpww4=
 			</data>
 		</dict>
 		<key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			yHnwXG3jU9SjcL6ziTTuQqpKw6I=
+			0gwflVeEAocGrPzvKblHyerAfyE=
 			</data>
 			<key>hash2</key>
 			<data>
-			SKZgzZV4EnIjRvBFofxqaOioOUsxEVqphRGl+ObExwQ=
+			GPzDd3a5/sXBsz4e8Wi+j5p1ELDS+CXZP1313bj5pAI=
 			</data>
 		</dict>
 		<key>CDVLaunchScreen.storyboardc/Info.plist</key>
@@ -974,11 +974,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			w+BhyMMPt6EGyxwouvnmvKnBTDI=
+			auskx/PAlkGOr0Oj0ZR7I62F20k=
 			</data>
 			<key>hash2</key>
 			<data>
-			7XFj1whuBQ1EwlU+XgV86zikfxpHnV804vOG6vbUox4=
+			EDPFV0VGr3yT+iwamv1Qz1VOyQtiqMtwn4j7Ld7vjQA=
 			</data>
 		</dict>
 		<key>CDVNotification.bundle/beep.wav</key>
@@ -996,11 +996,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			6VdkwKA0nvqX/+3OURlkeTNx3mk=
+			BDB6nn8KLGc6NK/z5yf+j1eftTI=
 			</data>
 			<key>hash2</key>
 			<data>
-			l9TnHKw/f+141057vGxB1FNToZyXUynWIs0pOJ+dmYk=
+			Cawef8zrsYZy8LalR8zVbjFATzOs4spAHxNw5jCBBGk=
 			</data>
 		</dict>
 		<key>config.xml</key>
@@ -1832,11 +1832,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			A2EVn+ZUB/I8bbynexatJPZ1nzE=
+			5jOTXbe2o+4F+StNkwVrE7OOS88=
 			</data>
 			<key>hash2</key>
 			<data>
-			w6h0CPlNEcVx7JP1mi+FriCks+rPaqZ7hjAT1qHkHw0=
+			rsZ1sk73QPvIePk0xmWq5EAz6GMtvInWXYVx2z1AY+8=
 			</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 6e071399..884b9d5a 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
@@ -15,6 +15,7 @@ var CartPayment = FormView.extend({
     "change [name=SameAsShipping]": "toggle_shipping",
     "click .address_dropdown": "toggle_address",
     "click .cc_dropdown": "toggle_cc",
+    "focus [name=Number]": "focus_on_cc",
   },
 
   initialize: function(opt){
@@ -82,6 +83,10 @@ var CartPayment = FormView.extend({
     this.$cc_confirm.toggle(this.cc_list_mode)
   },
 
+  focus_on_cc: function(e){
+    this.scroller.scrollToElement(e.currentTarget)
+  },
+
   populate: function(){
     this.$(".save_as_default").show()
     this.$address_list.empty()
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 371cb20d..d744b66e 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>2</integer>
+			<integer>3</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 6e071399..884b9d5a 100755
--- a/StoneIsland/platforms/ios/www/js/lib/cart/CartPayment.js
+++ b/StoneIsland/platforms/ios/www/js/lib/cart/CartPayment.js
@@ -15,6 +15,7 @@ var CartPayment = FormView.extend({
     "change [name=SameAsShipping]": "toggle_shipping",
     "click .address_dropdown": "toggle_address",
     "click .cc_dropdown": "toggle_cc",
+    "focus [name=Number]": "focus_on_cc",
   },
 
   initialize: function(opt){
@@ -82,6 +83,10 @@ var CartPayment = FormView.extend({
     this.$cc_confirm.toggle(this.cc_list_mode)
   },
 
+  focus_on_cc: function(e){
+    this.scroller.scrollToElement(e.currentTarget)
+  },
+
   populate: function(){
     this.$(".save_as_default").show()
     this.$address_list.empty()
diff --git a/StoneIsland/www/js/lib/cart/CartPayment.js b/StoneIsland/www/js/lib/cart/CartPayment.js
index 6e071399..884b9d5a 100755
--- a/StoneIsland/www/js/lib/cart/CartPayment.js
+++ b/StoneIsland/www/js/lib/cart/CartPayment.js
@@ -15,6 +15,7 @@ var CartPayment = FormView.extend({
     "change [name=SameAsShipping]": "toggle_shipping",
     "click .address_dropdown": "toggle_address",
     "click .cc_dropdown": "toggle_cc",
+    "focus [name=Number]": "focus_on_cc",
   },
 
   initialize: function(opt){
@@ -82,6 +83,10 @@ var CartPayment = FormView.extend({
     this.$cc_confirm.toggle(this.cc_list_mode)
   },
 
+  focus_on_cc: function(e){
+    this.scroller.scrollToElement(e.currentTarget)
+  },
+
   populate: function(){
     this.$(".save_as_default").show()
     this.$address_list.empty()