bump

13 files changed, 106 insertions, 21 deletions

diff --git a/StoneIsland/platforms/android/assets/www/js/lib/blogs/ArchiveView.js b/StoneIsland/platforms/android/assets/www/js/lib/blogs/ArchiveView.js
index b79b8421..f10f7744 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/blogs/ArchiveView.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/blogs/ArchiveView.js
@@ -26,6 +26,7 @@ var ArchiveView = ScrollableView.extend({
   back: function(){
     this.$el.addClass("menu")
     app.header.set_back(false)
+    this.scroller.scrollTo(0, 0)
     this.$subtitle.html( this.subtitle_html )
   },
 
@@ -60,6 +61,7 @@ var ArchiveView = ScrollableView.extend({
 
       var t = this.menu_template.replace(/{{title}}/, row.title)
       var $t = $(t)
+      $t.data("aria-label", stonewash(row.title.replace(/'/g, " '").trim()))
       $t.data("title", row.title)
       $t.data("index", index)
       this.$menu_items.append($t)
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/blogs/BlogView.js b/StoneIsland/platforms/android/assets/www/js/lib/blogs/BlogView.js
index e58c975c..9190634c 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/blogs/BlogView.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/blogs/BlogView.js
@@ -54,7 +54,7 @@ var BlogView = View.extend({
         app.closed.storeClosedMessageTwo = app.store.StoreClosedMessageTwo
         break
     }
-    console.log(data)
+    // console.log(data)
 
     if (app.closed.storeIsClosed && sdk.env !== 'test') {
       app.closed.populate(app.store.ClosedStoreImages)
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/blogs/HubView.js b/StoneIsland/platforms/android/assets/www/js/lib/blogs/HubView.js
index b2baf4e7..a0ee9dd0 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/blogs/HubView.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/blogs/HubView.js
@@ -93,6 +93,7 @@ var HubView = ScrollableView.extend({
         var url = gallery.selectedElement.style.backgroundImage.replace(/url\(\"?/,"").replace(/\"?\)/,"")
         app.fullscreenViewer.show(url, url)
       })
+      $(".gallery-" + row.id).attr('aria-label', stonewash(row.title) + ". Image gallery, use the arrows to scroll.")
     }
     else {
       // single image
@@ -103,7 +104,6 @@ var HubView = ScrollableView.extend({
       el.className = "item"
       $(".gallery-" + row.id).append(el)
       $(".gallery-" + row.id).data("row", row)
-      
       // video, append play button
       if (row.link.match(/youtube|youtu.be|vimeo/)) {
         var play = document.createElement("div")
@@ -111,7 +111,7 @@ var HubView = ScrollableView.extend({
         $(".gallery-" + row.id).append(play)
         $(".gallery-" + row.id).addClass("gallery-video-post")
         $(".gallery-" + row.id).attr('role', 'link')
-        $(".gallery-" + row.id).attr('aria-label', stonewash(row.title) + ". Watch the video on Youtube")
+        $(".gallery-" + row.id).attr('aria-label', stonewash(row.title) + ". Tap to watch the video on Youtube")
         if (! row.image) {
           var url = row.link
           var ytid = (url.match(/v=([-_a-zA-Z0-9]{11})/i) || url.match(/youtu.be\/([-_a-zA-Z0-9]{11})/i) || url.match(/embed\/([-_a-zA-Z0-9]{11})/i))[1].split('&')[0];
@@ -121,6 +121,7 @@ var HubView = ScrollableView.extend({
         $(el).click(function(){
           app.fullscreenViewer.show(row.image[0].uri)
         })
+        $(".gallery-" + row.id).attr('aria-label', stonewash(row.title) + ". Main image")
       }
       $t.find(".gallery-left").remove()
       $t.find(".gallery-right").remove()
@@ -140,6 +141,7 @@ var HubView = ScrollableView.extend({
     var id = $(e.currentTarget).closest(".hub_item").data('id')
     this.galleries[id].previous()
   },
+
   gallery_right: function(e){
     var id = $(e.currentTarget).closest(".hub_item").data('id')
     this.galleries[id].next()
@@ -170,6 +172,7 @@ var HubLoader = (function(){
     HubLoader.load()
   }
   HubLoader.load = function(){
+    if (!queue) return
     item = queue.shift()
     count++
     if (! item || loading) return
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/blogs/PageView.js b/StoneIsland/platforms/android/assets/www/js/lib/blogs/PageView.js
index fae4cff2..9a7b4962 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/blogs/PageView.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/blogs/PageView.js
@@ -26,7 +26,7 @@ var PageView = ScrollableView.extend({
         href = href.substr(1, href.length-2)
         $(this).attr("href", href)
       }
-      console.log(href)
+      // console.log(href)
       $(this).attr("target", "_system")
     })
   },
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/blogs/StoryView.js b/StoneIsland/platforms/android/assets/www/js/lib/blogs/StoryView.js
index ec2f4434..0b3b17d7 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/blogs/StoryView.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/blogs/StoryView.js
@@ -41,6 +41,7 @@ var StoryView = ScrollableView.extend({
       var li = document.createElement("li")
       li.dataset.id = row.id
       li.innerHTML = row.title
+      li.setAttribute('role', "link")
       this.sections[row.id] = row
       this.$links.append(li)
       this.$content.append(t)
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/cart/CartShipping.js b/StoneIsland/platforms/android/assets/www/js/lib/cart/CartShipping.js
index ef8f94b7..b5d6647b 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/cart/CartShipping.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/cart/CartShipping.js
@@ -21,7 +21,7 @@ var CartShipping = FormView.extend({
     this.$address_form = this.$(".address")
     this.$msg = this.$(".msg")
     this.address = new AddressView ({ parent: this })
-    this.scroller = new IScroll('#cart_shipping', app.iscroll_options)
+    this.scroller = ScrollFactory('#cart_shipping', app.iscroll_options)
     this.address.disabled = true
   },
 
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/cart/CartSummary.js b/StoneIsland/platforms/android/assets/www/js/lib/cart/CartSummary.js
index bf150791..51aa35ef 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/cart/CartSummary.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/cart/CartSummary.js
@@ -15,7 +15,7 @@ var CartSummary = ScrollableView.extend({
     this.$loader = this.$(".loader")
     this.$cart_body = this.$(".cart_body")
     this.$cart_empty = this.$(".cart_empty")
-    this.scroller = new IScroll('#cart_summary', app.iscroll_options)
+    this.scroller = ScrollFactory('#cart_summary', app.iscroll_options)
 
     this.$rows = this.$(".rows")
     this.$subtotal = this.$(".subtotal")
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/etc/accessibility.js b/StoneIsland/platforms/android/assets/www/js/lib/etc/accessibility.js
index 614c3796..8108e461 100644
--- a/StoneIsland/platforms/android/assets/www/js/lib/etc/accessibility.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/etc/accessibility.js
@@ -1,9 +1,75 @@
-$(function(){
-  $("h1").each(function(){
-    this['aria-label'] = 'Section title is ' + this.innerText
-  })
-})
+var accessibility = (function() {
+
+  var accessibility = {}
+  accessibility.voiceOver = false
+
+  accessibility.DEBUG = false
+
+  accessibility.init = function(ready) {
+    console.log('Accessibility init')
+    accessibility.bind()
+    if (accessibility.DEBUG) {
+      console.log('Accessibility debug mode')
+      app.accessible = true
+      accessibility.voiceOver = true
+      $('html').addClass('vscroll')
+      $('html').addClass('accessible')
+      return ready()
+    }
+    if ('MobileAccessibility' in window) {
+      accessibility.build(ready)
+    } else {
+      ready()
+    }
+  }
+
+  accessibility.build = function(ready) {
+    MobileAccessibility.usePreferredTextZoom(true);
+    MobileAccessibility.getTextZoom(function getTextZoomCallback(textZoom) {
+      console.log('WebView text should be scaled to the preferred value ' + textZoom + '%')
+      if (textZoom > 100) {
+        app.accessible = true
+        $("html").addClass('accessible')
+      }
+    });
+    MobileAccessibility.isVoiceOverRunning(function(state){
+      console.log('Screen reader: ' + state)
+      accessibility.voiceOver = state
+      if (state) {
+        console.log(">>>>>> actual debug mode!")
+        app.accessible = true
+        $("html").addClass('accessible')
+        $('html').addClass('vscroll')
+      } else {
+        $('html').addClass('iscroll')
+      }
+      ready()
+    })
+  }
+
+  accessibility.bind = function() {
+    $("h1").each(function(){
+      this['aria-label'] = 'Section title is ' + this.innerText
+    })
+    if ('MobileAccessibilityNotifications' in window) {
+      window.addEventListener(MobileAccessibilityNotifications.SCREEN_READER_STATUS_CHANGED,
+        accessibility.onScreenReaderStatusChanged, false)
+    }
+  }
+
+  accessibility.onScreenReaderStatusChanged = function(info) {
+    if (info && typeof info.isScreenReaderRunning !== "undefined") {
+      if (info.isScreenReaderRunning) {
+        console.log("Screen reader: ON");
+      } else {
+        console.log("Screen reader: OFF");
+      }
+    }
+  }
+
+  return accessibility
+})()
 
 function stonewash (s) {
-  return s.replace(/'0/g, '20').replace(/_/g, ' ')
-}
\ No newline at end of file
+  return s.replace(/'9/g, '19').replace(/'0/g, '20').replace(/_/g, ' ').replace(/-/g, ' - ').replace(/^[013456789][0-9]+/, '')
+}
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/etc/push.js b/StoneIsland/platforms/android/assets/www/js/lib/etc/push.js
index 746172eb..74aaf7b5 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/etc/push.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/etc/push.js
@@ -37,6 +37,10 @@ var push = (function(){
     push.settings.hub = hub_status == "true"
     push.settings.store = store_status == "true"
     
+    if (push.settings.requested) {
+      return
+    }
+    // not sure why we're also signing up for notifications here??    
     if (! hub_status || hub_status == "true") {
       push.subscribe("hub")
     }
@@ -46,7 +50,7 @@ var push = (function(){
   }
   push.got_registration = function(data){
     var registrationId = data.registrationId
-    var oldRegistrationId =  localStorage.getItem("yoox.registrationId")
+    var oldRegistrationId = localStorage.getItem("yoox.registrationId")
     // console.log(registrationId, oldRegistrationId)
     
     if (registrationId !== oldRegistrationId || ! push.settings.requested) {
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/nav/CurtainView.js b/StoneIsland/platforms/android/assets/www/js/lib/nav/CurtainView.js
index d444fd60..ddb6bc19 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/nav/CurtainView.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/nav/CurtainView.js
@@ -28,7 +28,7 @@ var CurtainView = View.extend({
   },
   
   click: function(){
-    if (document.body.classList.contains("nav")) {
+    if (document.body.classList.contains("nav") && !app.accessible) {
       app.nav.hide()
     }
     if (app.selector.visible) {
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/nav/NavView.js b/StoneIsland/platforms/android/assets/www/js/lib/nav/NavView.js
index 86c8ecaf..1655b7f8 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/nav/NavView.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/nav/NavView.js
@@ -23,7 +23,8 @@ var NavView = View.extend({
     "click .shipping": "shipping",
     "click .settings": "settings",
     "click .orders": "orders",
-    "click .return_link": "return_link",
+    "click .return_link_us": "return_link_us",
+    "click .return_link_ca": "return_link_ca",
     
     "click .faq_back": "back",
     "click .privacy": "privacy",
@@ -44,6 +45,10 @@ var NavView = View.extend({
   show: function(klass){
     $("body").addClass("nav")
     app.curtain.show("dark")
+    doneShowingNav = false
+    setTimeout(function(){
+      doneShowingNav = true
+    }, 800)
     if (klass) {
       setTimeout(function(){
         this.addClass(klass)
@@ -52,6 +57,7 @@ var NavView = View.extend({
   },
   
   hide: function(){
+    if (!doneShowingNav) return
     $("body").removeClass("nav")
     app.curtain.hide("dark")
   },
@@ -115,8 +121,11 @@ var NavView = View.extend({
     this.hide()
     app.router.go("account/settings")
   },
-  return_link: function(){
-    window.open("http://www.stoneisland.com/yTos/Plugins/AreaLocalizer/Redirectarea?area=ProductExchange&controllerName=SearchOrder&actionName=Index", '_system')
+  return_link_us: function(){
+    window.open("https://www.stoneisland.com/us/ProductExchange/SearchOrder/Index?utm_source=AppMobile&utm_medium=referral&utm_campaign=ReturnForm", '_system')
+  },
+  return_link_ca: function(){
+    window.open("https://www.stoneisland.com/ca/ProductExchange/SearchOrder/Index?utm_source=AppMobile&utm_medium=referral&utm_campaign=ReturnForm", '_system')
   },
 
 
@@ -141,7 +150,7 @@ var NavView = View.extend({
   },
   care: function(e){
     e.preventDefault()
-    window.open("http://www.stoneisland.com/system/web/custom/hp/email.jsp", '_system')
+    window.open("https://www.stoneisland.com/customercare?utm_source=AppMobile&utm_medium=referral&utm_campaign=CustomerCare", '_system')
   },
 
 
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/products/CollectionView.js b/StoneIsland/platforms/android/assets/www/js/lib/products/CollectionView.js
index b7af235a..d3343652 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/products/CollectionView.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/products/CollectionView.js
@@ -22,7 +22,7 @@ var CollectionView = ScrollableView.extend({
     this.$title = this.$("h1")
     this.$content = this.$(".content")
     this.$loader = this.$(".loader")
-    this.scroller = new IScroll('#collection', app.iscroll_options)
+    this.scroller = ScrollFactory('#collection', app.iscroll_options)
     this.departmentFilterView = new DepartmentFilter ({ parent: this })
     this.sizeFilterView = new SizeFilter ({ parent: this })
   },
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/products/ProductView.js b/StoneIsland/platforms/android/assets/www/js/lib/products/ProductView.js
index c47dfddd..62a6de18 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/products/ProductView.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/products/ProductView.js
@@ -15,7 +15,7 @@ var ProductView = ScrollableView.extend({
   
   initialize: function(){
     this.gallery = new GalleryView ()
-    this.scroller = new IScroll('#product', app.iscroll_options)
+    this.scroller = ScrollFactory('#product', app.iscroll_options)
     
     this.$productHeader = this.$(".product-header")
     this.$title = this.$(".title")