From 58bf27362c0b3d1d41e135aa8bdbd38297a4d0f9 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 17 Sep 2015 08:32:19 -0400 Subject: add scrollers to a few things --- StoneIsland/www/index.html | 129 +++++++++++----------- StoneIsland/www/js/index.js | 3 + StoneIsland/www/js/lib/blogs/ArchiveView.js | 1 + StoneIsland/www/js/lib/blogs/HubView.js | 1 + StoneIsland/www/js/lib/blogs/StoryView.js | 1 + StoneIsland/www/js/lib/products/CollectionView.js | 1 + 6 files changed, 74 insertions(+), 62 deletions(-) diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html index 3484743f..86ad6d52 100644 --- a/StoneIsland/www/index.html +++ b/StoneIsland/www/index.html @@ -76,79 +76,89 @@
-

STORY

-
- +
+

STORY

+
+ +
-

HUB

-
- +
+

HUB

+
+ +
-

ARCHIVE

-
- + +
-

COLLECTION NAME

-
-
- +
+

COLLECTION NAME

+
+
+ +
- - - -
-

- - - - - - - -
+
+ + + +
+

+ + + + + + + +
+
@@ -156,12 +166,7 @@
-
- X-SMALL - SMALL - MEDIUM - LARGE - X-LARGE +
diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js index 12bc089c..31e78c92 100644 --- a/StoneIsland/www/js/index.js +++ b/StoneIsland/www/js/index.js @@ -38,6 +38,9 @@ var app = (function(){ if (window.cordova) { // cordova.plugins.Keyboard.disableScroll(true) } + + document.addEventListener('touchmove', function(e){ e.preventDefault() }) + app.view = null app.router = new SiteRouter () app.router.route() diff --git a/StoneIsland/www/js/lib/blogs/ArchiveView.js b/StoneIsland/www/js/lib/blogs/ArchiveView.js index 79139054..31dfd743 100644 --- a/StoneIsland/www/js/lib/blogs/ArchiveView.js +++ b/StoneIsland/www/js/lib/blogs/ArchiveView.js @@ -9,6 +9,7 @@ var ArchiveView = View.extend({ initialize: function(){ this.$content = this.$(".content") this.$loader = this.$(".loader") + this.scroller = new IScroll('#archive .scroll') }, show: function(){ diff --git a/StoneIsland/www/js/lib/blogs/HubView.js b/StoneIsland/www/js/lib/blogs/HubView.js index ce035c7d..88ae6f1f 100644 --- a/StoneIsland/www/js/lib/blogs/HubView.js +++ b/StoneIsland/www/js/lib/blogs/HubView.js @@ -9,6 +9,7 @@ var HubView = View.extend({ initialize: function(){ this.$content = this.$(".content") this.$loader = this.$(".loader") + this.scroller = new IScroll('#hub .scroll') }, show: function(){ diff --git a/StoneIsland/www/js/lib/blogs/StoryView.js b/StoneIsland/www/js/lib/blogs/StoryView.js index 4a825c8a..0f03a518 100644 --- a/StoneIsland/www/js/lib/blogs/StoryView.js +++ b/StoneIsland/www/js/lib/blogs/StoryView.js @@ -9,6 +9,7 @@ var StoryView = View.extend({ initialize: function(){ this.$content = this.$(".content") this.$loader = this.$(".loader") + this.scroller = new IScroll('#story .scroll') }, show: function(){ diff --git a/StoneIsland/www/js/lib/products/CollectionView.js b/StoneIsland/www/js/lib/products/CollectionView.js index 1234ec11..5d4e45f2 100644 --- a/StoneIsland/www/js/lib/products/CollectionView.js +++ b/StoneIsland/www/js/lib/products/CollectionView.js @@ -13,6 +13,7 @@ var CollectionView = View.extend({ initialize: function(){ this.$content = this.$(".content") this.$loader = this.$(".loader") + this.scroller = new IScroll('#collection .scroll') }, show: function(){ -- cgit v1.2.3-70-g09d2