Merge branch 'android' of github.com:okfocus/stone-island into android

1 files changed, 11 insertions, 10 deletions

diff --git a/StoneIsland/www/js/lib/products/Selector.js b/StoneIsland/www/js/lib/products/Selector.js
index 4e0a5f04..6db33b68 100755
--- a/StoneIsland/www/js/lib/products/Selector.js
+++ b/StoneIsland/www/js/lib/products/Selector.js
@@ -27,22 +27,23 @@ var Selector = View.extend({
     this.$el.show()
     app.curtain.show("white")
     this.visible = true
+    $("#selector").removeClass("selector-outer-wrap")
     if ( origin == "wide") {
       $("#selector").addClass("selector-full")
     }
     else {
       $("#selector").removeClass("selector-full")
     }
-     var originXY = $("." + origin).offset()
-     var originWidth = $("." + origin).width()
-     var selectorHeight = $('#selector').height()
-     var originHeight = $("." + origin).height()
-     console.log(originXY.left)
-     console.log(originXY.top)
-     console.log(selectorHeight)
-     console.log(origin)
-
-       $("#selector").css({"top":(originXY.top - selectorHeight - originHeight + 20),"left":originXY.left})
+    var originXY = $("." + origin).offset()
+    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;