1.4.7 or something.

10 files changed, 28 insertions, 23 deletions

diff --git a/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist b/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist
index 6408f0cb..ca81e886 100644
--- a/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,12 +7,12 @@
 		<key>Cordova.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>26</integer>
+			<integer>27</integer>
 		</dict>
 		<key>CordovaLib.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>27</integer>
+			<integer>26</integer>
 		</dict>
 	</dict>
 </dict>
diff --git a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
index af47163c..8fe0f38e 100644
--- a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
index 996c6a79..4765d97a 100644
--- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
+++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
@@ -17,11 +17,11 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.4.2</string>
+    <string>1.4.6</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>1.4.2</string>
+    <string>1.4.6</string>
     <key>LSRequiresIPhoneOS</key>
     <true/>
     <key>NSMainNibFile</key>
@@ -61,11 +61,11 @@
       </dict>
     </array>
     <key>NSLocationWhenInUseUsageDescription</key>
-    <string>Stone Island needs to serve content based on your location.</string>
+    <string>Stone Island needs your location to show you product drops, which are only available in select locations.</string>
     <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-    <string>Stone Island needs to serve content based on your location.</string>
+    <string>Stone Island needs your location to show you product drops, which are only available in select locations.</string>
     <key>NSLocationAlwaysUsageDescription</key>
-    <string>Stone Island needs to serve content based on your location.</string>
+    <string>Stone Island needs your location to show you product drops, which are only available in select locations.</string>
     <key>ITSAppUsesNonExemptEncryption</key>
     <false/>
   </dict>
diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml
index f5783aee..587110ac 100644
--- a/StoneIsland/platforms/ios/Stone Island/config.xml
+++ b/StoneIsland/platforms/ios/Stone Island/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="us.okfoc.stoneisland" version="1.4.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="us.okfoc.stoneisland" version="1.4.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <feature name="CDVWebViewEngine">
         <param name="ios-package" value="CDVWebViewEngine" />
     </feature>
@@ -164,5 +164,5 @@
     <preference name="StatusBarStyle" value="default" />
     <preference name="SplashMaintainAspectRatio" value="true" />
     <preference name="ShowSplashScreenSpinner" value="false" />
-    <preference name="AutoHideSplashScreen" value="true" />
+    <preference name="AutoHideSplashScreen" value="false" />
 </widget>
diff --git a/StoneIsland/platforms/ios/www/css/blogs.css b/StoneIsland/platforms/ios/www/css/blogs.css
index f56ec474..d90d5883 100755
--- a/StoneIsland/platforms/ios/www/css/blogs.css
+++ b/StoneIsland/platforms/ios/www/css/blogs.css
@@ -141,7 +141,7 @@
   height:48px;
   top:26vh;
   content:'';
-  transform:translateY(-50%);
+  transform:translateY(-50%) translateZ(0);
   transform-origin:top right;
   left:20px;
   font-size: 1.125rem;
@@ -161,7 +161,7 @@
   height:48px;
   top:26vh;
   content:'';
-  transform:translateY(-50%);
+  transform:translateY(-50%) translateZ(0);
   transform-origin:top right;
   right:20px;
   font-size: 1.125rem;
diff --git a/StoneIsland/platforms/ios/www/css/products.css b/StoneIsland/platforms/ios/www/css/products.css
index 143204f8..f32bb9b8 100755
--- a/StoneIsland/platforms/ios/www/css/products.css
+++ b/StoneIsland/platforms/ios/www/css/products.css
@@ -285,7 +285,7 @@
   background-color: white;
 }
 
-#collection h1.single-dept {
+#collection h1.multi-dept {
   background-image: url(../img/angle-down.png);
   background-size: contain;
   background-position: top right;
diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js
index d37846c2..5263bee5 100755
--- a/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js
@@ -65,7 +65,7 @@ var BlogView = View.extend({
         app.department_id = app.store.Departments[0].uri
         app.collection.setCollectionName( app.store.Departments[0].text )
       }
-      $("#collections h1").toggleClass("single-dept", app.store.Departments.length == 1)
+      $("#collection h1").toggleClass("multi-dept", app.store.Departments.length > 1)
       //// demo department for shoes with weird SizeTypeId
       // app.department_id = "NKDrtSC"
       if (sdk.env === 'test') {
diff --git a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js
index 507c51d7..dc64aab1 100755
--- a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js
@@ -227,7 +227,7 @@ var CollectionView = ScrollableView.extend({
   
   // filter by department
   showDepartmentSelector: function(){
-    if (this.$("h1").hasClass("single-dept")) {
+    if (this.$("h1").hasClass("multi-dept")) {
       this.departmentFilterView.filter()
     }
   },
diff --git a/StoneIsland/platforms/ios/www/js/lib/products/Selector.js b/StoneIsland/platforms/ios/www/js/lib/products/Selector.js
index e3376a4d..aed6fd9a 100755
--- a/StoneIsland/platforms/ios/www/js/lib/products/Selector.js
+++ b/StoneIsland/platforms/ios/www/js/lib/products/Selector.js
@@ -28,7 +28,7 @@ var Selector = View.extend({
     app.curtain.show("white")
     this.visible = true
     $("#selector").removeClass("selector-outer-wrap")
-    if ( origin == "wide") {
+    if (origin === "wide" || origin === "multi-dept") {
       $("#selector").addClass("selector-full")
     }
     else {
@@ -38,16 +38,21 @@ var Selector = View.extend({
     var originWidth = $("." + origin).width()
     var selectorHeight = $('#selector').height()
     var originHeight = $("." + origin).height()
-    console.log(selectorHeight)
     if ((selectorHeight > 250) && (!$("#selector").hasClass("selector-full"))) {
       $("#selector").addClass("selector-outer-wrap")
     }
-    var selectorHeight = $('#selector').height()
-    $("#selector").css({"top":(originXY.top - selectorHeight - originHeight + 20),"left":originXY.left})
-    originXY = null;
-    originWidth = null;
-    originHeight = null;
-    selectorHeight = null;
+    if (origin === "wide" || origin === "multi-dept") {
+      $("#selector").css({
+        "top": originXY.top + originHeight - 20,
+        "left": originXY.left,
+      })
+    } else {
+      var selectorHeight = $('#selector').height()
+      $("#selector").css({
+        "top": originXY.top - selectorHeight - originHeight + 20,
+        "left": originXY.left,
+      })
+    }
   },
   
   hide: function(){
diff --git a/StoneIsland/platforms/ios/www/js/lib/products/filters/DepartmentFilter.js b/StoneIsland/platforms/ios/www/js/lib/products/filters/DepartmentFilter.js
index 7d5ccf3d..e54f5abe 100644
--- a/StoneIsland/platforms/ios/www/js/lib/products/filters/DepartmentFilter.js
+++ b/StoneIsland/platforms/ios/www/js/lib/products/filters/DepartmentFilter.js
@@ -11,7 +11,7 @@ var DepartmentFilter = View.extend({
         label: dep.text,
       }
     })
-    app.selector.select("wide", deps, this.pick.bind(this))
+    app.selector.select("multi-dept", deps, this.pick.bind(this))
   },
 
   last_choice: null,