diff options
Diffstat (limited to 'StoneIsland/www')
| -rwxr-xr-x | StoneIsland/www/css/account.css | 2 | ||||
| -rwxr-xr-x | StoneIsland/www/index.html | 73 | ||||
| -rwxr-xr-x | StoneIsland/www/js/index.js | 1 | ||||
| -rwxr-xr-x | StoneIsland/www/js/lib/account/PaymentView.js | 2 | ||||
| -rwxr-xr-x | StoneIsland/www/js/lib/account/ProfileView.js | 2 | ||||
| -rwxr-xr-x | StoneIsland/www/js/lib/account/SettingsView.js | 2 | ||||
| -rwxr-xr-x | StoneIsland/www/js/lib/account/ShippingView.js | 2 | ||||
| -rwxr-xr-x | StoneIsland/www/js/lib/auth/LoginView.js | 4 | ||||
| -rwxr-xr-x | StoneIsland/www/js/lib/auth/SignupView.js | 4 | ||||
| -rwxr-xr-x | StoneIsland/www/js/lib/cart/CartPayment.js | 2 | ||||
| -rwxr-xr-x | StoneIsland/www/js/lib/cart/CartShipping.js | 2 | ||||
| -rwxr-xr-x | StoneIsland/www/js/lib/products/ProductView.js | 20 |
12 files changed, 62 insertions, 54 deletions
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 @@ <div id="search"> <div class="scroll"> <h1>SEARCH</h1> - <form> + <div class="form"> <input type="text" class="q" placeholder="ENTER YOUR SEARCH"> - </form> + </div> </div> </div> @@ -311,11 +311,11 @@ <div id="login"> <div class="scroll"> <h1>LOGIN</h1> - <form> + <div class="form"> <div class="container"> <div class="container-row"> - <input type="email" name="Email" placeholder="EMAIL ADDRESS" required> - <input type="password" name="Password" placeholder="PASSWORD" required> + <input type="email" name="Email" placeholder="EMAIL ADDRESS" required tabindex="1"> + <input type="password" name="Password" placeholder="PASSWORD" required tabindex="2"> </div> <div class="container-fill"> <div class="container-message premessage"> @@ -327,7 +327,8 @@ </div> </div> </div> - </form> + <input type="submit" style="position: absolute; left: -9999px; width: 1px; height: 1px;"> + </div> </div> </div> @@ -347,28 +348,28 @@ <div id="signup"> <div class="scroll"> <h1>NEW USER</h1> - <form> + <div class="form"> <div class="container"> <div class="container-row"> - <input type="text" name="Name" placeholder="FIRST NAME" required> - <input type="text" name="Surname" placeholder="LAST NAME" required> - <input type="email" name="Email" placeholder="EMAIL ADDRESS" required> - <input type="email" name="ConfirmEmail" placeholder="CONFIRM EMAIL ADDRESS" required> + <input type="text" name="Name" placeholder="FIRST NAME" required tabindex="1"> + <input type="text" name="Surname" placeholder="LAST NAME" required tabindex="2"> + <input type="email" name="Email" placeholder="EMAIL ADDRESS" required tabindex="3"> + <input type="email" name="ConfirmEmail" placeholder="CONFIRM EMAIL ADDRESS" required tabindex="4"> <div class="select-wrapper date-wrapper"> <span>BIRTHDAY (OPTIONAL)</span> - <input type="date" name="BirthDay" min="1900-01-01" placeholder="BIRTHDAY (MM/DD/YYYY)" required> + <input type="date" name="BirthDay" min="1900-01-01" placeholder="BIRTHDAY (MM/DD/YYYY)" required tabindex="5"> </div> <h2>PASSWORD</h2> - <input type="password" name="Password" placeholder="PASSWORD (7 CHARACTERS OR MORE)" required> - <input type="password" name="Password2" placeholder="CONFIRM PASSWORD" required> + <input type="password" name="Password" placeholder="PASSWORD (7 CHARACTERS OR MORE)" required tabindex="6"> + <input type="password" name="Password2" placeholder="CONFIRM PASSWORD" required tabindex="7"> </div> <div class="container-row"> <div class="checkbox-container "> <div class="checkbox-row"> <div class="checkbox-toggle"> - <input type="checkbox" id="checkbox-data-profiling" name="DataProfiling" value="true" required> + <input type="checkbox" id="checkbox-data-profiling" name="DataProfiling" value="true" required tabindex="8"> <label for="checkbox-data-profiling"></label> </div> <label class="checkbox-caption" for="checkbox-data-profiling"> @@ -377,7 +378,7 @@ </div> <div class="checkbox-row"> <div class="checkbox-toggle"> - <input type="checkbox" id="checkbox-shopping-data-profiling" name="DataProfiling" value="true" required> + <input type="checkbox" id="checkbox-shopping-data-profiling" name="DataProfiling" value="true" required tabindex="9"> <label for="checkbox-shopping-data-profiling"></label> </div> <label class="checkbox-caption" for="checkbox-shopping-data-profiling"> @@ -390,27 +391,27 @@ </div> </div> </div> - </form> + </div> </div> </div> <div id="profile"> <div class="scroll"> <h1>PROFILE</h1> - <form> + <div class="form"> <div class="container"> <div class="container-row"> - <input type="text" name="Name" placeholder="FIRST NAME" required> - <input type="text" name="Surname" placeholder="LAST NAME" required> - <input type="email" name="Email" placeholder="EMAIL ADDRESS" required> + <input type="text" name="Name" placeholder="FIRST NAME" required tabindex="1"> + <input type="text" name="Surname" placeholder="LAST NAME" required tabindex="2"> + <input type="email" name="Email" placeholder="EMAIL ADDRESS" required tabindex="3"> <div class="select-wrapper date-wrapper"> <span>BIRTHDAY (MM/DD/YYYY)</span> - <input type="date" name="BirthDay" min="1900-01-01" placeholder="BIRTHDAY (MM/DD/YYYY)" required> + <input type="date" name="BirthDay" min="1900-01-01" placeholder="BIRTHDAY (MM/DD/YYYY)" required tabindex="4"> </div> <h2>CHANGE PASSWORD</h2> <input type="password" name="CurrentPassword" placeholder="CURRENT PASSWORD" required> - <input type="password" name="NewPassword" placeholder="NEW PASSWORD (7 CHARACTERS OR MORE)" required> + <input type="password" name="NewPassword" placeholder="NEW PASSWORD (7 CHARACTERS OR MORE)" required tabindex="5"> <div class="container-fill container-fill-condensed"> <div class="container-message container-message-condensed"> <span class="msg msg-condensed"> @@ -421,7 +422,7 @@ <div class="checkbox-container"> <div class="checkbox-row"> <div class="checkbox-toggle"> - <input type="checkbox" id="receive-newsletter-profile" name="YooxLetter" value="true" required> + <input type="checkbox" id="receive-newsletter-profile" name="YooxLetter" value="true" required tabindex="6"> <label for="receive-newsletter-profile"></label> </div> <label class="checkbox-caption" for="receive-newsletter-profile"> @@ -431,7 +432,7 @@ </div> <div class="checkbox-row"> <div class="checkbox-toggle"> - <input type="checkbox" id="checkbox-shopping-data-profiling-profile" name="DataProfiling" value="true" required> + <input type="checkbox" id="checkbox-shopping-data-profiling-profile" name="DataProfiling" value="true" required tabindex="7"> <label for="checkbox-shopping-data-profiling-profile"></label> </div> <label class="checkbox-caption" for="checkbox-shopping-data-profiling-profile"> @@ -445,7 +446,7 @@ </div> </div> </div> - </form> + </div> </div> </div> @@ -453,7 +454,7 @@ <div id="shipping"> <div class="scroll"> <h1>SHIPPING</h1> - <form> + <div class="form"> <div class="container"> <div class="container-row"> <div class="address"></div> @@ -467,14 +468,14 @@ </div> </div> </div> - </form> + </div> </div> </div> <div id="payment"> <div class="scroll"> <h1>PAYMENT</h1> - <form> + <div class="form"> <div class="container"> <div class="container-row"> <div class="cc"></div> @@ -489,14 +490,14 @@ </div> </div> </div> - </form> + </div> </div> </div> <div id="settings"> <div class="scroll"> <h1>NOTIFICATIONS</h1> - <form> + <div class="form"> <div class="toggle-container"> <div class="toggle-row"> <div class="caption"> @@ -519,7 +520,7 @@ </div> </div> </div> - </form> + </div> </div> </div> @@ -676,7 +677,7 @@ <div id="cart_shipping"> <div class="scroll"> - <form> + <div class="form"> <div class="dropdown-wrapper"> <div class="dropdown-title add_edit">add / edit</div> <div class="dropdown select_address"> @@ -735,13 +736,13 @@ </div> </div> - </form> + </div> </div> </div> <div id="cart_payment"> <div class="scroll"> - <form> + <div class="form"> <div class="billing-container container"> <div class="container-row"> @@ -826,7 +827,7 @@ </div> <br><br><br><br> - </form> + </div> </div> </div> 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<br>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<br>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) } |
