diff options
| -rw-r--r-- | public/assets/js/lib/NavView.js | 8 | ||||
| -rw-r--r-- | public/assets/js/lib/ProjectView.js | 13 | ||||
| -rw-r--r-- | public/assets/ok.css | 1 |
3 files changed, 13 insertions, 9 deletions
diff --git a/public/assets/js/lib/NavView.js b/public/assets/js/lib/NavView.js index ae60bdf..0eb4671 100644 --- a/public/assets/js/lib/NavView.js +++ b/public/assets/js/lib/NavView.js @@ -20,12 +20,20 @@ var NavView = View.extend({ }, previous: function(){ + if ($('body').hasClass('navopen')) { + $('body').removeClass('navopen') + return + } var index = Math.max( app.view.page_number - 1, 0 ) var view = app.projects[ index ] this.swap( view, "up" ) }, next: function(){ + if ($('body').hasClass('navopen')) { + $('body').removeClass('navopen') + return + } var index = Math.min( app.view.page_number + 1, app.projects.length - 1 ) var view = app.projects[ index ] this.swap( view, "down" ) diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js index 357bbee..1528f10 100644 --- a/public/assets/js/lib/ProjectView.js +++ b/public/assets/js/lib/ProjectView.js @@ -1,7 +1,7 @@ var ProjectView = View.extend({ events: { - "click": "nextOrCloseNav", + "click": "next", "click .page-up": "previous", "click .page-down": "next", "click .top": "stopPropagation", @@ -46,15 +46,10 @@ var ProjectView = View.extend({ e.stopPropagation() app.nav.previous() }, - - nextOrCloseNav: function(e){ + + next: function(e){ e.stopPropagation() - if ($('body').hasClass('navopen')) { - $('body').removeClass('navopen') - } - else { - app.nav.next() - } + app.nav.next() }, }) diff --git a/public/assets/ok.css b/public/assets/ok.css index 8c1ae4f..5905087 100644 --- a/public/assets/ok.css +++ b/public/assets/ok.css @@ -412,6 +412,7 @@ nav b { position: absolute; z-index: 3; bottom:0; + left: 0; margin-left: 20vw; cursor: url(img/d.png)32 64, pointer; } |