diff options
Diffstat (limited to 'StoneIsland/platforms/ios/www')
25 files changed, 69 insertions, 34 deletions
diff --git a/StoneIsland/platforms/ios/www/cordova-js-src/exec.js b/StoneIsland/platforms/ios/www/cordova-js-src/exec.js index 32a3f8b5..32a3f8b5 100755..100644 --- a/StoneIsland/platforms/ios/www/cordova-js-src/exec.js +++ b/StoneIsland/platforms/ios/www/cordova-js-src/exec.js diff --git a/StoneIsland/platforms/ios/www/cordova-js-src/platform.js b/StoneIsland/platforms/ios/www/cordova-js-src/platform.js index 36529ba5..36529ba5 100755..100644 --- a/StoneIsland/platforms/ios/www/cordova-js-src/platform.js +++ b/StoneIsland/platforms/ios/www/cordova-js-src/platform.js diff --git a/StoneIsland/platforms/ios/www/cordova.js b/StoneIsland/platforms/ios/www/cordova.js index 46ab90b7..46ab90b7 100755..100644 --- a/StoneIsland/platforms/ios/www/cordova.js +++ b/StoneIsland/platforms/ios/www/cordova.js diff --git a/StoneIsland/platforms/ios/www/cordova_plugins.js b/StoneIsland/platforms/ios/www/cordova_plugins.js index ba2c072d..1c1c9718 100755..100644 --- a/StoneIsland/platforms/ios/www/cordova_plugins.js +++ b/StoneIsland/platforms/ios/www/cordova_plugins.js @@ -9,6 +9,14 @@ module.exports = [ ] }, { + "file": "plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js", + "id": "com.parse.cordova.core.pushplugin.ParsePlugin", + "pluginId": "com.parse.cordova.core.pushplugin", + "clobbers": [ + "window.parsePlugin" + ] + }, + { "file": "plugins/cordova-plugin-console/www/logger.js", "id": "cordova-plugin-console.logger", "pluginId": "cordova-plugin-console", @@ -81,6 +89,15 @@ module.exports = [ ] }, { + "file": "plugins/cordova-plugin-inappbrowser/www/inappbrowser.js", + "id": "cordova-plugin-inappbrowser.inappbrowser", + "pluginId": "cordova-plugin-inappbrowser", + "clobbers": [ + "cordova.InAppBrowser.open", + "window.open" + ] + }, + { "file": "plugins/cordova-plugin-network-information/www/network.js", "id": "cordova-plugin-network-information.network", "pluginId": "cordova-plugin-network-information", @@ -120,41 +137,24 @@ module.exports = [ "clobbers": [ "PushNotification" ] - }, - { - "file": "plugins/cordova-plugin-inappbrowser/www/inappbrowser.js", - "id": "cordova-plugin-inappbrowser.inappbrowser", - "pluginId": "cordova-plugin-inappbrowser", - "clobbers": [ - "cordova.InAppBrowser.open", - "window.open" - ] - }, - { - "file": "plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js", - "id": "com.parse.cordova.core.pushplugin.ParsePlugin", - "pluginId": "com.parse.cordova.core.pushplugin", - "clobbers": [ - "window.parsePlugin" - ] } ]; module.exports.metadata = // TOP OF METADATA { "com.ionic.keyboard": "1.0.4", + "com.parse.cordova.core.pushplugin": "0.1.0", "cordova-plugin-console": "1.0.1", "cordova-plugin-customurlscheme": "4.0.0", "cordova-plugin-device": "1.0.1", "cordova-plugin-dialogs": "1.1.1", "cordova-plugin-geolocation": "1.0.1", + "cordova-plugin-inappbrowser": "1.1.0", "cordova-plugin-network-information": "1.0.1", - "cordova-plugin-splashscreen": "2.1.0", + "cordova-plugin-splashscreen": "3.0.0", "cordova-plugin-whitelist": "1.0.0", "cordova-plugin-x-socialsharing": "5.0.7", - "phonegap-plugin-push": "1.4.4", - "cordova-plugin-inappbrowser": "1.1.0", - "com.parse.cordova.core.pushplugin": "0.1.0" + "phonegap-plugin-push": "1.4.4" } // BOTTOM OF METADATA });
\ No newline at end of file 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..cef2d07a 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 src="https://www.youtube.com/embed/' + ytid + '?showinfo=0&rel=0&modestbranding=1&iv_load_policy=3&controls=0" 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..1428aca9 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 +function sort_image_styles (b,a){ return (YOOX_IMAGE_STYLE_ORDER.indexOf(b)) - (YOOX_IMAGE_STYLE_ORDER.indexOf(a)) }
\ 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/platforms/ios/www/plugins/com.ionic.keyboard/www/keyboard.js b/StoneIsland/platforms/ios/www/plugins/com.ionic.keyboard/www/keyboard.js index 7d30ba59..7d30ba59 100755..100644 --- a/StoneIsland/platforms/ios/www/plugins/com.ionic.keyboard/www/keyboard.js +++ b/StoneIsland/platforms/ios/www/plugins/com.ionic.keyboard/www/keyboard.js diff --git a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-console/www/console-via-logger.js b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-console/www/console-via-logger.js index 0ce8cea8..0ce8cea8 100755..100644 --- a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-console/www/console-via-logger.js +++ b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-console/www/console-via-logger.js diff --git a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-console/www/logger.js b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-console/www/logger.js index 7a9a75d3..7a9a75d3 100755..100644 --- a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-console/www/logger.js +++ b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-console/www/logger.js diff --git a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-customurlscheme/www/ios/LaunchMyApp.js b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-customurlscheme/www/ios/LaunchMyApp.js index 3568c73f..3568c73f 100755..100644 --- a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-customurlscheme/www/ios/LaunchMyApp.js +++ b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-customurlscheme/www/ios/LaunchMyApp.js diff --git a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-device/www/device.js b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-device/www/device.js index 023bafd2..023bafd2 100755..100644 --- a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-device/www/device.js +++ b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-device/www/device.js diff --git a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-dialogs/www/notification.js b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-dialogs/www/notification.js index ea97eefb..ea97eefb 100755..100644 --- a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-dialogs/www/notification.js +++ b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-dialogs/www/notification.js diff --git a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-geolocation/www/Coordinates.js b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-geolocation/www/Coordinates.js index f7255659..f7255659 100755..100644 --- a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-geolocation/www/Coordinates.js +++ b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-geolocation/www/Coordinates.js diff --git a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-geolocation/www/Position.js b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-geolocation/www/Position.js index 206bf8b4..206bf8b4 100755..100644 --- a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-geolocation/www/Position.js +++ b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-geolocation/www/Position.js diff --git a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-geolocation/www/PositionError.js b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-geolocation/www/PositionError.js index 11ffe491..11ffe491 100755..100644 --- a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-geolocation/www/PositionError.js +++ b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-geolocation/www/PositionError.js diff --git a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-geolocation/www/geolocation.js b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-geolocation/www/geolocation.js index ec9bb6e8..ec9bb6e8 100755..100644 --- a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-geolocation/www/geolocation.js +++ b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-geolocation/www/geolocation.js diff --git a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-inappbrowser/www/inappbrowser.js b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-inappbrowser/www/inappbrowser.js index 6c7a844a..6c7a844a 100755..100644 --- a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-inappbrowser/www/inappbrowser.js +++ b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-inappbrowser/www/inappbrowser.js diff --git a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-network-information/www/Connection.js b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-network-information/www/Connection.js index 1450e953..1450e953 100755..100644 --- a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-network-information/www/Connection.js +++ b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-network-information/www/Connection.js diff --git a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-network-information/www/network.js b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-network-information/www/network.js index bfac2e3f..bfac2e3f 100755..100644 --- a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-network-information/www/network.js +++ b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-network-information/www/network.js diff --git a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-splashscreen/www/splashscreen.js b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-splashscreen/www/splashscreen.js index 0e6a10af..0e6a10af 100755..100644 --- a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-splashscreen/www/splashscreen.js +++ b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-splashscreen/www/splashscreen.js diff --git a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-x-socialsharing/www/SocialSharing.js b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-x-socialsharing/www/SocialSharing.js index aa82acf6..aa82acf6 100755..100644 --- a/StoneIsland/platforms/ios/www/plugins/cordova-plugin-x-socialsharing/www/SocialSharing.js +++ b/StoneIsland/platforms/ios/www/plugins/cordova-plugin-x-socialsharing/www/SocialSharing.js diff --git a/StoneIsland/platforms/ios/www/plugins/phonegap-plugin-push/www/push.js b/StoneIsland/platforms/ios/www/plugins/phonegap-plugin-push/www/push.js index 7aa30fd7..7aa30fd7 100755..100644 --- a/StoneIsland/platforms/ios/www/plugins/phonegap-plugin-push/www/push.js +++ b/StoneIsland/platforms/ios/www/plugins/phonegap-plugin-push/www/push.js |