diff options
Diffstat (limited to 'StoneIsland/platforms/ios')
9 files changed, 29 insertions, 21 deletions
diff --git a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.pbxproj b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.pbxproj index bb05ee63..a9addbce 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.pbxproj +++ b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.pbxproj @@ -61,7 +61,7 @@ A51DA261CB3F4B89BC98FFDE /* PushPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = E88AD47F098D47C99EC93E5B /* PushPlugin.m */; }; A7F71F118E604F32AE765DFD /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 38EE2AA2E4DD46CEA0DA5F7C /* QuartzCore.framework */; }; BC44C1F8D6E54E169B1C3024 /* CDVLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = F0AAFF41056245EFBF8D4D8F /* CDVLocation.m */; }; - C520CB1888FA4F4E963A4605 /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34ADAA286CAF455C830BBC5A /* Social.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; + C520CB1888FA4F4E963A4605 /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34ADAA286CAF455C830BBC5A /* Social.framework */; settings = {ATTRIBUTES = (Required, ); }; }; C637100EF6E8411FA1763828 /* IonicKeyboard.m in Sources */ = {isa = PBXBuildFile; fileRef = 62533E046CE7411F9CEA6CD8 /* IonicKeyboard.m */; }; CE2E2F6D58504A0EA2470AEE /* CDVParsePlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 3048B836F3BD467E83BFF217 /* CDVParsePlugin.m */; }; D4A0D8761607E02300AEF8BB /* Default-568h@2x~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = D4A0D8751607E02300AEF8BB /* Default-568h@2x~iphone.png */; }; 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 Binary files differindex 7524205f..ecd31cc2 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 diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist index 259f7c4d..b337c70c 100755 --- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist +++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist @@ -57,7 +57,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>0.3.3</string> + <string>0.3.4</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -70,7 +70,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>0.3.3</string> + <string>0.3.4</string> <key>LSRequiresIPhoneOS</key> <true/> <key>NSAppTransportSecurity</key> diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml index 3dfdae4b..70a10a75 100755 --- 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="0.3.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget id="us.okfoc.stoneisland" version="0.3.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <preference name="AllowInlineMediaPlayback" value="false" /> <preference name="BackupWebStorage" value="cloud" /> <preference name="DisallowOverscroll" value="false" /> diff --git a/StoneIsland/platforms/ios/www/js/index.js b/StoneIsland/platforms/ios/www/js/index.js index 77f8a782..050a729c 100755 --- a/StoneIsland/platforms/ios/www/js/index.js +++ b/StoneIsland/platforms/ios/www/js/index.js @@ -83,15 +83,13 @@ var app = (function(){ $("body").removeClass("loading") } - - var pause_time = 0 - app.paused = function(){ - - } - + var refresh_time = +Date.now() + app.paused = function(){} app.resumed = function(){ - if (! pause_time) return - if (Date.now() - pause_time > 60 * 60 * 1000) { + geo.fetch() + var now = +Date.now() + if (now - refresh_time > 60 * 60 * 1000) { + refresh_time = now app.blog.refresh() } } diff --git a/StoneIsland/platforms/ios/www/js/lib/_router.js b/StoneIsland/platforms/ios/www/js/lib/_router.js index 5cd09d6c..b1fa1c97 100755 --- a/StoneIsland/platforms/ios/www/js/lib/_router.js +++ b/StoneIsland/platforms/ios/www/js/lib/_router.js @@ -86,7 +86,6 @@ var SiteRouter = Router.extend({ app.view = app[name] } app.header.set_back( !! app.view.back ) - console.log("showing now") app.view.show() }.bind(this) return fn diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js index 49c05ff6..dae7f98d 100755 --- a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js +++ b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js @@ -4,7 +4,7 @@ var HubView = ScrollableView.extend({ template: $("#hub .template").html(), events: { - "click .share": "content-share", + "click .content-share": "share", "click .store": "store_link", "click .gallery-left": "gallery_left", "click .gallery-right": "gallery_right", @@ -106,8 +106,10 @@ var HubView = ScrollableView.extend({ this.galleries[id].next() }, - share: function(){ - window.plugins.socialsharing.share( this.item['ModelNames'], null, null, "http://stoneisland.com/") + share: function(e){ + var title = $(e.currentTarget).parent().find(".title").text() + console.log("share", title) + window.plugins.socialsharing.share(title, null, null, "http://stoneisland.com/" ) }, })
\ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/js/lib/etc/push.js b/StoneIsland/platforms/ios/www/js/lib/etc/push.js index 4e771b62..5585ba71 100755 --- a/StoneIsland/platforms/ios/www/js/lib/etc/push.js +++ b/StoneIsland/platforms/ios/www/js/lib/etc/push.js @@ -17,7 +17,7 @@ var push = (function(){ push.settings.store = localStorage.getItem("yoox.push_store") == "true" if ( ! push.settings.requested ) { - localStorage.setItem("yoox.push_" + channel, "true") + localStorage.setItem("yoox.push_requested", "true") push.subscribe("hub", function(){ push.subscribe("store") }) diff --git a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js index 798920d1..53e99390 100755 --- a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js +++ b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js @@ -26,8 +26,9 @@ var CollectionView = ScrollableView.extend({ show: function(){ if (app.closed.storeIsClosed) { - // (! this.storeOpenDate || moment().diff(this.storeOpenDate) > 0 ) ) { - return app.closed.show() + if (! app.closed.storeOpenDate || app.closed.storeOpenDate.diff() > 0) { + return app.closed.show() + } } app.footer.show("FILTER") document.body.className = "collection" @@ -35,7 +36,9 @@ var CollectionView = ScrollableView.extend({ console.log("collection this loaded") return this.populate(this.data) } - // this.fetch() + else { + this.fetch() + } }, save: function(){ @@ -49,11 +52,17 @@ var CollectionView = ScrollableView.extend({ return } this.$loader.show() - sdk.product.all({ + console.log("fetching", app.gallery_id) + sdk.product.collection({ gallery_id: app.gallery_id, success: this.populate.bind(this) }) }, + + refresh: function(){ + this.loaded = false + this.fetch() + }, populate: function(data){ if (this.loaded && ! data) { |