summaryrefslogtreecommitdiff
path: root/StoneIsland/www/js
diff options
context:
space:
mode:
Diffstat (limited to 'StoneIsland/www/js')
-rwxr-xr-xStoneIsland/www/js/lib/blogs/BlogView.js4
-rwxr-xr-xStoneIsland/www/js/lib/blogs/HubView.js2
-rwxr-xr-xStoneIsland/www/js/lib/products/GalleryView.js30
-rw-r--r--StoneIsland/www/js/vendor/imageviewer.js3
4 files changed, 22 insertions, 17 deletions
diff --git a/StoneIsland/www/js/lib/blogs/BlogView.js b/StoneIsland/www/js/lib/blogs/BlogView.js
index 55320e7c..ed17e684 100755
--- a/StoneIsland/www/js/lib/blogs/BlogView.js
+++ b/StoneIsland/www/js/lib/blogs/BlogView.js
@@ -92,13 +92,15 @@ var BlogView = View.extend({
console.log(app.store.StoreStatus)
+ console.log(app.store.FitsLarge, app.store.fitsLargeText)
app.product.fitLargeCodes = {}
if (app.store.FittingCodes.length) {
app.store.FittingCodes.split("\n").forEach(function(code){
app.product.fitLargeCodes[code] = true
})
+ console.log(app.store.FitsLarge, app.store.fitsLargeText)
if (app.store.FitsLarge === 'use_alt_text' && (app.store.FitsLargeText || "").length) {
- var fit_lines = app.store.FitsLargeText.split('\n').replace(/</g, "&lt;").replace(/>/g, "&rt;").join("<br>")
+ var fit_lines = app.store.FitsLargeText.replace(/</g, "&lt;").replace(/>/g, "&rt;").split('\n').join("<br>")
$('.fit').html(fit_lines)
$('.fit').addClass('altText')
}
diff --git a/StoneIsland/www/js/lib/blogs/HubView.js b/StoneIsland/www/js/lib/blogs/HubView.js
index c09dd3b3..5e2ff67e 100755
--- a/StoneIsland/www/js/lib/blogs/HubView.js
+++ b/StoneIsland/www/js/lib/blogs/HubView.js
@@ -183,7 +183,7 @@ var HubLoader = (function(){
HubLoader.build = function(){
view.append(item)
view.scroller.refresh()
- if (count < 20 && ! needed) return
+ if (count < 2 && ! needed) return
// if (count === 10) return
setTimeout(HubLoader.load, count < 10 ? 1000 : 5000)
}
diff --git a/StoneIsland/www/js/lib/products/GalleryView.js b/StoneIsland/www/js/lib/products/GalleryView.js
index 0c928739..0acd48c5 100755
--- a/StoneIsland/www/js/lib/products/GalleryView.js
+++ b/StoneIsland/www/js/lib/products/GalleryView.js
@@ -9,7 +9,6 @@ var GalleryView = View.extend({
// "touchstart .gallery": "touchstart",
// "touchmove .gallery": "touchmove",
// "touchend .gallery": "touchend",
- "click": "click",
},
initialize: function(){
@@ -23,7 +22,7 @@ var GalleryView = View.extend({
populate: function(code, image_ids){
var valid_styles = {}
- var large_styles = this.large_styles = {}
+ var large_styles = {}
image_ids.forEach(function(id){
if (id.indexOf("_") == -1) return
var partz = id.split("_")
@@ -44,7 +43,7 @@ var GalleryView = View.extend({
this.$el.append(t)
}.bind(this))
- this.gallery = new Flickity( "#gallery", {
+ var gallery = this.gallery = new Flickity( "#gallery", {
selector: '.item',
cellAlign: 'center',
autoPlay: false,
@@ -56,18 +55,19 @@ var GalleryView = View.extend({
contain: true,
draggable: true,
})
- },
- click: function(e){
- var currentImage = this.gallery.selectedElement.style.backgroundImage.replace(/url\(\"?/,"").replace(/\"?\)/,"")
- var partz = currentImage.split("_")
- var head = partz[0]
- var size = partz[1]
- var tail = partz[2]
- var end_partz = tail.split(/\./)
- var style = end_partz[0]
- var largest_size = this.large_styles[style]
- var hiresImage = [head, largest_size, tail].join("_")
- app.fullscreenViewer.show(currentImage, hiresImage)
+
+ this.gallery.on('staticClick', function(e){
+ var currentImage = gallery.selectedElement.style.backgroundImage.replace(/url\(\"?/,"").replace(/\"?\)/,"")
+ var partz = currentImage.split("_")
+ var head = partz[0]
+ var size = partz[1]
+ var tail = partz[2]
+ var end_partz = tail.split(/\./)
+ var style = end_partz[0]
+ var largest_size = large_styles[style]
+ var hiresImage = [head, largest_size, tail].join("_")
+ app.fullscreenViewer.show(currentImage, hiresImage)
+ })
},
touchstart: function(e){
},
diff --git a/StoneIsland/www/js/vendor/imageviewer.js b/StoneIsland/www/js/vendor/imageviewer.js
index 4484b753..847c6070 100644
--- a/StoneIsland/www/js/vendor/imageviewer.js
+++ b/StoneIsland/www/js/vendor/imageviewer.js
@@ -404,6 +404,9 @@
var touchtime = 0,
point;
imageWrap.on('click' + eventSuffix, function (e) {
+ if (openTime+700 < Date.now()) {
+ return $('.iv-close').trigger("click")
+ }
if (touchtime == 0) {
touchtime = Date.now();
point = {