app

16 files changed, 53 insertions, 42 deletions

diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist
index 62407c24..6376f422 100644
--- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist
+++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist
@@ -18,7 +18,7 @@
 	<key>ArchiveVersion</key>
 	<integer>2</integer>
 	<key>CreationDate</key>
-	<date>2018-04-30T23:27:33Z</date>
+	<date>2018-05-02T22:10:00Z</date>
 	<key>Name</key>
 	<string>Stone Island</string>
 	<key>SchemeName</key>
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car
index e6e9fdf9..9a76fff8 100644
--- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car
+++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib
index 14c086b8..c733b5ac 100644
--- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib
+++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib
index 6b717790..5505f5f5 100644
--- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib
+++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib
index 6f0531ef..d5cba035 100644
--- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib
+++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island
index 03e990cb..b51d09de 100755
--- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island
+++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources
index aac3b0c6..50cadfe3 100644
--- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources
+++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources
@@ -94,11 +94,11 @@
 		</data>
 		<key>Assets.car</key>
 		<data>
-		X77iqOSfOBq++C6Ofab9TwKX/H0=
+		tszeoGh05zy+6mIi3uhQTDuyGl4=
 		</data>
 		<key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key>
 		<data>
-		/NkqnV08SFpdht+bv/Nrq3IAU5g=
+		3kENpZV04BY77IF9fdI492Ejcsw=
 		</data>
 		<key>CDVLaunchScreen.storyboardc/Info.plist</key>
 		<data>
@@ -106,7 +106,7 @@
 		</data>
 		<key>CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib</key>
 		<data>
-		8FbiZcGKTwdXrAFb+uYT7V09mMY=
+		mhvCTFFXlxaLrmgLmrDZ+1ysqcQ=
 		</data>
 		<key>CDVNotification.bundle/beep.wav</key>
 		<data>
@@ -118,7 +118,7 @@
 		</data>
 		<key>MainViewController.nib</key>
 		<data>
-		+0H2odfEEAoVXh614tgP3WJFEyQ=
+		BRzL+0NY/MDviGcrgPkKilkjmYw=
 		</data>
 		<key>PkgInfo</key>
 		<data>
@@ -238,7 +238,7 @@
 		</data>
 		<key>www/css/vendor/imageviewer.css</key>
 		<data>
-		Y0TTtdmiVpKxiVlsmRZpO1oaw3k=
+		U9IUnW7ZX4TgGTq33Seu9eZgogE=
 		</data>
 		<key>www/db.json</key>
 		<data>
@@ -586,7 +586,7 @@
 		</data>
 		<key>www/js/vendor/imageviewer.js</key>
 		<data>
-		dDUe+v7hMXHgtHs7CrXPQ/YdDTw=
+		+lvb1hPF4rBrUNXOYaIPTnT7yok=
 		</data>
 		<key>www/js/vendor/iscroll.js</key>
 		<data>
@@ -941,22 +941,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			X77iqOSfOBq++C6Ofab9TwKX/H0=
+			tszeoGh05zy+6mIi3uhQTDuyGl4=
 			</data>
 			<key>hash2</key>
 			<data>
-			Q1t27cNvHm/fCaaMaugEPCJALXHbidwqtiLKHPCPl2I=
+			TXWLbTBHSTbsS/QoivSVU3Axfjow+6KtNCflCxcoYeQ=
 			</data>
 		</dict>
 		<key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			/NkqnV08SFpdht+bv/Nrq3IAU5g=
+			3kENpZV04BY77IF9fdI492Ejcsw=
 			</data>
 			<key>hash2</key>
 			<data>
-			7Ab68SyMh60EY5PT/eeqd55fvOucen9u1AU1t5mRMHU=
+			sqLN533a8SMMDopbnpIYbPvAZkC2eSDoNYA+vGhZA54=
 			</data>
 		</dict>
 		<key>CDVLaunchScreen.storyboardc/Info.plist</key>
@@ -974,11 +974,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			8FbiZcGKTwdXrAFb+uYT7V09mMY=
+			mhvCTFFXlxaLrmgLmrDZ+1ysqcQ=
 			</data>
 			<key>hash2</key>
 			<data>
-			v6smnmSXyxCxE5o3pWdIuV9eO/y/mka1lIF/ISjNwrQ=
+			ijE8+ot5dTiTWgsPT8NbPgEDhXd75F1NnY6JLXXmsGU=
 			</data>
 		</dict>
 		<key>CDVNotification.bundle/beep.wav</key>
@@ -996,11 +996,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			+0H2odfEEAoVXh614tgP3WJFEyQ=
+			BRzL+0NY/MDviGcrgPkKilkjmYw=
 			</data>
 			<key>hash2</key>
 			<data>
-			S+9UoNvi55BvadYZImx9LGTVbaZsyJGecuCFuhd3Z88=
+			zM+nLFEC7j9jraALjenv2omieTkmkRk6D9+mBarES0M=
 			</data>
 		</dict>
 		<key>config.xml</key>
@@ -1315,11 +1315,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			Y0TTtdmiVpKxiVlsmRZpO1oaw3k=
+			U9IUnW7ZX4TgGTq33Seu9eZgogE=
 			</data>
 			<key>hash2</key>
 			<data>
-			/7LafZ9alRQNgfO5nCCnwOI7MoSVDHa0RRK1jlJ3XbU=
+			JN5niSdpAtWf/qLG3j5+Cp9UbBc3SZAmhql6sUDsYm0=
 			</data>
 		</dict>
 		<key>www/db.json</key>
@@ -2272,11 +2272,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			dDUe+v7hMXHgtHs7CrXPQ/YdDTw=
+			+lvb1hPF4rBrUNXOYaIPTnT7yok=
 			</data>
 			<key>hash2</key>
 			<data>
-			f118cn4Nx3NHL5Bvo0THTOOppi9P4rP0W/6S+m4k24o=
+			vnIzT6qSefpXefYDH2WXGOkv8wUApSxo6xw2EVQdU44=
 			</data>
 		</dict>
 		<key>www/js/vendor/iscroll.js</key>
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/vendor/imageviewer.css b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/vendor/imageviewer.css
index 9ce0d82b..af346f08 100644
--- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/vendor/imageviewer.css
+++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/vendor/imageviewer.css
@@ -70,7 +70,6 @@
 }
 *//***** snap view css *****/
 .iv-snap-view {
-  display: none !important;
   width: 150px;
   height: 150px;
   position: absolute;
@@ -86,7 +85,8 @@
   -moz-transition: all ease 400ms;
   -o-transition: all ease 400ms;
   transition: all ease 400ms;
-  opacity: 0;
+  opacity: 0 !important;
+  pointer-events: none;
 }
 
 .iv-snap-image-wrap {
diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/vendor/imageviewer.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/vendor/imageviewer.js
index 4484b753..847c6070 100644
--- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/vendor/imageviewer.js
+++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/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 = {
diff --git a/StoneIsland/platforms/ios/www/css/vendor/imageviewer.css b/StoneIsland/platforms/ios/www/css/vendor/imageviewer.css
index 9ce0d82b..af346f08 100644
--- a/StoneIsland/platforms/ios/www/css/vendor/imageviewer.css
+++ b/StoneIsland/platforms/ios/www/css/vendor/imageviewer.css
@@ -70,7 +70,6 @@
 }
 *//***** snap view css *****/
 .iv-snap-view {
-  display: none !important;
   width: 150px;
   height: 150px;
   position: absolute;
@@ -86,7 +85,8 @@
   -moz-transition: all ease 400ms;
   -o-transition: all ease 400ms;
   transition: all ease 400ms;
-  opacity: 0;
+  opacity: 0 !important;
+  pointer-events: none;
 }
 
 .iv-snap-image-wrap {
diff --git a/StoneIsland/platforms/ios/www/js/vendor/imageviewer.js b/StoneIsland/platforms/ios/www/js/vendor/imageviewer.js
index 4484b753..847c6070 100644
--- a/StoneIsland/platforms/ios/www/js/vendor/imageviewer.js
+++ b/StoneIsland/platforms/ios/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 = {
diff --git a/StoneIsland/www/css/vendor/imageviewer.css b/StoneIsland/www/css/vendor/imageviewer.css
index 9ce0d82b..af346f08 100644
--- a/StoneIsland/www/css/vendor/imageviewer.css
+++ b/StoneIsland/www/css/vendor/imageviewer.css
@@ -70,7 +70,6 @@
 }
 *//***** snap view css *****/
 .iv-snap-view {
-  display: none !important;
   width: 150px;
   height: 150px;
   position: absolute;
@@ -86,7 +85,8 @@
   -moz-transition: all ease 400ms;
   -o-transition: all ease 400ms;
   transition: all ease 400ms;
-  opacity: 0;
+  opacity: 0 !important;
+  pointer-events: none;
 }
 
 .iv-snap-image-wrap {
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 = {