fixing multi department selector

6 files changed, 19 insertions, 13 deletions

diff --git a/StoneIsland/www/css/blogs.css b/StoneIsland/www/css/blogs.css
index f56ec474..d90d5883 100755
--- a/StoneIsland/www/css/blogs.css
+++ b/StoneIsland/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/www/css/products.css b/StoneIsland/www/css/products.css
index 143204f8..f32bb9b8 100755
--- a/StoneIsland/www/css/products.css
+++ b/StoneIsland/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/www/js/lib/blogs/BlogView.js b/StoneIsland/www/js/lib/blogs/BlogView.js
index d37846c2..5263bee5 100755
--- a/StoneIsland/www/js/lib/blogs/BlogView.js
+++ b/StoneIsland/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/www/js/lib/products/CollectionView.js b/StoneIsland/www/js/lib/products/CollectionView.js
index 507c51d7..dc64aab1 100755
--- a/StoneIsland/www/js/lib/products/CollectionView.js
+++ b/StoneIsland/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/www/js/lib/products/Selector.js b/StoneIsland/www/js/lib/products/Selector.js
index e3376a4d..ee680323 100755
--- a/StoneIsland/www/js/lib/products/Selector.js
+++ b/StoneIsland/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 {
@@ -42,12 +42,18 @@ var Selector = View.extend({
     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/www/js/lib/products/filters/DepartmentFilter.js b/StoneIsland/www/js/lib/products/filters/DepartmentFilter.js
index 7d5ccf3d..e54f5abe 100644
--- a/StoneIsland/www/js/lib/products/filters/DepartmentFilter.js
+++ b/StoneIsland/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,