From aa5a9b7c7cd52a69f8dd1d0cdc15475e113e6da0 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 11 Dec 2015 05:37:34 -0600 Subject: remembered a couple things, push 0.3.4 --- StoneIsland/platforms/android/AndroidManifest.xml | 2 +- .../platforms/android/assets/www/css/nav.css | 20 +++++- .../assets/www/icons/android-icon-144x144.png | Bin 4091 -> 0 bytes .../assets/www/icons/android-icon-192x192.png | Bin 4431 -> 0 bytes .../assets/www/icons/android-icon-36x36.png | Bin 1578 -> 0 bytes .../assets/www/icons/android-icon-48x48.png | Bin 1879 -> 0 bytes .../assets/www/icons/android-icon-72x72.png | Bin 2334 -> 0 bytes .../assets/www/icons/android-icon-96x96.png | Bin 2817 -> 0 bytes .../assets/www/icons/apple-icon-114x114.png | Bin 3155 -> 0 bytes .../assets/www/icons/apple-icon-120x120.png | Bin 3326 -> 0 bytes .../assets/www/icons/apple-icon-144x144.png | Bin 4091 -> 0 bytes .../assets/www/icons/apple-icon-152x152.png | Bin 4383 -> 0 bytes .../assets/www/icons/apple-icon-180x180.png | Bin 5212 -> 0 bytes .../android/assets/www/icons/apple-icon-57x57.png | Bin 2069 -> 0 bytes .../android/assets/www/icons/apple-icon-60x60.png | Bin 2133 -> 0 bytes .../android/assets/www/icons/apple-icon-72x72.png | Bin 2334 -> 0 bytes .../android/assets/www/icons/apple-icon-76x76.png | Bin 2432 -> 0 bytes .../assets/www/icons/apple-icon-precomposed.png | Bin 5000 -> 0 bytes .../android/assets/www/icons/apple-icon.png | Bin 5000 -> 0 bytes .../android/assets/www/icons/browserconfig.xml | 2 - .../android/assets/www/icons/favicon-16x16.png | Bin 1062 -> 0 bytes .../android/assets/www/icons/favicon-32x32.png | Bin 1499 -> 0 bytes .../android/assets/www/icons/favicon-96x96.png | Bin 2817 -> 0 bytes .../platforms/android/assets/www/icons/favicon.ico | Bin 1150 -> 0 bytes .../android/assets/www/icons/manifest.json | 41 ----------- .../android/assets/www/icons/ms-icon-144x144.png | Bin 4091 -> 0 bytes .../android/assets/www/icons/ms-icon-150x150.png | Bin 4310 -> 0 bytes .../android/assets/www/icons/ms-icon-310x310.png | Bin 11333 -> 0 bytes .../android/assets/www/icons/ms-icon-70x70.png | Bin 2291 -> 0 bytes .../platforms/android/assets/www/index.html | 24 ++----- .../platforms/android/assets/www/js/index.js | 16 ++++- .../assets/www/js/lib/account/SettingsView.js | 22 +++++- .../android/assets/www/js/lib/blogs/ArchiveView.js | 1 + .../android/assets/www/js/lib/blogs/BlogView.js | 49 ++++++++----- .../android/assets/www/js/lib/blogs/HubView.js | 2 +- .../android/assets/www/js/lib/blogs/StoryView.js | 9 +-- .../android/assets/www/js/lib/etc/push.js | 77 ++++++++++++++++++++- .../android/assets/www/js/lib/nav/IntroView.js | 3 + .../android/assets/www/js/lib/nav/NavView.js | 4 ++ .../assets/www/js/lib/products/ClosedStoreView.js | 20 ++++-- .../assets/www/js/lib/products/ProductView.js | 6 +- .../android/assets/www/js/lib/view/View.js | 2 +- .../platforms/android/assets/www/js/vendor/util.js | 2 +- StoneIsland/platforms/android/res/xml/config.xml | 2 +- 44 files changed, 201 insertions(+), 103 deletions(-) delete mode 100755 StoneIsland/platforms/android/assets/www/icons/android-icon-144x144.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/android-icon-192x192.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/android-icon-36x36.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/android-icon-48x48.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/android-icon-72x72.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/android-icon-96x96.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/apple-icon-114x114.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/apple-icon-120x120.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/apple-icon-144x144.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/apple-icon-152x152.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/apple-icon-180x180.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/apple-icon-57x57.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/apple-icon-60x60.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/apple-icon-72x72.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/apple-icon-76x76.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/apple-icon-precomposed.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/apple-icon.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/browserconfig.xml delete mode 100755 StoneIsland/platforms/android/assets/www/icons/favicon-16x16.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/favicon-32x32.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/favicon-96x96.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/favicon.ico delete mode 100755 StoneIsland/platforms/android/assets/www/icons/manifest.json delete mode 100755 StoneIsland/platforms/android/assets/www/icons/ms-icon-144x144.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/ms-icon-150x150.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/ms-icon-310x310.png delete mode 100755 StoneIsland/platforms/android/assets/www/icons/ms-icon-70x70.png (limited to 'StoneIsland/platforms/android') diff --git a/StoneIsland/platforms/android/AndroidManifest.xml b/StoneIsland/platforms/android/AndroidManifest.xml index bcf48a32..e14caf77 100755 --- a/StoneIsland/platforms/android/AndroidManifest.xml +++ b/StoneIsland/platforms/android/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/StoneIsland/platforms/android/assets/www/css/nav.css b/StoneIsland/platforms/android/assets/www/css/nav.css index f76fb744..c769dabd 100755 --- a/StoneIsland/platforms/android/assets/www/css/nav.css +++ b/StoneIsland/platforms/android/assets/www/css/nav.css @@ -93,7 +93,7 @@ #nav .social span { display: block; float: left; - width: 82px; + width: 61px; border-left: 1px solid #ddd; color: #bbb; font-size: 18px; @@ -174,6 +174,24 @@ padding-bottom:0px; z-index: 2 } +#intro .alert { + box-sizing: border-box; + width: calc(100vw); + text-align: center; + font-size: 14pt; + font-weight: bold; + line-height: 0; + text-transform: uppercase; + color: #3E6616; + position: absolute; + height: 0; + left: 0; + top: auto; + bottom: calc(25vh - 58px); + margin: auto 0; + padding: 0; +} + /* HEADER AND FOOTER ON MOST PAGES */ diff --git a/StoneIsland/platforms/android/assets/www/icons/android-icon-144x144.png b/StoneIsland/platforms/android/assets/www/icons/android-icon-144x144.png deleted file mode 100755 index 08a2989c..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/android-icon-144x144.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/android-icon-192x192.png b/StoneIsland/platforms/android/assets/www/icons/android-icon-192x192.png deleted file mode 100755 index b36071b6..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/android-icon-192x192.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/android-icon-36x36.png b/StoneIsland/platforms/android/assets/www/icons/android-icon-36x36.png deleted file mode 100755 index f37ec0e2..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/android-icon-36x36.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/android-icon-48x48.png b/StoneIsland/platforms/android/assets/www/icons/android-icon-48x48.png deleted file mode 100755 index 0556cbed..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/android-icon-48x48.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/android-icon-72x72.png b/StoneIsland/platforms/android/assets/www/icons/android-icon-72x72.png deleted file mode 100755 index 07272e93..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/android-icon-72x72.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/android-icon-96x96.png b/StoneIsland/platforms/android/assets/www/icons/android-icon-96x96.png deleted file mode 100755 index efcfbca5..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/android-icon-96x96.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/apple-icon-114x114.png b/StoneIsland/platforms/android/assets/www/icons/apple-icon-114x114.png deleted file mode 100755 index 56e9a482..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/apple-icon-114x114.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/apple-icon-120x120.png b/StoneIsland/platforms/android/assets/www/icons/apple-icon-120x120.png deleted file mode 100755 index c9b1bb2b..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/apple-icon-120x120.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/apple-icon-144x144.png b/StoneIsland/platforms/android/assets/www/icons/apple-icon-144x144.png deleted file mode 100755 index 08a2989c..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/apple-icon-144x144.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/apple-icon-152x152.png b/StoneIsland/platforms/android/assets/www/icons/apple-icon-152x152.png deleted file mode 100755 index 9af7c290..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/apple-icon-152x152.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/apple-icon-180x180.png b/StoneIsland/platforms/android/assets/www/icons/apple-icon-180x180.png deleted file mode 100755 index 249a5463..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/apple-icon-180x180.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/apple-icon-57x57.png b/StoneIsland/platforms/android/assets/www/icons/apple-icon-57x57.png deleted file mode 100755 index f7b5a99d..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/apple-icon-57x57.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/apple-icon-60x60.png b/StoneIsland/platforms/android/assets/www/icons/apple-icon-60x60.png deleted file mode 100755 index 9605a263..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/apple-icon-60x60.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/apple-icon-72x72.png b/StoneIsland/platforms/android/assets/www/icons/apple-icon-72x72.png deleted file mode 100755 index 07272e93..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/apple-icon-72x72.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/apple-icon-76x76.png b/StoneIsland/platforms/android/assets/www/icons/apple-icon-76x76.png deleted file mode 100755 index 5ba075af..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/apple-icon-76x76.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/apple-icon-precomposed.png b/StoneIsland/platforms/android/assets/www/icons/apple-icon-precomposed.png deleted file mode 100755 index 65303103..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/apple-icon-precomposed.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/apple-icon.png b/StoneIsland/platforms/android/assets/www/icons/apple-icon.png deleted file mode 100755 index 65303103..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/apple-icon.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/browserconfig.xml b/StoneIsland/platforms/android/assets/www/icons/browserconfig.xml deleted file mode 100755 index c5541482..00000000 --- a/StoneIsland/platforms/android/assets/www/icons/browserconfig.xml +++ /dev/null @@ -1,2 +0,0 @@ - -#ffffff \ No newline at end of file diff --git a/StoneIsland/platforms/android/assets/www/icons/favicon-16x16.png b/StoneIsland/platforms/android/assets/www/icons/favicon-16x16.png deleted file mode 100755 index 8787c0e6..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/favicon-16x16.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/favicon-32x32.png b/StoneIsland/platforms/android/assets/www/icons/favicon-32x32.png deleted file mode 100755 index c78d2d28..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/favicon-32x32.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/favicon-96x96.png b/StoneIsland/platforms/android/assets/www/icons/favicon-96x96.png deleted file mode 100755 index efcfbca5..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/favicon-96x96.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/favicon.ico b/StoneIsland/platforms/android/assets/www/icons/favicon.ico deleted file mode 100755 index 521e2cfc..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/favicon.ico and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/manifest.json b/StoneIsland/platforms/android/assets/www/icons/manifest.json deleted file mode 100755 index 013d4a6a..00000000 --- a/StoneIsland/platforms/android/assets/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/android/assets/www/icons/ms-icon-144x144.png b/StoneIsland/platforms/android/assets/www/icons/ms-icon-144x144.png deleted file mode 100755 index 08a2989c..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/ms-icon-144x144.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/ms-icon-150x150.png b/StoneIsland/platforms/android/assets/www/icons/ms-icon-150x150.png deleted file mode 100755 index 98983d89..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/ms-icon-150x150.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/ms-icon-310x310.png b/StoneIsland/platforms/android/assets/www/icons/ms-icon-310x310.png deleted file mode 100755 index cd0e0a98..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/ms-icon-310x310.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/icons/ms-icon-70x70.png b/StoneIsland/platforms/android/assets/www/icons/ms-icon-70x70.png deleted file mode 100755 index 09adb6db..00000000 Binary files a/StoneIsland/platforms/android/assets/www/icons/ms-icon-70x70.png and /dev/null differ diff --git a/StoneIsland/platforms/android/assets/www/index.html b/StoneIsland/platforms/android/assets/www/index.html index e0925f65..73eed267 100755 --- a/StoneIsland/platforms/android/assets/www/index.html +++ b/StoneIsland/platforms/android/assets/www/index.html @@ -26,23 +26,6 @@ - - - - - - - - - - - - - - - - - Stone Island @@ -107,6 +90,7 @@ + @@ -118,7 +102,7 @@
HUB
STORY
ARCHIVE
- +40° 58' 90" -74° 04' 46" @@ -509,7 +493,7 @@ Receive notifications for Store
- +
@@ -519,7 +503,7 @@ Receive notifications for Hub
- +
diff --git a/StoneIsland/platforms/android/assets/www/js/index.js b/StoneIsland/platforms/android/assets/www/js/index.js index 468c0d7e..73af443a 100755 --- a/StoneIsland/platforms/android/assets/www/js/index.js +++ b/StoneIsland/platforms/android/assets/www/js/index.js @@ -64,6 +64,8 @@ var app = (function(){ app.ready = function(){ if (window.cordova) { + document.addEventListener('pause', app.paused, false) + document.addEventListener('resume', app.resumed, false) cordova.plugins.Keyboard.disableScroll(true) geo.fetch() } @@ -74,12 +76,24 @@ var app = (function(){ // app.router.launch() // } // else { - app.account.connect( app.router.launch.bind(app.router) ) + push.init() + app.account.connect( app.router.launch.bind(app.router) ) // } $("body").removeClass("loading") } + var refresh_time = +Date.now() + app.paused = function(){} + app.resumed = function(){ + geo.fetch() + var now = +Date.now() + if (now - refresh_time > 60 * 60 * 1000) { + refresh_time = now + app.blog.refresh() + } + } + return app })() diff --git a/StoneIsland/platforms/android/assets/www/js/lib/account/SettingsView.js b/StoneIsland/platforms/android/assets/www/js/lib/account/SettingsView.js index 0de80048..0d6fa807 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/account/SettingsView.js +++ b/StoneIsland/platforms/android/assets/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/android/assets/www/js/lib/blogs/ArchiveView.js b/StoneIsland/platforms/android/assets/www/js/lib/blogs/ArchiveView.js index 254df6d1..a1863b67 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/blogs/ArchiveView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/blogs/ArchiveView.js @@ -78,6 +78,7 @@ var ArchiveView = ScrollableView.extend({ count = count || row.images.length row.images.forEach(function(cell, i){ + if (count && i > count) { return } var $t = $("
") $t.addClass("row").addClass("loading") var t = this.row_template.replace(/{{image}}/, cell.uri) diff --git a/StoneIsland/platforms/android/assets/www/js/lib/blogs/BlogView.js b/StoneIsland/platforms/android/assets/www/js/lib/blogs/BlogView.js index 9b49abbd..02491b32 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/blogs/BlogView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/blogs/BlogView.js @@ -17,6 +17,11 @@ var BlogView = View.extend({ }) }, + refresh: function(){ + this.loaded = false + this.fetch() + }, + success: function(data){ if (this.loaded) return @@ -24,20 +29,6 @@ var BlogView = View.extend({ this.loaded = true this.data = data = typeof data == "string" ? JSON.parse(data) : data - app.archive.populate(data.archive) - this.loader.preloadImage(data.hub[0].image[0].uri, function(img){ - app.hub.populate(data.hub) - }) - this.loader.preloadImage(data.story[0].image.uri, function(img){ - app.story.populate(data.story) - }) - data.page.forEach(function(page){ - app[page.tag].populate(page) - - }) - app.collection.setCollectionName( data.store[0].collection ) - - app.closed.populate(data.store[0].ClosedStoreImages) switch (data.store[0].StoreStatus) { case "open": app.closed.storeIsClosed = false @@ -51,6 +42,32 @@ var BlogView = View.extend({ app.closed.storeOpenDate = moment(data.store[0].OpensOn) break } + + if (app.closed.storeIsClosed) { + app.closed.populate(data.store[0].ClosedStoreImages) + } + else { + app.gallery_id = data.store[0].CollectionId + app.collection.setCollectionName( data.store[0].collection ) + app.collection.fetch() + } + + 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) + }) + console.log(data.store[0].StoreStatus) var fits_large = (data.store[0].FitsLarge === "true") @@ -61,10 +78,6 @@ var BlogView = View.extend({ app.collection.$el.addClass("gray") app.product.gallery.$el.addClass("gray") } - - app.gallery_id = data.store[0].CollectionId - - app.collection.fetch() }, }) \ No newline at end of file diff --git a/StoneIsland/platforms/android/assets/www/js/lib/blogs/HubView.js b/StoneIsland/platforms/android/assets/www/js/lib/blogs/HubView.js index 49c05ff6..a6c4384b 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/blogs/HubView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/blogs/HubView.js @@ -107,7 +107,7 @@ var HubView = ScrollableView.extend({ }, share: function(){ - window.plugins.socialsharing.share( this.item['ModelNames'], null, null, "http://stoneisland.com/") + window.plugins.socialsharing.share( this.item['ModelNames'], null, null, "http://stoneisland.com/" ) }, }) \ No newline at end of file diff --git a/StoneIsland/platforms/android/assets/www/js/lib/blogs/StoryView.js b/StoneIsland/platforms/android/assets/www/js/lib/blogs/StoryView.js index a10c8351..c2a9f4b4 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/blogs/StoryView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/blogs/StoryView.js @@ -15,6 +15,7 @@ var StoryView = ScrollableView.extend({ this.$content = this.$(".content") this.$links = this.$(".links") this.$loader = this.$(".loader") + this.loader = new Loader () this.scroller = new IScroll('#story', app.iscroll_options) }, @@ -25,7 +26,7 @@ var StoryView = ScrollableView.extend({ }, populate: function(data){ - if (this.loaded) { console.warn("populate called twice"); return } + if (this.loaded) {} this.loaded = true this.data = data this.$loader.hide() @@ -58,10 +59,10 @@ var StoryView = ScrollableView.extend({ this.$content.find("[data-id=" + id + "]").addClass("active") var section = this.sections[id] - var replace = this.$img - // optional image transition.. ? + var $replace = this.$img + this.$img.fadeTo(110,0.65, function() { - replace.attr("src", section.image.uri) + $replace.attr("src", section.image.uri) }).fadeTo(130,1) this.deferScrollToTop() }, diff --git a/StoneIsland/platforms/android/assets/www/js/lib/etc/push.js b/StoneIsland/platforms/android/assets/www/js/lib/etc/push.js index ab0c0141..4e771b62 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/etc/push.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/etc/push.js @@ -1 +1,76 @@ -// \ No newline at end of file +var push = (function(){ + var appId = "GS82ZxpN8Mecpc53rsyu6aLLGK0W4CKi42J25DLB" + var clientKey = "hQRtQfsgimYnX5PMivtcdXCG9eZhESeyTr0Rd8Sv" + var push = { settings: {} } + var parsePlugin + push.init = function(){ + parsePlugin = window.parsePlugin || { initialize: 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") + console.log("subscribed to", channel) + cb && cb() + }, push.error) + } + push.unsubscribe = function(channel, cb){ + parsePlugin.unsubscribe(channel, function(){ + push.settings[channel] = false + localStorage.setItem("yoox.push_" + channel, "false") + console.log("unsubscribed from", channel) + cb && cb() + }, push.error) + } + // parsePlugin.getInstallationId(function(id) { + // var install_data = { + // installation_id: id, + // channels: ['SampleChannel'] + // } + // }, push.error) + push.got_push_notification = function(push_obj) { + // alert('We received this push notification: ' + JSON.stringify(push_obj)); + app.blog.refresh() + + try { + var is_hub = JSON.stringify(push_obj || {}).match(/hub/i) + if (is_hub) { + app.intro.$alert.show().html("[ HUB UPDATED ]") + } + else { + app.intro.$alert.show().html("[ STORE UPDATED ]") + } + } + catch (e) { + app.intro.$alert.show().html("[ HUB UPDATED ]") + } + + if (push_obj.receivedInForeground === false) { + // TODO: route the user to the uri in push_obj + } + 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/android/assets/www/js/lib/nav/IntroView.js b/StoneIsland/platforms/android/assets/www/js/lib/nav/IntroView.js index 2d8dca43..8797241f 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/nav/IntroView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/nav/IntroView.js @@ -10,8 +10,10 @@ var IntroView = View.extend({ }, initialize: function(){ + this.$alert = this.$(".alert") this.compass = this.$("#compass").get(0) this.orient = this.deviceorientation.bind(this) + this.$alert.hide() }, show: function(){ @@ -24,6 +26,7 @@ var IntroView = View.extend({ hide: function(){ window.removeEventListener("deviceorientation", this.orient) + this.$alert.hide() }, deviceorientation: function(e){ diff --git a/StoneIsland/platforms/android/assets/www/js/lib/nav/NavView.js b/StoneIsland/platforms/android/assets/www/js/lib/nav/NavView.js index 704aaa34..71314559 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/nav/NavView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/nav/NavView.js @@ -34,6 +34,7 @@ var NavView = View.extend({ "click .fb": "fb", "click .insta": "insta", "click .tw": "tw", + "click .yt": "yt", }, initialize: function(){ @@ -153,5 +154,8 @@ var NavView = View.extend({ tw: function(){ window.open("https://twitter.com/stoneisland", '_system') }, + yt: function(){ + window.open("https://www.youtube.com/user/StoneIslandOfficial", '_system') + }, }) diff --git a/StoneIsland/platforms/android/assets/www/js/lib/products/ClosedStoreView.js b/StoneIsland/platforms/android/assets/www/js/lib/products/ClosedStoreView.js index 5f8c1e84..6f7b8486 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/products/ClosedStoreView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/products/ClosedStoreView.js @@ -12,6 +12,7 @@ var ClosedStoreView = View.extend({ timeout: -1, images: null, + images_loaded: {}, initialize: function(){ this.loader = new Loader () @@ -21,7 +22,6 @@ var ClosedStoreView = View.extend({ document.body.className = "closed" this.animate() app.footer.hide() - console.log(this) if (this.storeOpenDate) { var date = moment(this.storeOpenDate).format("MM/DD") console.log(date) @@ -38,15 +38,27 @@ var ClosedStoreView = View.extend({ animate: function(){ this.timeout = setTimeout(this.animate.bind(this), this.delay) + this.next() + }, + + next: function(){ if (! this.images) return var url = choice(this.images) - this.loader.preloadImage(url, function(img){ - this.el.style.backgroundImage = 'url(' + img.src + ')' - }.bind(this)) + + if (this.images_loaded[url]) { + this.el.style.backgroundImage = 'url(' + url + ')' + } + else { + this.loader.preloadImage(url, function(img){ + this.el.style.backgroundImage = 'url(' + url + ')' + this.images_loaded[url] = true + }.bind(this)) + } }, populate: function(data){ this.images = data.map(function(img){ return img.uri }) + this.next() }, website_link: function(){ diff --git a/StoneIsland/platforms/android/assets/www/js/lib/products/ProductView.js b/StoneIsland/platforms/android/assets/www/js/lib/products/ProductView.js index 285e551d..484cd442 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/products/ProductView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/products/ProductView.js @@ -56,7 +56,7 @@ var ProductView = ScrollableView.extend({ cache: {}, - gallery_prev: function(){ + gallery_left: function(){ app.product.gallery.gallery.previous() }, gallery_right: function(){ @@ -250,8 +250,8 @@ var ProductView = ScrollableView.extend({ app.selector.select("style", colors, function(color){ this.code = color.code this.$color.html(color.label) - - // UPDATE GALLERY + this.gallery.populate( color.code, this.details['ImageTypes'] ) + this.gallery_right() }.bind(this)) }, diff --git a/StoneIsland/platforms/android/assets/www/js/lib/view/View.js b/StoneIsland/platforms/android/assets/www/js/lib/view/View.js index fe145221..2401df0d 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/view/View.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/view/View.js @@ -59,7 +59,6 @@ var View = (function($, _){ var match = key.match(delegateEventSplitter); var eventName = match[1], selector = match[2]; method = _.bind(method, this); - eventName += '.delegateEvents' + this._id; if (is_mobile) { if (eventName === 'mouseenter' || eventName === 'mouseleave') { continue @@ -68,6 +67,7 @@ var View = (function($, _){ eventName = 'touchstart' } } + eventName += '.delegateEvents' + this._id; if (selector === '') { this.$el.on(eventName, method); } else { diff --git a/StoneIsland/platforms/android/assets/www/js/vendor/util.js b/StoneIsland/platforms/android/assets/www/js/vendor/util.js index 23f55d4c..e09b6ada 100755 --- a/StoneIsland/platforms/android/assets/www/js/vendor/util.js +++ b/StoneIsland/platforms/android/assets/www/js/vendor/util.js @@ -143,7 +143,7 @@ if (!Function.prototype.bind) { }()); // Identify browser based on useragent string -(function( ua ) { +var browser = (function( ua ) { ua = ua.toLowerCase(); var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) || /(webkit)[ \/]([\w.]+)/.exec( ua ) || diff --git a/StoneIsland/platforms/android/res/xml/config.xml b/StoneIsland/platforms/android/res/xml/config.xml index 177e57d5..1d29a8b0 100755 --- a/StoneIsland/platforms/android/res/xml/config.xml +++ b/StoneIsland/platforms/android/res/xml/config.xml @@ -1,5 +1,5 @@ - + -- cgit v1.2.3-70-g09d2