From ba67e8db43529910b3632410755c4621e43ced91 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 22 Jun 2018 00:59:03 +0200 Subject: scroll to cc better... --- .../xcschemes/xcschememanagement.plist | 2 +- .../ios/Stone Island.xcarchive/Info.plist | 2 +- .../Applications/Stone Island.app/Assets.car | Bin 844136 -> 844136 bytes .../01J-lp-oVM-view-Ze5-6b-2t3.nib | Bin 2285 -> 2286 bytes .../UIViewController-01J-lp-oVM.nib | Bin 832 -> 832 bytes .../Stone Island.app/MainViewController.nib | Bin 943 -> 943 bytes .../Applications/Stone Island.app/Stone Island | Bin 2224192 -> 2224192 bytes .../Stone Island.app/_CodeSignature/CodeResources | 30 ++++++++++----------- .../www/js/lib/cart/CartPayment.js | 5 ++++ .../xcschemes/xcschememanagement.plist | 2 +- .../platforms/ios/www/js/lib/cart/CartPayment.js | 5 ++++ StoneIsland/www/js/lib/cart/CartPayment.js | 5 ++++ 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 @@ CordovaLib.xcscheme orderHint - 3 + 2 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 @@ ArchiveVersion 2 CreationDate - 2018-06-21T22:30:10Z + 2018-06-21T22:58:24Z Name Stone Island SchemeName 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 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car differ 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 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib differ 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 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib differ 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 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib differ 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 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island differ 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 @@ Assets.car - cu43nj+J04z/rta1dMH8TTij+T0= + 6YFsup9uxKu+q6c8MCRtdiUB6Bk= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib - yHnwXG3jU9SjcL6ziTTuQqpKw6I= + 0gwflVeEAocGrPzvKblHyerAfyE= CDVLaunchScreen.storyboardc/Info.plist @@ -106,7 +106,7 @@ CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib - w+BhyMMPt6EGyxwouvnmvKnBTDI= + auskx/PAlkGOr0Oj0ZR7I62F20k= CDVNotification.bundle/beep.wav @@ -118,7 +118,7 @@ MainViewController.nib - 6VdkwKA0nvqX/+3OURlkeTNx3mk= + BDB6nn8KLGc6NK/z5yf+j1eftTI= PkgInfo @@ -426,7 +426,7 @@ www/js/lib/cart/CartPayment.js - A2EVn+ZUB/I8bbynexatJPZ1nzE= + 5jOTXbe2o+4F+StNkwVrE7OOS88= www/js/lib/cart/CartShipping.js @@ -941,22 +941,22 @@ hash - cu43nj+J04z/rta1dMH8TTij+T0= + 6YFsup9uxKu+q6c8MCRtdiUB6Bk= hash2 - fTx+xKmwMVPX4bK2MMezMDVZ1+eFSGV/oDKMWzxAgsM= + RYy2TUEcuPR9v6MjJTBHw4tk3kMdXoa2xaydYeWpww4= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib hash - yHnwXG3jU9SjcL6ziTTuQqpKw6I= + 0gwflVeEAocGrPzvKblHyerAfyE= hash2 - SKZgzZV4EnIjRvBFofxqaOioOUsxEVqphRGl+ObExwQ= + GPzDd3a5/sXBsz4e8Wi+j5p1ELDS+CXZP1313bj5pAI= CDVLaunchScreen.storyboardc/Info.plist @@ -974,11 +974,11 @@ hash - w+BhyMMPt6EGyxwouvnmvKnBTDI= + auskx/PAlkGOr0Oj0ZR7I62F20k= hash2 - 7XFj1whuBQ1EwlU+XgV86zikfxpHnV804vOG6vbUox4= + EDPFV0VGr3yT+iwamv1Qz1VOyQtiqMtwn4j7Ld7vjQA= CDVNotification.bundle/beep.wav @@ -996,11 +996,11 @@ hash - 6VdkwKA0nvqX/+3OURlkeTNx3mk= + BDB6nn8KLGc6NK/z5yf+j1eftTI= hash2 - l9TnHKw/f+141057vGxB1FNToZyXUynWIs0pOJ+dmYk= + Cawef8zrsYZy8LalR8zVbjFATzOs4spAHxNw5jCBBGk= config.xml @@ -1832,11 +1832,11 @@ hash - A2EVn+ZUB/I8bbynexatJPZ1nzE= + 5jOTXbe2o+4F+StNkwVrE7OOS88= hash2 - w6h0CPlNEcVx7JP1mi+FriCks+rPaqZ7hjAT1qHkHw0= + rsZ1sk73QPvIePk0xmWq5EAz6GMtvInWXYVx2z1AY+8= www/js/lib/cart/CartShipping.js 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 @@ Stone Island.xcscheme orderHint - 2 + 3 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() -- cgit v1.2.3-70-g09d2