diff --git a/TODO.otl b/TODO.otl index 6462474..2eaae91 100755 --- a/TODO.otl +++ b/TODO.otl @@ -5,16 +5,7 @@ | touchdown point. [_] BUG: no drag threshold on excludedElements (TouchSwipe) | stalled... - [_] 80% general todo - [_] 75% bookmarks - [_] add next/prev bookmark actions - [_] bookmark indicators in page view - [X] #bookmark anchor - [X] bookmark indicators in navigator - [X] bookmark indicators in thumbnails - [X] bookmark persistence - [X] set bookmark from keyboard... - [X] set bookmark touch control + [_] 81% general todo [_] magazine loader and data format... | this is simple, just use a restyled magazine viewer... [_] 0% populate an example issue @@ -28,6 +19,14 @@ | e.g. setting "shown"/"hidden" classes in HTML and adding | something like a page reset that will restore the default state, | rather than the current "hideLayers" + [X] 100% bookmarks + [X] add next/prev bookmark actions + [X] #bookmark anchor + [X] bookmark indicators in navigator + [X] bookmark indicators in thumbnails + [X] bookmark persistence + [X] set bookmark from keyboard... + [X] set bookmark touch control [X] vanquish opacity effects | they slow everything down considerably! [X] add keyboard navigation... diff --git a/keybindings.js b/keybindings.js index ed2acb8..632bc2f 100755 --- a/keybindings.js +++ b/keybindings.js @@ -62,14 +62,14 @@ var keybindings = { 37: { 'default': prevPage, // Right 'ctrl': prevArticle, // ctrl-Right - 'alt': prevArticle, // alt-Right + 'shift': prevBookmark // shift-Right }, 8: 37, // BkSp 188: 37, // < 39: { 'default': nextPage, // Left 'ctrl': nextArticle, // ctrl-Left - 'alt': nextArticle, // alt-Left + 'shift': nextBookmark // shift-Left }, 32: 39, // Space 190: 39, // > diff --git a/magazine.css b/magazine.css index 6956876..5ecc4b8 100755 --- a/magazine.css +++ b/magazine.css @@ -77,6 +77,8 @@ body { margin-top: -50px; margin-left: 750px; + cursor: hand; + z-index: 9999; opacity: 0,5; @@ -336,6 +338,8 @@ body { background: red; + cursor: hand; + -webkit-transform: rotate(45deg); -moz-transform: rotate(45deg); -o-transform: rotate(45deg); diff --git a/magazine.js b/magazine.js index 76b81b7..abb467b 100755 --- a/magazine.js +++ b/magazine.js @@ -666,7 +666,7 @@ function makeBookmarkIndicator(n){ .prependTo($('.navigator .bar')) .addClass('bookmark') .css({ - left: width*n + left: width*n + width*0.75 }) .attr({ page: n @@ -735,10 +735,20 @@ function toggleBookmark(n){ // XXX move this to actions... function nextBookmark(){ - // XXX + var pages = $('.page') + pages = $(pages.splice(getPageNumber()+1)) + page = pages.children('.bookmark').first().parents('.page') + if(page.length != 0){ + return setCurrentPage(page) + } } function prevBookmark(){ - // XXX + var pages = $('.page') + pages.splice(getPageNumber()) + page = pages.children('.bookmark').last().parents('.page') + if(page.length != 0){ + return setCurrentPage(page) + } }