build 0.7.0

3 files changed, 11 insertions, 5 deletions

diff --git a/StoneIsland/platforms/android/assets/www/js/lib/nav/AddressView.js b/StoneIsland/platforms/android/assets/www/js/lib/nav/AddressView.js
index ad5745fb..4a05c4b6 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/nav/AddressView.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/nav/AddressView.js
@@ -7,6 +7,7 @@ var AddressView = SerializableView.extend({
   
   events: {
     "change [name=Province]": 'update_country',
+    "focus [name]": 'scroll_up_to_phone',
   },
   
   initialize: function(opt){
@@ -55,6 +56,10 @@ var AddressView = SerializableView.extend({
       this.$(".country-label").html("UNITED STATES")
     }
   },
+  
+  scroll_up_to_phone: function(e){
+    app.view.scroller && app.view.scroller.scrollTo(0, -$(e.currentTarget).position().top)
+  },
 
 })
 
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/nav/HeaderView.js b/StoneIsland/platforms/android/assets/www/js/lib/nav/HeaderView.js
index 73fe106d..0961a5e8 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/nav/HeaderView.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/nav/HeaderView.js
@@ -5,7 +5,7 @@ var HeaderView = View.extend({
   events: {
     "click .burger": "nav",
     "click .logo": "logo",
-    "click .cart": "cart",
+    "click .cart_rapper": "cart",
   },
   
   initialize: function(){
@@ -54,4 +54,4 @@ var HeaderView = View.extend({
     this.$cart_count.html( --this.count )
   },
 
-})
\ No newline at end of file
+})
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/nav/NavView.js b/StoneIsland/platforms/android/assets/www/js/lib/nav/NavView.js
index fc373858..cfb39ff6 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/nav/NavView.js
+++ b/StoneIsland/platforms/android/assets/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/localize.asp?tskay=4036416C&page=help/return&deviceYeti=smartphone", '_system')
+    window.open("http://www.stoneisland.com/yTos/Plugins/AreaLocalizer/Redirectarea?area=ProductExchange&controllerName=SearchOrder&actionName=Index", '_system')
   },
 
 
@@ -134,8 +134,9 @@ var NavView = View.extend({
     this.hide()
     app.router.go("page/terms")
   },
-  care: function(){
-    window.open("http://www.stoneisland.com/localize.asp?tskay=4036416C&page=help/home&deviceYeti=smartphone", '_system')
+  care: function(e){
+    e.preventDefault()
+    window.open("http://www.stoneisland.com/system/web/custom/hp/email.jsp", '_system')
   },