From db9d93526b951a7660925cd2e721ab2588e4ca45 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 24 Feb 2017 02:06:58 +0100 Subject: change go button to return --- StoneIsland/www/css/account.css | 2 +- StoneIsland/www/index.html | 73 +++++++++++++------------- StoneIsland/www/js/index.js | 1 + StoneIsland/www/js/lib/account/PaymentView.js | 2 +- StoneIsland/www/js/lib/account/ProfileView.js | 2 +- StoneIsland/www/js/lib/account/SettingsView.js | 2 +- StoneIsland/www/js/lib/account/ShippingView.js | 2 +- StoneIsland/www/js/lib/auth/LoginView.js | 4 +- StoneIsland/www/js/lib/auth/SignupView.js | 4 +- StoneIsland/www/js/lib/cart/CartPayment.js | 2 +- StoneIsland/www/js/lib/cart/CartShipping.js | 2 +- StoneIsland/www/js/lib/products/ProductView.js | 20 ++++--- 12 files changed, 62 insertions(+), 54 deletions(-) (limited to 'StoneIsland/www') diff --git a/StoneIsland/www/css/account.css b/StoneIsland/www/css/account.css index f5b6079a..471ea3f7 100755 --- a/StoneIsland/www/css/account.css +++ b/StoneIsland/www/css/account.css @@ -118,7 +118,7 @@ -form h2 { +.form h2 { text-align: center; margin: 0; padding: 20px 10px 8px 10px; diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html index 9c86e559..8f615d8b 100755 --- a/StoneIsland/www/index.html +++ b/StoneIsland/www/index.html @@ -244,9 +244,9 @@ @@ -311,11 +311,11 @@

LOGIN

-
+
- - + +
@@ -327,7 +327,8 @@
- + +
@@ -347,28 +348,28 @@

NEW USER

-
+
- - - - + + + +
BIRTHDAY (OPTIONAL) - +

PASSWORD

- - + +
- +
- +
- +

PROFILE

-
+
- - - + + +
BIRTHDAY (MM/DD/YYYY) - +

CHANGE PASSWORD

- +
@@ -421,7 +422,7 @@
- +
- +
- +
@@ -453,7 +454,7 @@

SHIPPING

-
+
@@ -467,14 +468,14 @@
-
+

PAYMENT

-
+
@@ -489,14 +490,14 @@
-
+

NOTIFICATIONS

-
+
@@ -519,7 +520,7 @@
- +
@@ -676,7 +677,7 @@
-
+
add / edit
@@ -735,13 +736,13 @@
- +
-
+
@@ -826,7 +827,7 @@




- +
diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js index 76a8af05..06bfaaac 100755 --- a/StoneIsland/www/js/index.js +++ b/StoneIsland/www/js/index.js @@ -71,6 +71,7 @@ var app = (function(){ document.addEventListener('online', app.online, false) document.addEventListener('offline', app.offline, false) cordova.plugins.Keyboard.disableScroll(true) + cordova.plugins.Keyboard.hideKeyboardAccessoryBar(false) geo.fetch() var image = new Image image.src = "./img/compass-logo.png" diff --git a/StoneIsland/www/js/lib/account/PaymentView.js b/StoneIsland/www/js/lib/account/PaymentView.js index f773c05b..796ea188 100755 --- a/StoneIsland/www/js/lib/account/PaymentView.js +++ b/StoneIsland/www/js/lib/account/PaymentView.js @@ -25,7 +25,7 @@ var PaymentView = FormView.extend({ }, initialize: function(){ - this.$form = this.$("form") + this.$form = this.$(".form") this.$msg = this.$(".msg") this.address = new AddressView ({ parent: this, checkPhone: false }) this.cc = new CreditCardView ({ parent: this }) diff --git a/StoneIsland/www/js/lib/account/ProfileView.js b/StoneIsland/www/js/lib/account/ProfileView.js index df6bc865..98dba019 100755 --- a/StoneIsland/www/js/lib/account/ProfileView.js +++ b/StoneIsland/www/js/lib/account/ProfileView.js @@ -8,7 +8,7 @@ var ProfileView = FormView.extend({ action: sdk.account.update, initialize: function(){ - this.$form = this.$("form") + this.$form = this.$(".form") this.$msg = this.$(".msg") this.scroller = new IScroll('#profile', app.iscroll_options) }, diff --git a/StoneIsland/www/js/lib/account/SettingsView.js b/StoneIsland/www/js/lib/account/SettingsView.js index f6eae13c..90ace549 100755 --- a/StoneIsland/www/js/lib/account/SettingsView.js +++ b/StoneIsland/www/js/lib/account/SettingsView.js @@ -8,7 +8,7 @@ var SettingsView = FormView.extend({ }, initialize: function(){ - this.$form = this.$("form") + this.$form = this.$(".form") this.$msg = this.$(".msg") this.$store = this.$("[name=store]") this.$hub = this.$("[name=hub]") diff --git a/StoneIsland/www/js/lib/account/ShippingView.js b/StoneIsland/www/js/lib/account/ShippingView.js index 71cd9eef..67a1cfec 100755 --- a/StoneIsland/www/js/lib/account/ShippingView.js +++ b/StoneIsland/www/js/lib/account/ShippingView.js @@ -24,7 +24,7 @@ var ShippingView = FormView.extend({ }, initialize: function(){ - this.$form = this.$("form") + this.$form = this.$(".form") this.$msg = this.$(".msg") this.address = new AddressView ({ parent: this }) this.scroller = new IScroll('#shipping', app.iscroll_options) diff --git a/StoneIsland/www/js/lib/auth/LoginView.js b/StoneIsland/www/js/lib/auth/LoginView.js index d7968c22..aeb15d1d 100755 --- a/StoneIsland/www/js/lib/auth/LoginView.js +++ b/StoneIsland/www/js/lib/auth/LoginView.js @@ -11,7 +11,7 @@ var LoginView = FormView.extend({ }, initialize: function(){ - this.$form = this.$("form") + this.$form = this.$(".form") this.$msg = this.$(".msg") this.scroller = new IScroll('#login', app.iscroll_options) }, @@ -23,7 +23,7 @@ var LoginView = FormView.extend({ } var msg = "* Your personal and payment
information will always remain private" app.footer.show("SUBMIT") - this.$form.get(0).reset() + this.$("input").val("") this.$msg.html(msg) document.body.className = "login" }, diff --git a/StoneIsland/www/js/lib/auth/SignupView.js b/StoneIsland/www/js/lib/auth/SignupView.js index fd0c1887..220026c0 100755 --- a/StoneIsland/www/js/lib/auth/SignupView.js +++ b/StoneIsland/www/js/lib/auth/SignupView.js @@ -24,7 +24,7 @@ var SignupView = FormView.extend({ }, initialize: function(){ - this.$form = this.$("form") + this.$form = this.$(".form") this.$msg = this.$(".msg") this.scroller = new IScroll('#signup', app.iscroll_options) }, @@ -36,7 +36,7 @@ var SignupView = FormView.extend({ } var msg = "* Your personal and payment
information will always remain private" app.footer.show("SUBMIT") - this.$form.get(0).reset() + this.$("input").val("") this.$msg.html(msg) document.body.className = "signup" diff --git a/StoneIsland/www/js/lib/cart/CartPayment.js b/StoneIsland/www/js/lib/cart/CartPayment.js index a19e69a5..31c371a5 100755 --- a/StoneIsland/www/js/lib/cart/CartPayment.js +++ b/StoneIsland/www/js/lib/cart/CartPayment.js @@ -19,7 +19,7 @@ var CartPayment = FormView.extend({ initialize: function(opt){ this.parent = opt.parent - this.$form = this.$("form") + this.$form = this.$(".form") this.$msg = this.$(".msg") this.$same_as_shipping = this.$("[name=SameAsShipping]") this.$billing_address_rapper = this.$(".billing_address_rapper") diff --git a/StoneIsland/www/js/lib/cart/CartShipping.js b/StoneIsland/www/js/lib/cart/CartShipping.js index fd227324..536b5161 100755 --- a/StoneIsland/www/js/lib/cart/CartShipping.js +++ b/StoneIsland/www/js/lib/cart/CartShipping.js @@ -15,7 +15,7 @@ var CartShipping = FormView.extend({ initialize: function(opt){ this.parent = opt.parent - this.$form = this.$("form") + this.$form = this.$(".form") this.$dropdown_wrapper = this.$(".dropdown-wrapper") this.$address_list = this.$(".address_list") this.$address_form = this.$(".address") diff --git a/StoneIsland/www/js/lib/products/ProductView.js b/StoneIsland/www/js/lib/products/ProductView.js index 81ad536d..4d370f9f 100755 --- a/StoneIsland/www/js/lib/products/ProductView.js +++ b/StoneIsland/www/js/lib/products/ProductView.js @@ -135,17 +135,23 @@ var ProductView = ScrollableView.extend({ var color = this.colors[default_color_id] var color_label = color.label var sizes = this.find_sizes_for_color(default_color_id) - var size = sizes[0] - var size_label = this.sizes[size].label - this.gallery.populate( color.code, details['Item']['ImageTypes'] ) + if (sizes.length) { + var size = sizes[0] + var size_label = this.sizes[size].label - this.color = color - this.size = size + this.gallery.populate( color.code, details['Item']['ImageTypes'] ) - this.is_onesize = !! this.sizes[1] + this.color = color + this.size = size + + this.is_onesize = !! this.sizes[1] + + this.$size.show().html(size_label) + } + else { + } - this.$size.show().html(size_label) if (color_label) { this.$color.html(color_label) } -- cgit v1.2.3-70-g09d2