diff options
| author | Rene Ae <aehtyb@gmail.com> | 2015-12-11 03:05:10 -0600 |
|---|---|---|
| committer | Rene Ae <aehtyb@gmail.com> | 2015-12-11 03:05:10 -0600 |
| commit | b1775dd32d1e0113eba81cfdb9a5626295eebc4e (patch) | |
| tree | 19a2f4ea004d11037e494e863a39ac834d364429 /StoneIsland/platforms/ios/www/js/lib/account | |
| parent | 3442b2821d30dd1ca6c6db1ba089ae3f5c95a758 (diff) | |
| parent | 053473394e6e0990c68a924adbb7c7d75f35973d (diff) | |
Merge branch 'android' of https://github.com/okfocus/stone-island into android
Diffstat (limited to 'StoneIsland/platforms/ios/www/js/lib/account')
5 files changed, 6 insertions, 6 deletions
diff --git a/StoneIsland/platforms/ios/www/js/lib/account/OrdersView.js b/StoneIsland/platforms/ios/www/js/lib/account/OrdersView.js index e51676e0..a1b83767 100755 --- a/StoneIsland/platforms/ios/www/js/lib/account/OrdersView.js +++ b/StoneIsland/platforms/ios/www/js/lib/account/OrdersView.js @@ -8,8 +8,8 @@ var OrdersView = ScrollableView.extend({ item_template: $("#orders .item_template").html(), events: { - "touchstart .back": "back", - "touchstart .item": "load_single", + "click .back": "back", + "click .item": "load_single", }, initialize: function(){ diff --git a/StoneIsland/platforms/ios/www/js/lib/account/PaymentView.js b/StoneIsland/platforms/ios/www/js/lib/account/PaymentView.js index 03dc8cbf..8b49ed1d 100755 --- a/StoneIsland/platforms/ios/www/js/lib/account/PaymentView.js +++ b/StoneIsland/platforms/ios/www/js/lib/account/PaymentView.js @@ -34,7 +34,7 @@ var PaymentView = FormView.extend({ show: function(){ if (! auth.logged_in()) { return app.router.go("intro") } - app.footer.show("SAVE", "CANCEL") + app.footer.show("SAVE") document.body.className = "payment" this.deferScrollToTop() // this.preload() diff --git a/StoneIsland/platforms/ios/www/js/lib/account/ProfileView.js b/StoneIsland/platforms/ios/www/js/lib/account/ProfileView.js index ed2f3536..f370c055 100755 --- a/StoneIsland/platforms/ios/www/js/lib/account/ProfileView.js +++ b/StoneIsland/platforms/ios/www/js/lib/account/ProfileView.js @@ -15,7 +15,7 @@ var ProfileView = FormView.extend({ show: function(){ if (! auth.logged_in()) { return app.router.go("intro") } - app.footer.show("SAVE", "CANCEL") + app.footer.show("SAVE") document.body.className = "profile" this.preload(auth.user) this.deferScrollToTop() diff --git a/StoneIsland/platforms/ios/www/js/lib/account/SettingsView.js b/StoneIsland/platforms/ios/www/js/lib/account/SettingsView.js index 7f96bb88..0de80048 100755 --- a/StoneIsland/platforms/ios/www/js/lib/account/SettingsView.js +++ b/StoneIsland/platforms/ios/www/js/lib/account/SettingsView.js @@ -13,7 +13,7 @@ var SettingsView = FormView.extend({ show: function(){ if (! auth.logged_in()) { return app.router.go("intro") } - app.footer.show("SAVE", "CANCEL") + app.footer.show("SAVE") document.body.className = "settings" this.deferScrollToTop() }, diff --git a/StoneIsland/platforms/ios/www/js/lib/account/ShippingView.js b/StoneIsland/platforms/ios/www/js/lib/account/ShippingView.js index 39baf2aa..0bf88025 100755 --- a/StoneIsland/platforms/ios/www/js/lib/account/ShippingView.js +++ b/StoneIsland/platforms/ios/www/js/lib/account/ShippingView.js @@ -33,7 +33,7 @@ var ShippingView = FormView.extend({ show: function(){ if (! auth.logged_in()) { return app.router.go("intro") } // this.preload( this.data || this.test_data ) - app.footer.show("SAVE", "CANCEL") + app.footer.show("SAVE") document.body.className = "shipping" this.deferScrollToTop() }, |