summaryrefslogtreecommitdiff
path: root/StoneIsland/www/js
diff options
context:
space:
mode:
Diffstat (limited to 'StoneIsland/www/js')
-rwxr-xr-xStoneIsland/www/js/lib/blogs/BlogView.js6
-rwxr-xr-xStoneIsland/www/js/lib/etc/push.js25
-rwxr-xr-xStoneIsland/www/js/lib/products/CollectionView.js2
3 files changed, 30 insertions, 3 deletions
diff --git a/StoneIsland/www/js/lib/blogs/BlogView.js b/StoneIsland/www/js/lib/blogs/BlogView.js
index 9b49abbd..59c0a192 100755
--- a/StoneIsland/www/js/lib/blogs/BlogView.js
+++ b/StoneIsland/www/js/lib/blogs/BlogView.js
@@ -30,10 +30,14 @@ var BlogView = View.extend({
})
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)
+ }, 2000)
})
+
data.page.forEach(function(page){
app[page.tag].populate(page)
-
})
app.collection.setCollectionName( data.store[0].collection )
diff --git a/StoneIsland/www/js/lib/etc/push.js b/StoneIsland/www/js/lib/etc/push.js
index ab0c0141..0db5c1a2 100755
--- a/StoneIsland/www/js/lib/etc/push.js
+++ b/StoneIsland/www/js/lib/etc/push.js
@@ -1 +1,24 @@
-// \ No newline at end of file
+var push = (function(){
+ var appId
+ var clientKey
+ var push = {}
+ push.init = function(){
+ parsePlugin.initialize(appId, clientKey, push.subscribe, push.error)
+ }
+ push.subscribe = function() {
+ parsePlugin.subscribe('SampleChannel', push.did_subscribe, push.error)
+ }
+ push.did_subscribe = function(){
+ // parsePlugin.getInstallationId(function(id) {
+ // var install_data = {
+ // installation_id: id,
+ // channels: ['SampleChannel']
+ // }
+ // }, push.error)
+ }
+ push.error = function(e){
+ console.log("push error")
+ }
+
+ return push
+})() \ No newline at end of file
diff --git a/StoneIsland/www/js/lib/products/CollectionView.js b/StoneIsland/www/js/lib/products/CollectionView.js
index 798920d1..d290e4b4 100755
--- a/StoneIsland/www/js/lib/products/CollectionView.js
+++ b/StoneIsland/www/js/lib/products/CollectionView.js
@@ -49,7 +49,7 @@ var CollectionView = ScrollableView.extend({
return
}
this.$loader.show()
- sdk.product.all({
+ sdk.collection.all({
gallery_id: app.gallery_id,
success: this.populate.bind(this)
})