summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xStoneIsland/config.xml1
-rwxr-xr-xStoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstatebin41591 -> 41550 bytes
-rwxr-xr-xStoneIsland/platforms/ios/Stone Island/config.xml1
-rwxr-xr-xStoneIsland/platforms/ios/www/css/products.css8
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/blogs/HubView.js45
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/products/CollectionView.js1
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/products/GalleryView.js2
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/products/ProductView.js3
-rwxr-xr-xStoneIsland/www/css/products.css8
-rwxr-xr-xStoneIsland/www/js/lib/blogs/HubView.js45
-rwxr-xr-xStoneIsland/www/js/lib/products/CollectionView.js1
-rwxr-xr-xStoneIsland/www/js/lib/products/GalleryView.js2
-rwxr-xr-xStoneIsland/www/js/lib/products/ProductView.js3
13 files changed, 96 insertions, 24 deletions
diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml
index 6a9ded95..723f7418 100755
--- a/StoneIsland/config.xml
+++ b/StoneIsland/config.xml
@@ -31,6 +31,7 @@
<preference name="SplashMaintainAspectRatio" value="true" />
<preference name="ShowSplashScreenSpinner" value="false"/>
<preference name="AutoHideSplashScreen" value="false" />
+ <preference name="AllowInlineMediaPlayback" value="true" />
<platform name="android">
<allow-intent href="market:*" />
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 b9412bbe..154a699b 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/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml
index aae77f74..208bc57d 100755
--- a/StoneIsland/platforms/ios/Stone Island/config.xml
+++ b/StoneIsland/platforms/ios/Stone Island/config.xml
@@ -80,4 +80,5 @@
<preference name="SplashMaintainAspectRatio" value="true" />
<preference name="ShowSplashScreenSpinner" value="false" />
<preference name="AutoHideSplashScreen" value="false" />
+ <preference name="AllowInlineMediaPlayback" value="true" />
</widget>
diff --git a/StoneIsland/platforms/ios/www/css/products.css b/StoneIsland/platforms/ios/www/css/products.css
index 52fe05ee..96a6afd4 100755
--- a/StoneIsland/platforms/ios/www/css/products.css
+++ b/StoneIsland/platforms/ios/www/css/products.css
@@ -58,6 +58,14 @@
background-repeat: no-repeat;
}
+.gallery .item iframe {
+ width: 100%;
+ height: 100%;
+ border: 0;
+ padding: 0;
+ margin: 0;
+}
+
.search #search { display: block }
#search {
display: none;
diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js
index e73e49a7..ce228e46 100755
--- a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js
@@ -36,7 +36,7 @@ var HubView = ScrollableView.extend({
}).sort(function(a,b){
return a[0] > b[0] ? -1 : a[0] == b[0] ? 0 : 1
}).map(function(pair){
- console.log(pair[1])
+ // console.log(pair[1])
return pair[1]
})
this.$loader.hide()
@@ -45,7 +45,7 @@ var HubView = ScrollableView.extend({
// id date subtitle body link store image[uri caption]
this.data.forEach(function(row){
// console.log(row)
- console.log(moment(row.date))
+ // console.log(moment(row.date))
var t = this.template.replace(/{{id}}/g, row.id)
.replace(/{{date}}/, moment(row.date).format("MM.DD.YYYY"))
.replace(/{{title}}/, row.title)
@@ -58,7 +58,7 @@ var HubView = ScrollableView.extend({
}
this.$content.append($t)
- if (row.image.length > 1) {
+ if (row.image && row.image.length > 1) {
// image gallery
var $gallery = $(".gallery-" + row.id)
row.image.forEach(function(img){
@@ -82,19 +82,44 @@ var HubView = ScrollableView.extend({
}
else {
// single image
+ var url = row.link
+ var is_video = url.match(/youtube|youtu.be|vimeo/)
+ var image_url
+ if (row.image && row.image.length) {
+ image_url = row.image[0].uri
+ }
+ else if (is_video && url.match(/youtube|youtu.be/)) {
+ var ytid = (url.match(/v=([-_a-zA-Z0-9]{11})/i) || url.match(/youtu.be\/([-_a-zA-Z0-9]{11})/i) || url.match(/embed\/([-_a-zA-Z0-9]{11})/i))[1].split('&')[0];
+ image_url = "http://i.ytimg.com/vi/" + ytid + "/hqdefault.jpg"
+ }
+ else {
+ image_url = ""
+ }
+
var el = document.createElement("div")
- el.style.backgroundImage = "url(" + row.image[0].uri + ")"
+
+ if (is_video) {
+ var ytid = (url.match(/v=([-_a-zA-Z0-9]{11})/i) || url.match(/youtu.be\/([-_a-zA-Z0-9]{11})/i) || url.match(/embed\/([-_a-zA-Z0-9]{11})/i))[1].split('&')[0];
+ var tag = '<iframe webkit-playsinline src="https://www.youtube.com/embed/' + ytid + '?playsinline=1" frameborder="0"></iframe>'
+ el.innerHTML = tag
+
+ // webkit-playsinline (html attribute)
+ // &playsinline=1 (yt iframe api param)
+ }
+ else {
+ el.style.backgroundImage = "url(" + image_url + ")"
+ }
el.className = "item"
$(".gallery-" + row.id).append(el)
$(".gallery-" + row.id).data("row", row)
// video, append play button
- if (row.link.match(/youtube|youtu.be|vimeo/)) {
- var play = document.createElement("div")
- play.className = "play"
- $(".gallery-" + row.id).append(play)
- $(".gallery-" + row.id).addClass("gallery-video-post")
- }
+// if (is_video) {
+// var play = document.createElement("div")
+// play.className = "play"
+// $(".gallery-" + row.id).append(play)
+// $(".gallery-" + row.id).addClass("gallery-video-post")
+// }
$t.find(".gallery-left").remove()
$t.find(".gallery-right").remove()
}
diff --git a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js
index 3fd4a757..55f3b080 100755
--- a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js
@@ -98,6 +98,7 @@ var CollectionView = ScrollableView.extend({
console.log("IS SINGLE PRODUCT")
var item = data.SearchResponseFull.Results.Items[0]
var url = sdk.image(item['DefaultCode10'], '13_f')
+ console.log(url)
var img = new Image ()
img.src = url
}
diff --git a/StoneIsland/platforms/ios/www/js/lib/products/GalleryView.js b/StoneIsland/platforms/ios/www/js/lib/products/GalleryView.js
index 02193f14..84210674 100755
--- a/StoneIsland/platforms/ios/www/js/lib/products/GalleryView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/products/GalleryView.js
@@ -60,6 +60,6 @@ var GalleryView = View.extend({
})
-var YOOX_IMAGE_STYLE_ORDER = "ZZZ d f".split(" ")
+var YOOX_IMAGE_STYLE_ORDER = "ZZZ f r d e a b c g l".split(" ")
function sort_image_styles (b,a){ return (YOOX_IMAGE_STYLE_ORDER.indexOf(a)) - (YOOX_IMAGE_STYLE_ORDER.indexOf(b)) } \ No newline at end of file
diff --git a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js
index 72ff9da3..390d2f6a 100755
--- a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js
@@ -120,7 +120,8 @@ var ProductView = ScrollableView.extend({
var title = name_partz.join(' ')
var type = title_case( data['MicroCategory'] )
var price = "$" + data['DiscountedPrice'] + ".00"
- var body = descriptions['EditorialDescription'].replace(/<br>/g, "<br><br>")
+ var body = descriptions['Details'] + "<br>" + descriptions['EditorialDescription']
+ body = body.replace(/<br>/g, "<br><br>")
var default_color_id = this.populate_selectors(data, details)
diff --git a/StoneIsland/www/css/products.css b/StoneIsland/www/css/products.css
index 52fe05ee..96a6afd4 100755
--- a/StoneIsland/www/css/products.css
+++ b/StoneIsland/www/css/products.css
@@ -58,6 +58,14 @@
background-repeat: no-repeat;
}
+.gallery .item iframe {
+ width: 100%;
+ height: 100%;
+ border: 0;
+ padding: 0;
+ margin: 0;
+}
+
.search #search { display: block }
#search {
display: none;
diff --git a/StoneIsland/www/js/lib/blogs/HubView.js b/StoneIsland/www/js/lib/blogs/HubView.js
index e73e49a7..0d733494 100755
--- a/StoneIsland/www/js/lib/blogs/HubView.js
+++ b/StoneIsland/www/js/lib/blogs/HubView.js
@@ -36,7 +36,7 @@ var HubView = ScrollableView.extend({
}).sort(function(a,b){
return a[0] > b[0] ? -1 : a[0] == b[0] ? 0 : 1
}).map(function(pair){
- console.log(pair[1])
+ // console.log(pair[1])
return pair[1]
})
this.$loader.hide()
@@ -45,7 +45,7 @@ var HubView = ScrollableView.extend({
// id date subtitle body link store image[uri caption]
this.data.forEach(function(row){
// console.log(row)
- console.log(moment(row.date))
+ // console.log(moment(row.date))
var t = this.template.replace(/{{id}}/g, row.id)
.replace(/{{date}}/, moment(row.date).format("MM.DD.YYYY"))
.replace(/{{title}}/, row.title)
@@ -58,7 +58,7 @@ var HubView = ScrollableView.extend({
}
this.$content.append($t)
- if (row.image.length > 1) {
+ if (row.image && row.image.length > 1) {
// image gallery
var $gallery = $(".gallery-" + row.id)
row.image.forEach(function(img){
@@ -82,19 +82,44 @@ var HubView = ScrollableView.extend({
}
else {
// single image
+ var url = row.link
+ var is_video = url.match(/youtube|youtu.be|vimeo/)
+ var image_url
+ if (row.image && row.image.length) {
+ image_url = row.image[0].uri
+ }
+ else if (is_video && url.match(/youtube|youtu.be/)) {
+ var ytid = (url.match(/v=([-_a-zA-Z0-9]{11})/i) || url.match(/youtu.be\/([-_a-zA-Z0-9]{11})/i) || url.match(/embed\/([-_a-zA-Z0-9]{11})/i))[1].split('&')[0];
+ image_url = "http://i.ytimg.com/vi/" + ytid + "/hqdefault.jpg"
+ }
+ else {
+ image_url = ""
+ }
+
var el = document.createElement("div")
- el.style.backgroundImage = "url(" + row.image[0].uri + ")"
+
+ if (is_video) {
+ var ytid = (url.match(/v=([-_a-zA-Z0-9]{11})/i) || url.match(/youtu.be\/([-_a-zA-Z0-9]{11})/i) || url.match(/embed\/([-_a-zA-Z0-9]{11})/i))[1].split('&')[0];
+ var tag = '<iframe src="https://www.youtube.com/embed/' + ytid + '?" frameborder="0"></iframe>'
+ el.innerHTML = tag
+
+ // webkit-playsinline (html attribute)
+ // &playsinline=1 (yt iframe api param)
+ }
+ else {
+ el.style.backgroundImage = "url(" + image_url + ")"
+ }
el.className = "item"
$(".gallery-" + row.id).append(el)
$(".gallery-" + row.id).data("row", row)
// video, append play button
- if (row.link.match(/youtube|youtu.be|vimeo/)) {
- var play = document.createElement("div")
- play.className = "play"
- $(".gallery-" + row.id).append(play)
- $(".gallery-" + row.id).addClass("gallery-video-post")
- }
+// if (is_video) {
+// var play = document.createElement("div")
+// play.className = "play"
+// $(".gallery-" + row.id).append(play)
+// $(".gallery-" + row.id).addClass("gallery-video-post")
+// }
$t.find(".gallery-left").remove()
$t.find(".gallery-right").remove()
}
diff --git a/StoneIsland/www/js/lib/products/CollectionView.js b/StoneIsland/www/js/lib/products/CollectionView.js
index 3fd4a757..55f3b080 100755
--- a/StoneIsland/www/js/lib/products/CollectionView.js
+++ b/StoneIsland/www/js/lib/products/CollectionView.js
@@ -98,6 +98,7 @@ var CollectionView = ScrollableView.extend({
console.log("IS SINGLE PRODUCT")
var item = data.SearchResponseFull.Results.Items[0]
var url = sdk.image(item['DefaultCode10'], '13_f')
+ console.log(url)
var img = new Image ()
img.src = url
}
diff --git a/StoneIsland/www/js/lib/products/GalleryView.js b/StoneIsland/www/js/lib/products/GalleryView.js
index 02193f14..84210674 100755
--- a/StoneIsland/www/js/lib/products/GalleryView.js
+++ b/StoneIsland/www/js/lib/products/GalleryView.js
@@ -60,6 +60,6 @@ var GalleryView = View.extend({
})
-var YOOX_IMAGE_STYLE_ORDER = "ZZZ d f".split(" ")
+var YOOX_IMAGE_STYLE_ORDER = "ZZZ f r d e a b c g l".split(" ")
function sort_image_styles (b,a){ return (YOOX_IMAGE_STYLE_ORDER.indexOf(a)) - (YOOX_IMAGE_STYLE_ORDER.indexOf(b)) } \ No newline at end of file
diff --git a/StoneIsland/www/js/lib/products/ProductView.js b/StoneIsland/www/js/lib/products/ProductView.js
index 72ff9da3..390d2f6a 100755
--- a/StoneIsland/www/js/lib/products/ProductView.js
+++ b/StoneIsland/www/js/lib/products/ProductView.js
@@ -120,7 +120,8 @@ var ProductView = ScrollableView.extend({
var title = name_partz.join(' ')
var type = title_case( data['MicroCategory'] )
var price = "$" + data['DiscountedPrice'] + ".00"
- var body = descriptions['EditorialDescription'].replace(/<br>/g, "<br><br>")
+ var body = descriptions['Details'] + "<br>" + descriptions['EditorialDescription']
+ body = body.replace(/<br>/g, "<br><br>")
var default_color_id = this.populate_selectors(data, details)
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-12-16 22:37:04 +0000