summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstatebin22903 -> 22570 bytes
-rw-r--r--StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist4
-rw-r--r--StoneIsland/platforms/ios/Stone Island/config.xml2
-rwxr-xr-xStoneIsland/platforms/ios/www/css/products.css7
-rwxr-xr-xStoneIsland/platforms/ios/www/index.html1
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js4
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/products/ProductView.js13
7 files changed, 26 insertions, 5 deletions
diff --git a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
index 21ad325f..26e44f30 100644
--- a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
Binary files differ
diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
index 48e60769..ef62e5da 100644
--- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
+++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
@@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.4.8</string>
+ <string>1.4.9</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.4.8</string>
+ <string>1.4.9</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSMainNibFile</key>
diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml
index 955ae40a..109c2a41 100644
--- a/StoneIsland/platforms/ios/Stone Island/config.xml
+++ b/StoneIsland/platforms/ios/Stone Island/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<widget id="us.okfoc.stoneisland" version="1.4.8" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="us.okfoc.stoneisland" version="1.4.9" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<feature name="CDVWebViewEngine">
<param name="ios-package" value="CDVWebViewEngine" />
</feature>
diff --git a/StoneIsland/platforms/ios/www/css/products.css b/StoneIsland/platforms/ios/www/css/products.css
index f32bb9b8..09b2f36c 100755
--- a/StoneIsland/platforms/ios/www/css/products.css
+++ b/StoneIsland/platforms/ios/www/css/products.css
@@ -251,6 +251,13 @@
text-transform:uppercase;
padding:12px 0 0;
}
+.product .extraMessage {
+ clear:both;
+ font-size: 0.563rem;
+ letter-spacing:0.5px;
+ text-transform:uppercase;
+ padding:12px 0 0;
+}
.product .fitHeader {
clear:both;
font-size: 0.563rem;
diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html
index 0c81b9a7..e154ee9a 100755
--- a/StoneIsland/platforms/ios/www/index.html
+++ b/StoneIsland/platforms/ios/www/index.html
@@ -349,6 +349,7 @@
<div class="fit">Fits Large</div>
<div class='fitHeader'></div>
<div class="notAvailableInCanada">Not Available In Canada</div>
+ <div class="extraMessage"></div>
<div class="body">
</div>
<div class="sizing">
diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js
index 5263bee5..c5d77536 100755
--- a/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js
@@ -13,7 +13,7 @@ var BlogView = View.extend({
fetch: function(fn){
$.ajax({
method: "GET",
- url: sdk.env === 'test' ? '/db.json' : sdk.cms() + '/db.json',
+ url: (sdk.env === 'test' || sdk.env === 'development') ? '/db.json' : sdk.cms() + '/db.json',
// url: "https://stone.giraffe.life/db.json",
success: function(data){
this.success(data)
@@ -37,7 +37,7 @@ var BlogView = View.extend({
// sdk.env = 'test'
- if (sdk.env === 'test') {
+ if (sdk.env === 'test' || sdk.env === 'development') {
app.store = data.store[1]
}
else {
diff --git a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js
index 071a804d..34f7927e 100755
--- a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js
@@ -5,6 +5,7 @@ var ProductView = ScrollableView.extend({
events: {
"click .fit": "scroll_to_bottom",
"click .notAvailableInCanada": "scroll_to_bottom",
+ "click .extraMessage": "scroll_to_bottom",
"change select[name=size]": "select_size",
"change select[name=color]": "select_color",
// "click .size": "select_size",
@@ -33,6 +34,7 @@ var ProductView = ScrollableView.extend({
this.$fit = this.$(".fit")
this.$fitHeader = this.$('.fitHeader')
this.$notAvailableInCanada = this.$(".notAvailableInCanada")
+ this.$extraMessage = this.$(".extraMessage")
this.$sizing = this.$(".sizing")
this.$style = this.$(".style")
},
@@ -233,6 +235,17 @@ var ProductView = ScrollableView.extend({
this.$sizing.hide()
}
+ this.$extraMessage.hide()
+ if (data['C10Attributes'] && data['C10Attributes'].length) {
+ data['C10Attributes'].forEach(function(attr){
+ if (attr['Key'] === 'Limited_Edition') {
+ this.$extraMessage.html(stripHTML( attr['Value'] ))
+ this.$extraMessage.show()
+ app.footer.show(stripHTML( attr['Value'] ))
+ }
+ }.bind(this))
+ }
+
this.populate_sizes()
this.populate_colors()