diff options
| -rw-r--r-- | public/assets/js/app.js | 1 | ||||
| -rw-r--r-- | public/assets/js/lib/HeaderView.js | 2 | ||||
| -rw-r--r-- | public/assets/js/lib/NavView.js | 3 | ||||
| -rw-r--r-- | public/assets/js/lib/ProjectView.js | 24 | ||||
| -rw-r--r-- | public/assets/js/lib/Scroller.js | 10 | ||||
| -rw-r--r-- | public/assets/ok.css | 8 | ||||
| -rw-r--r-- | templates/index.liquid | 2 |
7 files changed, 30 insertions, 20 deletions
diff --git a/public/assets/js/app.js b/public/assets/js/app.js index 5ae0c99..e34eb52 100644 --- a/public/assets/js/app.js +++ b/public/assets/js/app.js @@ -118,7 +118,6 @@ var app = (function() { } else { if (cellCount == 0) { - console.log($(this).data("id"), "NONE") $(".bottom", this).css({ 'top': height + 17 }) } else if (cellCount == 1) { diff --git a/public/assets/js/lib/HeaderView.js b/public/assets/js/lib/HeaderView.js index 59ca255..a99921b 100644 --- a/public/assets/js/lib/HeaderView.js +++ b/public/assets/js/lib/HeaderView.js @@ -37,7 +37,7 @@ var HeaderView = View.extend({ }, toggleNav: function(){ - $('body').toggleClass('navopen') + document.body.classList.toggle('navopen') // $('body').toggleClass('navopen') }, }) diff --git a/public/assets/js/lib/NavView.js b/public/assets/js/lib/NavView.js index e2b334c..e15f343 100644 --- a/public/assets/js/lib/NavView.js +++ b/public/assets/js/lib/NavView.js @@ -10,7 +10,8 @@ var NavView = View.extend({ }, click: function(e){ - var id = $(e.target).data("id") + var id = $(e.target).closest("li").data("id") + console.log("PICK", id) this.pick(id) }, diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js index 4b1c994..3eece8f 100644 --- a/public/assets/js/lib/ProjectView.js +++ b/public/assets/js/lib/ProjectView.js @@ -41,17 +41,19 @@ var ProjectView = View.extend({ if (! $viewport.length) { $viewport = this.$(".cell") } - if ($viewport.length) { - $("<div>").addClass("page-up").insertAfter( $viewport ) - $("<div>").addClass("page-down").insertAfter( $viewport ) - } - else if (this.$('.top').length) { - this.$(".top").append( $("<figure>").addClass("page-up") ) - this.$(".top").append( $("<figure>").addClass("page-down") ) - } - else { - this.$el.append( $("<figure>").addClass("page-up") ) - this.$el.append( $("<figure>").addClass("page-down") ) + if (is_desktop) { + if ($viewport.length) { + $("<div>").addClass("page-up").insertAfter( $viewport ) + $("<div>").addClass("page-down").insertAfter( $viewport ) + } + else if (this.$('.top').length) { + this.$(".top").append( $("<figure>").addClass("page-up") ) + this.$(".top").append( $("<figure>").addClass("page-down") ) + } + else { + this.$el.append( $("<figure>").addClass("page-up") ) + this.$el.append( $("<figure>").addClass("page-down") ) + } } // now that the gallery is ready, store this data.. diff --git a/public/assets/js/lib/Scroller.js b/public/assets/js/lib/Scroller.js index b88ec0f..f5b75f2 100644 --- a/public/assets/js/lib/Scroller.js +++ b/public/assets/js/lib/Scroller.js @@ -29,12 +29,16 @@ var Scroller = (function(){ var touchGalleryScrubDistance = 100 var $items = $("#items")[0] function touchstart (e) { + // console.log(e.target, e.currentTarget) + if (document.body.classList.contains("navopen")) return + if (e.target.className == "index" || e.target.id == "burger") return + if (e.target.nodeName == "rect" || e.target.nodeName == "g") return + touching = true touchStartTime = +(new Date) touchStartY = touchEndY = e.touches ? e.touches[0].pageY : e.pageY touchStartX = touchEndX = e.touches ? e.touches[0].pageX : e.pageX touchDistY = touchDistX = 0 -// $items.className = "no-tween" } function touchmove (e) { if (! touching) return @@ -58,7 +62,7 @@ var Scroller = (function(){ var timestamp = +(new Date) var duration = timestamp - touchStartTime - console.log("DURATION >>", duration, touchDistY, touchDistX) + // console.log("DURATION >>", duration, touchDistY, touchDistX) if (touchAbsX > touchGalleryScrubDistance) { return @@ -132,7 +136,7 @@ var Scroller = (function(){ } } function keydown (e) { - console.log(e.keyCode) + // console.log(e.keyCode) switch (e.keyCode) { case 37: // left e.preventDefault() diff --git a/public/assets/ok.css b/public/assets/ok.css index 25392e5..10083ee 100644 --- a/public/assets/ok.css +++ b/public/assets/ok.css @@ -50,6 +50,7 @@ body { display: block; opacity: 0; pointer-events: none; + visibility: hidden; } .item { @@ -262,11 +263,14 @@ nav svg g g:last-child rect { cursor: url(img/x-w.png) 32 32, pointer; } + +/* .navopen .item > * { opacity: 0.1; transition: 150ms opacity cubic-bezier(0, 0, 0, 1); background: #eee; } + */ div, span { @@ -312,12 +316,12 @@ body.navopen { background: black; transition: 200ms opacity cubic-bezier(0, 0, 0, 1); opacity: 0; - z-index: 0; + z-index: 1; width: 100%; height: 100%; } .navopen #curtain { - opacity: 1; + opacity: 0.9; } nav { diff --git a/templates/index.liquid b/templates/index.liquid index 8328227..0995c4f 100644 --- a/templates/index.liquid +++ b/templates/index.liquid @@ -105,7 +105,7 @@ <br><br> Speaker At – <br> - RISD, AIGA, Semi-Perminent, SXSW, Sotheby’s, Goethe Institut, Smithsonian, OTIS College + RISD, AIGA, Semi-Permanent, SXSW, Sotheby’s, Goethe Institut, Smithsonian, OTIS College <br> Clients –– <br><br> |