diff options
| -rw-r--r-- | StoneIsland/www/index.html | 129 | ||||
| -rw-r--r-- | StoneIsland/www/js/index.js | 3 | ||||
| -rw-r--r-- | StoneIsland/www/js/lib/blogs/ArchiveView.js | 1 | ||||
| -rw-r--r-- | StoneIsland/www/js/lib/blogs/HubView.js | 1 | ||||
| -rw-r--r-- | StoneIsland/www/js/lib/blogs/StoryView.js | 1 | ||||
| -rw-r--r-- | 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 @@ </div> <div id="story"> - <h1>STORY</h1> - <div class="content"> - <script type="text/html" class="template"> - <div> - <img src="{{image}}"> - <span class="date">{{date}}</span> - <span class="title">{{title}}</span> - <div class="body">{{body}}</div> - </div> - </script> + <div class="scroll"> + <h1>STORY</h1> + <div class="content"> + <script type="text/html" class="template"> + <div> + <img src="{{image}}"> + <span class="date">{{date}}</span> + <span class="title">{{title}}</span> + <div class="body">{{body}}</div> + </div> + </script> + </div> </div> </div> <div id="hub"> - <h1>HUB</h1> - <div class="content"> - <script type="text/html" class="template"> - <div> - <img src="{{image}}"> - <span class="title"><b>{{code}}</b> {{title}}</span> - <span class="subtitle">{{subtitle}}</span> - <div class="body">{{body}}</div> - </div> - </script> + <div class="scroll"> + <h1>HUB</h1> + <div class="content"> + <script type="text/html" class="template"> + <div> + <img src="{{image}}"> + <span class="title"><b>{{code}}</b> {{title}}</span> + <span class="subtitle">{{subtitle}}</span> + <div class="body">{{body}}</div> + </div> + </script> + </div> </div> </div> <div id="archive"> - <h1>ARCHIVE</h1> - <div class="content"> - <script type="text/html" class="template"> - <img src="{{image}}"> - <div class="above"> - <h2> - <b>{{code}}</b><br> - {{title}} - </h2> - <div class="body"> - {{body}} + <div class="scroll"> + <h1>ARCHIVE</h1> + <div class="content"> + <script type="text/html" class="template"> + <img src="{{image}}"> + <div class="above"> + <h2> + <b>{{code}}</b><br> + {{title}} + </h2> + <div class="body"> + {{body}} + </div> </div> - </div> - </script> + </script> + </div> </div> </div> <div id="collection"> - <h1>COLLECTION NAME</h1> - <div class="loader"></div> - <div class="content"> - <script type="text/html" class="template"> - <div class="item" data-code="{{code8}}"> - <img src="{{image}}"> - </div> - </script> + <div class="scroll"> + <h1>COLLECTION NAME</h1> + <div class="loader"></div> + <div class="content"> + <script type="text/html" class="template"> + <div class="item" data-code="{{code8}}"> + <img src="{{image}}"> + </div> + </script> + </div> </div> </div> <div id="product"> - <span class="left"></span> - <span class="right"></span> - <div class="gallery"> - <img src=""> - </div> - <div class="content"> - <h2><b class="num"></b><span class="title"></h2> - <span class="type"></span> - <span class="price"></span> - <span class="style"> - <span class="size"></span> - <span class="color"></span> - </span> - <span class="share">SHARE +</span> - <div class="body"> + <div class="scroll"> + <span class="left"></span> + <span class="right"></span> + <div class="gallery"> + <img src=""> + </div> + <div class="content"> + <h2><b class="num"></b><span class="title"></h2> + <span class="type"></span> + <span class="price"></span> + <span class="style"> + <span class="size"></span> + <span class="color"></span> + </span> + <span class="share">SHARE +</span> + <div class="body"> + </div> </div> </div> </div> @@ -156,12 +166,7 @@ <div id="selector"> <span class="close"></span> - <div> - <span>X-SMALL</span> - <span>SMALL</span> - <span>MEDIUM</span> - <span>LARGE</span> - <span>X-LARGE</span> + <div class="options"> </div> </div> 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(){ |