summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2016-01-20 23:04:19 +0100
committerJules Laplace <jules@okfoc.us>2016-01-20 23:04:19 +0100
commit0a6a76b07644f38b2599a6bb0c462e82cdecbf8a (patch)
tree74f9659f91842ce49e86a4f8cc864a83ec92e8d9
parentf47c0196699eed49c6dbc03c857fe1e4368f2b54 (diff)
build
-rwxr-xr-xStoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstatebin41967 -> 41992 bytes
-rwxr-xr-xStoneIsland/platforms/ios/www/css/blogs.css5
-rwxr-xr-xStoneIsland/platforms/ios/www/js/index.js11
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/blogs/HubView.js2
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/nav/NavView.js3
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/products/ProductView.js3
-rwxr-xr-xStoneIsland/www/css/blogs.css5
-rwxr-xr-xStoneIsland/www/js/index.js11
-rwxr-xr-xStoneIsland/www/js/lib/etc/geo.js2
-rwxr-xr-xStoneIsland/www/js/lib/nav/NavView.js3
10 files changed, 33 insertions, 12 deletions
diff --git a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
index 67b972ba..c19c9120 100755
--- a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
Binary files differ
diff --git a/StoneIsland/platforms/ios/www/css/blogs.css b/StoneIsland/platforms/ios/www/css/blogs.css
index 8b27dda9..ca5b4c7f 100755
--- a/StoneIsland/platforms/ios/www/css/blogs.css
+++ b/StoneIsland/platforms/ios/www/css/blogs.css
@@ -129,9 +129,7 @@ animation: mfadein 0.6s;
z-index:2;
position:absolute;
display:block;
- animation: gallery-fade 4s forwards;
}
-
.gallery-right {
border:1px solid black;
background:rgba(255,255,255,1);
@@ -151,6 +149,9 @@ animation: mfadein 0.6s;
z-index:2;
position:absolute;
display:block;
+}
+.product .gallery-left,
+.product .gallery-right {
animation: gallery-fade 4s forwards;
}
diff --git a/StoneIsland/platforms/ios/www/js/index.js b/StoneIsland/platforms/ios/www/js/index.js
index 0770b0f6..4f1747ab 100755
--- a/StoneIsland/platforms/ios/www/js/index.js
+++ b/StoneIsland/platforms/ios/www/js/index.js
@@ -3,7 +3,7 @@ var app = (function(){
app.init = function(){
- sdk.init({ env: "test" })
+ sdk.init({ env: "production" })
app.bind()
app.build()
@@ -66,6 +66,8 @@ var app = (function(){
if (window.cordova) {
document.addEventListener('pause', app.paused, false)
document.addEventListener('resume', app.resumed, false)
+ document.addEventListener('online', app.online, false)
+ document.addEventListener('offline', app.offline, false)
cordova.plugins.Keyboard.disableScroll(true)
geo.fetch()
}
@@ -92,6 +94,13 @@ var app = (function(){
}
}
+ app.online = function(){
+ console.log(">> ONLINE")
+ }
+ app.offline = function(){
+ console.log(">> OFFLINE")
+ }
+
return app
})()
diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js
index 4ed05bb8..687a3b95 100755
--- a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js
@@ -118,7 +118,7 @@ var HubView = ScrollableView.extend({
share: function(e){
var title = $(e.currentTarget).parent().find(".title").text()
console.log("share", title)
- window.plugins.socialsharing.share(title, null, null, "http://stoneisland.com/" )
+ window.plugins.socialsharing.share(title, null, null, "http://deeplink.me/www.stoneisland.com/hub" )
},
}) \ No newline at end of file
diff --git a/StoneIsland/platforms/ios/www/js/lib/nav/NavView.js b/StoneIsland/platforms/ios/www/js/lib/nav/NavView.js
index fc373858..f3818b7f 100755
--- a/StoneIsland/platforms/ios/www/js/lib/nav/NavView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/nav/NavView.js
@@ -134,7 +134,8 @@ var NavView = View.extend({
this.hide()
app.router.go("page/terms")
},
- care: function(){
+ care: function(e){
+ e.preventDefault()
window.open("http://www.stoneisland.com/localize.asp?tskay=4036416C&page=help/home&deviceYeti=smartphone", '_system')
},
diff --git a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js
index 5cfb0b50..cb9a0c5a 100755
--- a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js
@@ -307,8 +307,7 @@ var ProductView = ScrollableView.extend({
},
share: function(){
- console.log("share")
- window.plugins.socialsharing.share( this.item['ModelNames'], null, null, "http://stoneisland.com/")
+ window.plugins.socialsharing.share( this.item['ModelNames'], null, null, "http://deeplink.me/www.stoneisland.com/store/" + this.code)
},
})
diff --git a/StoneIsland/www/css/blogs.css b/StoneIsland/www/css/blogs.css
index 8b27dda9..ca5b4c7f 100755
--- a/StoneIsland/www/css/blogs.css
+++ b/StoneIsland/www/css/blogs.css
@@ -129,9 +129,7 @@ animation: mfadein 0.6s;
z-index:2;
position:absolute;
display:block;
- animation: gallery-fade 4s forwards;
}
-
.gallery-right {
border:1px solid black;
background:rgba(255,255,255,1);
@@ -151,6 +149,9 @@ animation: mfadein 0.6s;
z-index:2;
position:absolute;
display:block;
+}
+.product .gallery-left,
+.product .gallery-right {
animation: gallery-fade 4s forwards;
}
diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js
index 0770b0f6..4f1747ab 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: "test" })
+ sdk.init({ env: "production" })
app.bind()
app.build()
@@ -66,6 +66,8 @@ var app = (function(){
if (window.cordova) {
document.addEventListener('pause', app.paused, false)
document.addEventListener('resume', app.resumed, false)
+ document.addEventListener('online', app.online, false)
+ document.addEventListener('offline', app.offline, false)
cordova.plugins.Keyboard.disableScroll(true)
geo.fetch()
}
@@ -92,6 +94,13 @@ var app = (function(){
}
}
+ app.online = function(){
+ console.log(">> ONLINE")
+ }
+ app.offline = function(){
+ console.log(">> OFFLINE")
+ }
+
return app
})()
diff --git a/StoneIsland/www/js/lib/etc/geo.js b/StoneIsland/www/js/lib/etc/geo.js
index 5af9ecfd..885a1c6c 100755
--- a/StoneIsland/www/js/lib/etc/geo.js
+++ b/StoneIsland/www/js/lib/etc/geo.js
@@ -10,7 +10,7 @@ var geo = (function(){
geo.success = function(position){
var lat_str = as_degrees( position.coords.latitude || 40.99167, "N", "S" )
- var lng_str = as_degrees( position.coords.longitude || -74.07944, "W", "E" )
+ var lng_str = as_degrees( position.coords.longitude || -74.07944, "E", "W" )
$(".latlng").html( lat_str + "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" + lng_str )
geo.done()
}
diff --git a/StoneIsland/www/js/lib/nav/NavView.js b/StoneIsland/www/js/lib/nav/NavView.js
index fc373858..f3818b7f 100755
--- a/StoneIsland/www/js/lib/nav/NavView.js
+++ b/StoneIsland/www/js/lib/nav/NavView.js
@@ -134,7 +134,8 @@ var NavView = View.extend({
this.hide()
app.router.go("page/terms")
},
- care: function(){
+ care: function(e){
+ e.preventDefault()
window.open("http://www.stoneisland.com/localize.asp?tskay=4036416C&page=help/home&deviceYeti=smartphone", '_system')
},