diff options
Diffstat (limited to 'StoneIsland/www/js/lib')
| -rwxr-xr-x | StoneIsland/www/js/lib/blogs/HubView.js | 8 | ||||
| -rw-r--r-- | StoneIsland/www/js/lib/etc/accessibility.js | 2 | ||||
| -rwxr-xr-x | StoneIsland/www/js/lib/products/CollectionView.js | 3 | ||||
| -rwxr-xr-x | StoneIsland/www/js/lib/products/GalleryView.js | 12 |
4 files changed, 16 insertions, 9 deletions
diff --git a/StoneIsland/www/js/lib/blogs/HubView.js b/StoneIsland/www/js/lib/blogs/HubView.js index d3b15f77..0d59bcc8 100755 --- a/StoneIsland/www/js/lib/blogs/HubView.js +++ b/StoneIsland/www/js/lib/blogs/HubView.js @@ -91,7 +91,7 @@ var HubView = ScrollableView.extend({ }) gallery.on('staticClick', function(e){ var url = gallery.selectedElement.style.backgroundImage.replace(/url\(\"?/,"").replace(/\"?\)/,"") - app.fullscreenViewer.show(url, url) + app.fullscreenViewer.show(url, url, stonewash(row.title)) }) $(".gallery-" + row.id).attr('aria-label', stonewash(row.title) + ". Image gallery, use the arrows to scroll.") if (accessibility.voiceOver) { @@ -99,7 +99,7 @@ var HubView = ScrollableView.extend({ $(".gallery-target-" + row.id).click(function(e){ e && e.preventDefault() var url = gallery.selectedElement.style.backgroundImage.replace(/url\(\"?/,"").replace(/\"?\)/,"") - app.fullscreenViewer.show(url, url) + app.fullscreenViewer.show(url, url, stonewash(row.title)) }) } } @@ -134,13 +134,13 @@ var HubView = ScrollableView.extend({ } else { $(el).click(function(e){ e && e.preventDefault() - app.fullscreenViewer.show(row.image[0].uri) + app.fullscreenViewer.show(row.image[0].uri, row.image[0].uri, stonewash(row.title) + ". Main image") }) $(".gallery-" + row.id).attr('aria-label', stonewash(row.title) + ". Main image") $(".gallery-target-" + row.id).attr('aria-label', stonewash(row.title) + ". Main image.") $(".gallery-target-" + row.id).click(function(e){ e && e.preventDefault() - app.fullscreenViewer.show(row.image[0].uri) + app.fullscreenViewer.show(row.image[0].uri, row.image[0].uri, stonewash(row.title) + ". Main image") }) } $t.find(".gallery-left").remove() diff --git a/StoneIsland/www/js/lib/etc/accessibility.js b/StoneIsland/www/js/lib/etc/accessibility.js index c66143cc..a18ad5b3 100644 --- a/StoneIsland/www/js/lib/etc/accessibility.js +++ b/StoneIsland/www/js/lib/etc/accessibility.js @@ -73,5 +73,5 @@ var accessibility = (function() { })() function stonewash (s) { - return s.replace(/'9/g, '19').replace(/'0/g, '20').replace(/_/g, ' ').replace(/-/g, ' - ').replace(/^[013456789][0-9]+/, '') + return s.replace(/'9/g, '19').replace(/'0/g, '20').replace(/_/g, ' ').replace(/-/g, ' - ') } diff --git a/StoneIsland/www/js/lib/products/CollectionView.js b/StoneIsland/www/js/lib/products/CollectionView.js index d3343652..70bb22b4 100755 --- a/StoneIsland/www/js/lib/products/CollectionView.js +++ b/StoneIsland/www/js/lib/products/CollectionView.js @@ -194,9 +194,10 @@ var CollectionView = ScrollableView.extend({ append: function(item, is_single_product){ this.items[ item['Code8'] ] = item + console.log("TITLE: " + item['ModelNames']) var t = this.template.replace(/{{image}}/, sdk.image(item['DefaultCode10'], is_single_product ? '13_f' : '11_f')) .replace(/{{code8}}/, item['Code8']) - .replace(/{{title}}/, stonewash(item['ModelNames'])) + .replace(/{{title}}/g, stonewash(item['ModelNames'] + ' ' + item['MicroCategory'])) var $t = $(t) if (app.store.ShowProductNameOnCollectionPage) { var $title = $("<span>") diff --git a/StoneIsland/www/js/lib/products/GalleryView.js b/StoneIsland/www/js/lib/products/GalleryView.js index e84caa68..809ba0d9 100755 --- a/StoneIsland/www/js/lib/products/GalleryView.js +++ b/StoneIsland/www/js/lib/products/GalleryView.js @@ -36,6 +36,7 @@ var GalleryView = View.extend({ valid_styles[style] = size } }) + this.large_styles = large_styles Object.keys(valid_styles).sort(sort_image_styles).forEach(function(style){ var id = valid_styles[style] + "_" + style @@ -57,6 +58,9 @@ var GalleryView = View.extend({ contain: true, draggable: true, }) + if (app.accessible) { + gallery.select(1, false, true) + } this.gallery.on('change', function(){ var currentImage = this.gallery.selectedElement.style.backgroundImage.replace(/url\(\"?/,"").replace(/\"?\)/,"") @@ -85,11 +89,13 @@ var GalleryView = View.extend({ var head = partz[0] var size = partz[1] var tail = partz[2] - var end_partz = tail.split(/\./) + var end_partz = (tail || 'f').split(/\./) var style = end_partz[0] - var largest_size = large_styles[style] + var largest_size = this.large_styles[style] + var title = YOOX_IMAGE_STYLE_LABELS[style] || "Alternate view" var hiresImage = [head, largest_size, tail].join("_") - app.fullscreenViewer.show(currentImage, hiresImage) + console.log(partz, style) + app.fullscreenViewer.show(currentImage, hiresImage, title) }, touchstart: function(e){ |