summaryrefslogtreecommitdiff
path: root/StoneIsland/www/js/lib
diff options
context:
space:
mode:
Diffstat (limited to 'StoneIsland/www/js/lib')
-rw-r--r--StoneIsland/www/js/lib/blogs/ArchiveView.js4
-rw-r--r--StoneIsland/www/js/lib/blogs/HubView.js5
-rw-r--r--StoneIsland/www/js/lib/blogs/StoryView.js3
-rw-r--r--StoneIsland/www/js/lib/products/ProductView.js20
4 files changed, 18 insertions, 14 deletions
diff --git a/StoneIsland/www/js/lib/blogs/ArchiveView.js b/StoneIsland/www/js/lib/blogs/ArchiveView.js
index 783254cc..91316dea 100644
--- a/StoneIsland/www/js/lib/blogs/ArchiveView.js
+++ b/StoneIsland/www/js/lib/blogs/ArchiveView.js
@@ -1,4 +1,4 @@
-var ArchiveView = View.extend({
+var ArchiveView = ScrollableView.extend({
el: "#archive",
template: $("#archive .template").html(),
@@ -13,6 +13,7 @@ var ArchiveView = View.extend({
},
show: function(){
+ this.deferScrollToTop()
document.body.className = "archive"
},
@@ -30,5 +31,4 @@ var ArchiveView = View.extend({
}.bind(this))
},
-
}) \ No newline at end of file
diff --git a/StoneIsland/www/js/lib/blogs/HubView.js b/StoneIsland/www/js/lib/blogs/HubView.js
index 2f04c5cb..5832eb2e 100644
--- a/StoneIsland/www/js/lib/blogs/HubView.js
+++ b/StoneIsland/www/js/lib/blogs/HubView.js
@@ -13,6 +13,7 @@ var HubView = ScrollableView.extend({
},
show: function(){
+ this.deferScrollToTop()
document.body.className = "hub"
},
@@ -22,7 +23,7 @@ var HubView = ScrollableView.extend({
this.$content.empty()
// id date subtitle body link image[uri caption]
this.data.forEach(function(row){
- console.log(row)
+ // console.log(row)
var t = this.template.replace(/{{id}}/, row.id)
.replace(/{{date}}/, row.date)
.replace(/{{title}}/, row.title)
@@ -56,7 +57,7 @@ var HubView = ScrollableView.extend({
else {
// single image
var el = document.createElement("div")
- el.style.backgroundImage = "url(" + img.uri + ")"
+ el.style.backgroundImage = "url(" + row.image[0].uri + ")"
el.className = "item"
$(".gallery-" + row.id).append(el)
diff --git a/StoneIsland/www/js/lib/blogs/StoryView.js b/StoneIsland/www/js/lib/blogs/StoryView.js
index b0221de3..62928cec 100644
--- a/StoneIsland/www/js/lib/blogs/StoryView.js
+++ b/StoneIsland/www/js/lib/blogs/StoryView.js
@@ -1,4 +1,4 @@
-var StoryView = View.extend({
+var StoryView = ScrollableView.extend({
el: "#story",
template: $("#story .template").html(),
@@ -17,6 +17,7 @@ var StoryView = View.extend({
},
show: function(){
+ this.deferScrollToTop()
document.body.className = "story"
},
diff --git a/StoneIsland/www/js/lib/products/ProductView.js b/StoneIsland/www/js/lib/products/ProductView.js
index c5a7ff29..0d0b0b25 100644
--- a/StoneIsland/www/js/lib/products/ProductView.js
+++ b/StoneIsland/www/js/lib/products/ProductView.js
@@ -1,12 +1,3 @@
-var SIZE_LOOKUP = {
- "XS": "X-SMALL",
- "S": "SMALL",
- "M": "MEDIUM",
- "L": "LARGE",
- "XL": "X-LARGE",
- "XXL": "XX-LARGE",
- "XXXL": "XXX-LARGE",
-};
var ProductView = ScrollableView.extend({
@@ -20,6 +11,7 @@ var ProductView = ScrollableView.extend({
initialize: function(){
this.gallery = new GalleryView ()
+ this.scroller = new IScroll('#product', app.iscroll_options)
this.$num = this.$(".num")
this.$title = this.$(".title")
@@ -147,6 +139,16 @@ var ProductView = ScrollableView.extend({
})
+var SIZE_LOOKUP = {
+ "XS": "X-SMALL",
+ "S": "SMALL",
+ "M": "MEDIUM",
+ "L": "LARGE",
+ "XL": "X-LARGE",
+ "XXL": "XX-LARGE",
+ "XXXL": "XXX-LARGE",
+};
+
/*