summaryrefslogtreecommitdiff
path: root/StoneIsland/www/js
diff options
context:
space:
mode:
Diffstat (limited to 'StoneIsland/www/js')
-rwxr-xr-xStoneIsland/www/js/index.js2
-rwxr-xr-xStoneIsland/www/js/lib/nav/NavView.js4
-rwxr-xr-xStoneIsland/www/js/lib/products/Selector.js27
3 files changed, 23 insertions, 10 deletions
diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js
index 050a729c..ad4c6d20 100755
--- a/StoneIsland/www/js/index.js
+++ b/StoneIsland/www/js/index.js
@@ -3,7 +3,7 @@ var app = (function(){
app.init = function(){
- sdk.init({ env: "production" })
+ sdk.init({ env: "development" })
app.bind()
app.build()
diff --git a/StoneIsland/www/js/lib/nav/NavView.js b/StoneIsland/www/js/lib/nav/NavView.js
index 54be5f77..fc373858 100755
--- a/StoneIsland/www/js/lib/nav/NavView.js
+++ b/StoneIsland/www/js/lib/nav/NavView.js
@@ -115,7 +115,7 @@ var NavView = View.extend({
app.router.go("account/settings")
},
return_link: function(){
- window.open("http://www.stoneisland.com/", '_system')
+ window.open("http://www.stoneisland.com/localize.asp?tskay=4036416C&page=help/return&deviceYeti=smartphone", '_system')
},
@@ -135,7 +135,7 @@ var NavView = View.extend({
app.router.go("page/terms")
},
care: function(){
- window.open("http://www.stoneisland.com/localize.asp?tskay=4036416C&page=help/return&deviceYeti=smartphone", '_system')
+ window.open("http://www.stoneisland.com/localize.asp?tskay=4036416C&page=help/home&deviceYeti=smartphone", '_system')
},
diff --git a/StoneIsland/www/js/lib/products/Selector.js b/StoneIsland/www/js/lib/products/Selector.js
index 4e23ba1f..4e0a5f04 100755
--- a/StoneIsland/www/js/lib/products/Selector.js
+++ b/StoneIsland/www/js/lib/products/Selector.js
@@ -27,13 +27,26 @@ var Selector = View.extend({
this.$el.show()
app.curtain.show("white")
this.visible = true
-// var selectionXY = $("." + origin).offset()
-// var selectionWidth = $("." + origin).width()
-// var selectorHeight = $('#selector').height()
-// console.log(selectionXY.left)
-// console.log(selectionXY.top)
-//
-// $("#selector").css({"top":(selectionXY.top - selectorHeight),"left":selectionXY.left})
+ 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})
+ originXY = null;
+ originWidth = null;
+ originHeight = null;
+ selectorHeight = null;
},
hide: function(){