From 6358718879af099fa5f6da579c800cfcef658569 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 22 Jun 2018 01:23:09 +0200 Subject: focusing working bettr --- .../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 2286 -> 2283 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 | 10 +++++++ .../xcschemes/xcschememanagement.plist | 2 +- .../platforms/ios/www/js/lib/cart/CartPayment.js | 10 +++++++ StoneIsland/www/js/lib/cart/CartPayment.js | 10 +++++++ 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 @@ CordovaLib.xcscheme orderHint - 2 + 3 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 @@ ArchiveVersion 2 CreationDate - 2018-06-21T22:58:24Z + 2018-06-21T23:22:26Z 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 916de651..32bd3db9 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 1d9e85bd..07a1d924 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 57b1d2a6..497b0cdc 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 c30081f9..3db631eb 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 0b651e30..abea5955 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 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 @@ Assets.car - 6YFsup9uxKu+q6c8MCRtdiUB6Bk= + 6C0AqKrBdIj7NDvIHxPy3irseQo= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib - 0gwflVeEAocGrPzvKblHyerAfyE= + 53NwHKSF1zQFbxoQOuz0jsmVX1c= CDVLaunchScreen.storyboardc/Info.plist @@ -106,7 +106,7 @@ CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib - auskx/PAlkGOr0Oj0ZR7I62F20k= + V0Os/SR1q6ZKVMYuD+jVLsp95e8= CDVNotification.bundle/beep.wav @@ -118,7 +118,7 @@ MainViewController.nib - BDB6nn8KLGc6NK/z5yf+j1eftTI= + 5ylL/4JoCw8kfKlsYNOvvpQYiwA= PkgInfo @@ -426,7 +426,7 @@ www/js/lib/cart/CartPayment.js - 5jOTXbe2o+4F+StNkwVrE7OOS88= + Q6dl+xHp26jK5yZsRxUeWfYhnrA= www/js/lib/cart/CartShipping.js @@ -941,22 +941,22 @@ hash - 6YFsup9uxKu+q6c8MCRtdiUB6Bk= + 6C0AqKrBdIj7NDvIHxPy3irseQo= hash2 - RYy2TUEcuPR9v6MjJTBHw4tk3kMdXoa2xaydYeWpww4= + AciqYuzu6JjZKdxH7EPhNcHQmvtYTO6oC1WKDbhZKtA= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib hash - 0gwflVeEAocGrPzvKblHyerAfyE= + 53NwHKSF1zQFbxoQOuz0jsmVX1c= hash2 - GPzDd3a5/sXBsz4e8Wi+j5p1ELDS+CXZP1313bj5pAI= + c7zXcqGGh/Coq/rh/vX4Tc4MN9VsoKheXI959z4yyaE= CDVLaunchScreen.storyboardc/Info.plist @@ -974,11 +974,11 @@ hash - auskx/PAlkGOr0Oj0ZR7I62F20k= + V0Os/SR1q6ZKVMYuD+jVLsp95e8= hash2 - EDPFV0VGr3yT+iwamv1Qz1VOyQtiqMtwn4j7Ld7vjQA= + OfBYP5rBXdE2yeA9O0SoVG4A8gbjMOiQ71iQ7vSuZjI= CDVNotification.bundle/beep.wav @@ -996,11 +996,11 @@ hash - BDB6nn8KLGc6NK/z5yf+j1eftTI= + 5ylL/4JoCw8kfKlsYNOvvpQYiwA= hash2 - Cawef8zrsYZy8LalR8zVbjFATzOs4spAHxNw5jCBBGk= + sHTTBo/Ldq5J9NY5+dOcyWmfQOkyb9/wcmf/UW9KFbo= config.xml @@ -1832,11 +1832,11 @@ hash - 5jOTXbe2o+4F+StNkwVrE7OOS88= + Q6dl+xHp26jK5yZsRxUeWfYhnrA= hash2 - rsZ1sk73QPvIePk0xmWq5EAz6GMtvInWXYVx2z1AY+8= + yg7Sy/c2nFbHZiSlMsHl2Q3d/T29J2LINh+SQCjXO9M= 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 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 @@ Stone Island.xcscheme orderHint - 3 + 2 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(){ -- cgit v1.2.3-70-g09d2