From c84192bc43906913d8861b9b7807976b19e544fb Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 11 Dec 2015 03:13:42 -0600 Subject: build --- .../ios/www/icons/android-icon-144x144.png | Bin 4091 -> 0 bytes .../ios/www/icons/android-icon-192x192.png | Bin 4431 -> 0 bytes .../platforms/ios/www/icons/android-icon-36x36.png | Bin 1578 -> 0 bytes .../platforms/ios/www/icons/android-icon-48x48.png | Bin 1879 -> 0 bytes .../platforms/ios/www/icons/android-icon-72x72.png | Bin 2334 -> 0 bytes .../platforms/ios/www/icons/android-icon-96x96.png | Bin 2817 -> 0 bytes .../platforms/ios/www/icons/apple-icon-114x114.png | Bin 3155 -> 0 bytes .../platforms/ios/www/icons/apple-icon-120x120.png | Bin 3326 -> 0 bytes .../platforms/ios/www/icons/apple-icon-144x144.png | Bin 4091 -> 0 bytes .../platforms/ios/www/icons/apple-icon-152x152.png | Bin 4383 -> 0 bytes .../platforms/ios/www/icons/apple-icon-180x180.png | Bin 5212 -> 0 bytes .../platforms/ios/www/icons/apple-icon-57x57.png | Bin 2069 -> 0 bytes .../platforms/ios/www/icons/apple-icon-60x60.png | Bin 2133 -> 0 bytes .../platforms/ios/www/icons/apple-icon-72x72.png | Bin 2334 -> 0 bytes .../platforms/ios/www/icons/apple-icon-76x76.png | Bin 2432 -> 0 bytes .../ios/www/icons/apple-icon-precomposed.png | Bin 5000 -> 0 bytes StoneIsland/platforms/ios/www/icons/apple-icon.png | Bin 5000 -> 0 bytes .../platforms/ios/www/icons/browserconfig.xml | 2 - .../platforms/ios/www/icons/favicon-16x16.png | Bin 1062 -> 0 bytes .../platforms/ios/www/icons/favicon-32x32.png | Bin 1499 -> 0 bytes .../platforms/ios/www/icons/favicon-96x96.png | Bin 2817 -> 0 bytes StoneIsland/platforms/ios/www/icons/favicon.ico | Bin 1150 -> 0 bytes StoneIsland/platforms/ios/www/icons/manifest.json | 41 ------------ .../platforms/ios/www/icons/ms-icon-144x144.png | Bin 4091 -> 0 bytes .../platforms/ios/www/icons/ms-icon-150x150.png | Bin 4310 -> 0 bytes .../platforms/ios/www/icons/ms-icon-310x310.png | Bin 11333 -> 0 bytes .../platforms/ios/www/icons/ms-icon-70x70.png | Bin 2291 -> 0 bytes StoneIsland/platforms/ios/www/index.html | 21 +------ .../ios/www/js/lib/account/SettingsView.js | 22 ++++++- .../platforms/ios/www/js/lib/blogs/BlogView.js | 10 ++- StoneIsland/platforms/ios/www/js/lib/etc/push.js | 70 ++++++++++++++++++++- .../ios/www/js/lib/products/CollectionView.js | 2 +- 32 files changed, 98 insertions(+), 70 deletions(-) delete mode 100755 StoneIsland/platforms/ios/www/icons/android-icon-144x144.png delete mode 100755 StoneIsland/platforms/ios/www/icons/android-icon-192x192.png delete mode 100755 StoneIsland/platforms/ios/www/icons/android-icon-36x36.png delete mode 100755 StoneIsland/platforms/ios/www/icons/android-icon-48x48.png delete mode 100755 StoneIsland/platforms/ios/www/icons/android-icon-72x72.png delete mode 100755 StoneIsland/platforms/ios/www/icons/android-icon-96x96.png delete mode 100755 StoneIsland/platforms/ios/www/icons/apple-icon-114x114.png delete mode 100755 StoneIsland/platforms/ios/www/icons/apple-icon-120x120.png delete mode 100755 StoneIsland/platforms/ios/www/icons/apple-icon-144x144.png delete mode 100755 StoneIsland/platforms/ios/www/icons/apple-icon-152x152.png delete mode 100755 StoneIsland/platforms/ios/www/icons/apple-icon-180x180.png delete mode 100755 StoneIsland/platforms/ios/www/icons/apple-icon-57x57.png delete mode 100755 StoneIsland/platforms/ios/www/icons/apple-icon-60x60.png delete mode 100755 StoneIsland/platforms/ios/www/icons/apple-icon-72x72.png delete mode 100755 StoneIsland/platforms/ios/www/icons/apple-icon-76x76.png delete mode 100755 StoneIsland/platforms/ios/www/icons/apple-icon-precomposed.png delete mode 100755 StoneIsland/platforms/ios/www/icons/apple-icon.png delete mode 100755 StoneIsland/platforms/ios/www/icons/browserconfig.xml delete mode 100755 StoneIsland/platforms/ios/www/icons/favicon-16x16.png delete mode 100755 StoneIsland/platforms/ios/www/icons/favicon-32x32.png delete mode 100755 StoneIsland/platforms/ios/www/icons/favicon-96x96.png delete mode 100755 StoneIsland/platforms/ios/www/icons/favicon.ico delete mode 100755 StoneIsland/platforms/ios/www/icons/manifest.json delete mode 100755 StoneIsland/platforms/ios/www/icons/ms-icon-144x144.png delete mode 100755 StoneIsland/platforms/ios/www/icons/ms-icon-150x150.png delete mode 100755 StoneIsland/platforms/ios/www/icons/ms-icon-310x310.png delete mode 100755 StoneIsland/platforms/ios/www/icons/ms-icon-70x70.png (limited to 'StoneIsland/platforms/ios/www') diff --git a/StoneIsland/platforms/ios/www/icons/android-icon-144x144.png b/StoneIsland/platforms/ios/www/icons/android-icon-144x144.png deleted file mode 100755 index 08a2989c..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/android-icon-144x144.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/android-icon-192x192.png b/StoneIsland/platforms/ios/www/icons/android-icon-192x192.png deleted file mode 100755 index b36071b6..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/android-icon-192x192.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/android-icon-36x36.png b/StoneIsland/platforms/ios/www/icons/android-icon-36x36.png deleted file mode 100755 index f37ec0e2..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/android-icon-36x36.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/android-icon-48x48.png b/StoneIsland/platforms/ios/www/icons/android-icon-48x48.png deleted file mode 100755 index 0556cbed..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/android-icon-48x48.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/android-icon-72x72.png b/StoneIsland/platforms/ios/www/icons/android-icon-72x72.png deleted file mode 100755 index 07272e93..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/android-icon-72x72.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/android-icon-96x96.png b/StoneIsland/platforms/ios/www/icons/android-icon-96x96.png deleted file mode 100755 index efcfbca5..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/android-icon-96x96.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/apple-icon-114x114.png b/StoneIsland/platforms/ios/www/icons/apple-icon-114x114.png deleted file mode 100755 index 56e9a482..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/apple-icon-114x114.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/apple-icon-120x120.png b/StoneIsland/platforms/ios/www/icons/apple-icon-120x120.png deleted file mode 100755 index c9b1bb2b..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/apple-icon-120x120.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/apple-icon-144x144.png b/StoneIsland/platforms/ios/www/icons/apple-icon-144x144.png deleted file mode 100755 index 08a2989c..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/apple-icon-144x144.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/apple-icon-152x152.png b/StoneIsland/platforms/ios/www/icons/apple-icon-152x152.png deleted file mode 100755 index 9af7c290..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/apple-icon-152x152.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/apple-icon-180x180.png b/StoneIsland/platforms/ios/www/icons/apple-icon-180x180.png deleted file mode 100755 index 249a5463..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/apple-icon-180x180.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/apple-icon-57x57.png b/StoneIsland/platforms/ios/www/icons/apple-icon-57x57.png deleted file mode 100755 index f7b5a99d..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/apple-icon-57x57.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/apple-icon-60x60.png b/StoneIsland/platforms/ios/www/icons/apple-icon-60x60.png deleted file mode 100755 index 9605a263..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/apple-icon-60x60.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/apple-icon-72x72.png b/StoneIsland/platforms/ios/www/icons/apple-icon-72x72.png deleted file mode 100755 index 07272e93..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/apple-icon-72x72.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/apple-icon-76x76.png b/StoneIsland/platforms/ios/www/icons/apple-icon-76x76.png deleted file mode 100755 index 5ba075af..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/apple-icon-76x76.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/apple-icon-precomposed.png b/StoneIsland/platforms/ios/www/icons/apple-icon-precomposed.png deleted file mode 100755 index 65303103..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/apple-icon-precomposed.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/apple-icon.png b/StoneIsland/platforms/ios/www/icons/apple-icon.png deleted file mode 100755 index 65303103..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/apple-icon.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/browserconfig.xml b/StoneIsland/platforms/ios/www/icons/browserconfig.xml deleted file mode 100755 index c5541482..00000000 --- a/StoneIsland/platforms/ios/www/icons/browserconfig.xml +++ /dev/null @@ -1,2 +0,0 @@ - -#ffffff \ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/icons/favicon-16x16.png b/StoneIsland/platforms/ios/www/icons/favicon-16x16.png deleted file mode 100755 index 8787c0e6..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/favicon-16x16.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/favicon-32x32.png b/StoneIsland/platforms/ios/www/icons/favicon-32x32.png deleted file mode 100755 index c78d2d28..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/favicon-32x32.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/favicon-96x96.png b/StoneIsland/platforms/ios/www/icons/favicon-96x96.png deleted file mode 100755 index efcfbca5..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/favicon-96x96.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/favicon.ico b/StoneIsland/platforms/ios/www/icons/favicon.ico deleted file mode 100755 index 521e2cfc..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/favicon.ico and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/manifest.json b/StoneIsland/platforms/ios/www/icons/manifest.json deleted file mode 100755 index 013d4a6a..00000000 --- a/StoneIsland/platforms/ios/www/icons/manifest.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "App", - "icons": [ - { - "src": "\/android-icon-36x36.png", - "sizes": "36x36", - "type": "image\/png", - "density": "0.75" - }, - { - "src": "\/android-icon-48x48.png", - "sizes": "48x48", - "type": "image\/png", - "density": "1.0" - }, - { - "src": "\/android-icon-72x72.png", - "sizes": "72x72", - "type": "image\/png", - "density": "1.5" - }, - { - "src": "\/android-icon-96x96.png", - "sizes": "96x96", - "type": "image\/png", - "density": "2.0" - }, - { - "src": "\/android-icon-144x144.png", - "sizes": "144x144", - "type": "image\/png", - "density": "3.0" - }, - { - "src": "\/android-icon-192x192.png", - "sizes": "192x192", - "type": "image\/png", - "density": "4.0" - } - ] -} \ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/icons/ms-icon-144x144.png b/StoneIsland/platforms/ios/www/icons/ms-icon-144x144.png deleted file mode 100755 index 08a2989c..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/ms-icon-144x144.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/ms-icon-150x150.png b/StoneIsland/platforms/ios/www/icons/ms-icon-150x150.png deleted file mode 100755 index 98983d89..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/ms-icon-150x150.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/ms-icon-310x310.png b/StoneIsland/platforms/ios/www/icons/ms-icon-310x310.png deleted file mode 100755 index cd0e0a98..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/ms-icon-310x310.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/icons/ms-icon-70x70.png b/StoneIsland/platforms/ios/www/icons/ms-icon-70x70.png deleted file mode 100755 index 09adb6db..00000000 Binary files a/StoneIsland/platforms/ios/www/icons/ms-icon-70x70.png and /dev/null differ diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index e0925f65..8393eda1 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/www/index.html @@ -26,23 +26,6 @@ - - - - - - - - - - - - - - - - - Stone Island @@ -509,7 +492,7 @@ Receive notifications for Store
- +
@@ -519,7 +502,7 @@ Receive notifications for Hub
- +
diff --git a/StoneIsland/platforms/ios/www/js/lib/account/SettingsView.js b/StoneIsland/platforms/ios/www/js/lib/account/SettingsView.js index 0de80048..0d6fa807 100755 --- a/StoneIsland/platforms/ios/www/js/lib/account/SettingsView.js +++ b/StoneIsland/platforms/ios/www/js/lib/account/SettingsView.js @@ -3,22 +3,38 @@ var SettingsView = FormView.extend({ el: "#settings", events: { + "change [name=store]": "changeStore", + "change [name=hub]": "changeHub", }, initialize: function(){ this.$form = this.$("form") this.$msg = this.$(".msg") + this.$store = this.$("[name=store]") + this.$hub = this.$("[name=hub]") this.scroller = new IScroll('#settings', app.iscroll_options) }, show: function(){ if (! auth.logged_in()) { return app.router.go("intro") } - app.footer.show("SAVE") document.body.className = "settings" this.deferScrollToTop() + + this.$store.prop("checked", !! push.settings.store) + this.$hub.prop("checked", !! push.settings.hub) + // push.subscribe("store") + // push.subscribe("hub") }, - - save: function(){ + + changeStore: function(){ + var state = app.settings.$store.prop("checked") + if (state) { push.subscribe("store") } + else { push.unsubscribe('store') } + }, + changeHub: function(){ + var state = app.settings.$hub.prop("checked") + if (state) { push.subscribe("hub") } + else { push.unsubscribe('hub') } }, }) \ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js index 9b49abbd..51881aa5 100755 --- a/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js +++ b/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js @@ -27,13 +27,17 @@ var BlogView = View.extend({ app.archive.populate(data.archive) this.loader.preloadImage(data.hub[0].image[0].uri, function(img){ app.hub.populate(data.hub) - }) + }.bind(this)) this.loader.preloadImage(data.story[0].image.uri, function(img){ app.story.populate(data.story) - }) + setTimeout(function(){ + this.loader.preloadImage(data.story[1].image.uri) + this.loader.preloadImage(data.story[2].image.uri) + }.bind(this), 2000) + }.bind(this)) + data.page.forEach(function(page){ app[page.tag].populate(page) - }) app.collection.setCollectionName( data.store[0].collection ) diff --git a/StoneIsland/platforms/ios/www/js/lib/etc/push.js b/StoneIsland/platforms/ios/www/js/lib/etc/push.js index ab0c0141..eb0dd4c3 100755 --- a/StoneIsland/platforms/ios/www/js/lib/etc/push.js +++ b/StoneIsland/platforms/ios/www/js/lib/etc/push.js @@ -1 +1,69 @@ -// \ No newline at end of file +var push = (function(){ + var appId + var clientKey + var push = { settings: {} } + push.init = function(){ + parsePlugin.initialize(appId, clientKey, push.did_initialize, push.error) + } + push.did_initialize = function() { + parsePlugin.registerCallback('onNotification', function(){ + window.onNotification = push.got_push_notification + }, push.error) + + push.settings.requested = localStorage.getItem("yoox.push_requested") == "true" + push.settings.hub = localStorage.getItem("yoox.push_hub") == "true" + push.settings.store = localStorage.getItem("yoox.push_store") == "true" + + if ( ! push.settings.requested ) { + localStorage.setItem("yoox.push_" + channel, "true") + push.subscribe("hub", function(){ + push.subscribe("store") + }) + } + } + push.subscribe = function(channel, cb){ + parsePlugin.subscribe(channel, function(){ + push.settings[channel] = true + localStorage.setItem("yoox.push_" + channel, "true") + cb && cb() + }, push.error) + } + push.unsubscribe = function(channel, cb){ + parsePlugin.unsubscribe(channel, function(){ + push.settings[channel] = false + localStorage.setItem("yoox.push_" + channel, "false") + cb && cb() + }, push.error) + } + push.did_subscribe = function(){ + // parsePlugin.getInstallationId(function(id) { + // var install_data = { + // installation_id: id, + // channels: ['SampleChannel'] + // } + // }, push.error) + } + push.did_unsubscribe = function(){ + // parsePlugin.getInstallationId(function(id) { + // var install_data = { + // installation_id: id, + // channels: ['SampleChannel'] + // } + // }, push.error) + } + push.got_push_notification = function(pnObj) { + alert('We received this push notification: ' + JSON.stringify(pnObj)); + app.collection.loaded = false + app.hub.loaded = false + if (pnObj.receivedInForeground === false) { + // TODO: route the user to the uri in pnObj + } + else { + app.route("intro") + } + } + push.error = function(e){ + console.log("push error") + } + return push +})() \ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js index 798920d1..7a020798 100755 --- a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js +++ b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js @@ -49,7 +49,7 @@ var CollectionView = ScrollableView.extend({ return } this.$loader.show() - sdk.product.all({ + sdk.product.collection({ gallery_id: app.gallery_id, success: this.populate.bind(this) }) -- cgit v1.2.3-70-g09d2