diff options
| author | Rene Ae <aehtyb@gmail.com> | 2015-11-30 21:41:40 -0600 |
|---|---|---|
| committer | Rene Ae <aehtyb@gmail.com> | 2015-11-30 21:41:40 -0600 |
| commit | 85201002dc9b736e772c627a09f74cdc61eb2b19 (patch) | |
| tree | 0a47d7ca252a432c4ce74bd4a055956d0eb8e122 /StoneIsland/www | |
| parent | 8b173b5ddc0b8d0bd4169bb7f8a4eabe650b664f (diff) | |
| parent | b5a159707f00828235e81c04061e8851f033bdf2 (diff) | |
Merge branch 'master' of https://github.com/okfocus/stone-island
Diffstat (limited to 'StoneIsland/www')
| -rw-r--r-- | StoneIsland/www/index.html | 3 | ||||
| -rw-r--r-- | StoneIsland/www/js/lib/blogs/HubView.js | 11 | ||||
| -rw-r--r-- | StoneIsland/www/js/lib/products/ProductView.js | 9 |
3 files changed, 22 insertions, 1 deletions
diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html index 5491d98a..5bab617f 100644 --- a/StoneIsland/www/index.html +++ b/StoneIsland/www/index.html @@ -786,7 +786,7 @@ <div class="cc_confirm"> <h3>PLEASE ENTER YOUR SECURITY CODE TO CONFIRM</h3> - <input type="number" name="Cvv" placeholder="SECURITY CODE" required> + <input type="number" name="CvvConfirm" placeholder="SECURITY CODE" required> </div> </div> @@ -799,6 +799,7 @@ </div> </div> </div> + <br><br><br><br> </form> </div> diff --git a/StoneIsland/www/js/lib/blogs/HubView.js b/StoneIsland/www/js/lib/blogs/HubView.js index 3b2900ad..a6ae958e 100644 --- a/StoneIsland/www/js/lib/blogs/HubView.js +++ b/StoneIsland/www/js/lib/blogs/HubView.js @@ -5,6 +5,8 @@ var HubView = ScrollableView.extend({ events: { "click .store": "store_link", + "click .gallery-left": "gallery_left", + "click .gallery-right": "gallery_right", }, initialize: function(){ @@ -73,6 +75,8 @@ var HubView = ScrollableView.extend({ play.className = "play" $(".gallery-" + row.id).append(play) } + $t.find("gallery-left").remove() + $t.find("gallery-right").remove() } }.bind(this)) @@ -83,5 +87,12 @@ var HubView = ScrollableView.extend({ store_link: function(){ app.router.go("store") }, + + gallery_prev: function(e){ + $(e.currentTarget).closest("hub_item").flickity('prev') + }, + gallery_next: function(e){ + $(e.currentTarget).closest("hub_item").flickity('next') + }, })
\ No newline at end of file diff --git a/StoneIsland/www/js/lib/products/ProductView.js b/StoneIsland/www/js/lib/products/ProductView.js index 18a8af52..92a0e0f7 100644 --- a/StoneIsland/www/js/lib/products/ProductView.js +++ b/StoneIsland/www/js/lib/products/ProductView.js @@ -8,6 +8,8 @@ var ProductView = ScrollableView.extend({ "click .size": "select_size", "click .color": "select_color", "click .share": "share", + "click .gallery-left": "gallery_left", + "click .gallery-right": "gallery_right", }, initialize: function(){ @@ -44,6 +46,13 @@ var ProductView = ScrollableView.extend({ cache: {}, + gallery_prev: function(){ + this.gallery.gallery.flickity('prev') + }, + gallery_right: function(){ + this.gallery.gallery.flickity('next') + }, + find: function(code, cb){ data = app.collection.items[code] || {} if (code in this.cache) { |