From 20a10ee3e469898759cf257aaec0ab276b849c42 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Sat, 2 Feb 2013 07:12:33 +0400 Subject: [PATCH] some refactoring... Signed-off-by: Alex A. Naanou --- editor.html | 8 -------- index.html | 3 --- navigator.js | 24 +++++++++++++++++++----- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/editor.html b/editor.html index 683cfa2..52dae67 100755 --- a/editor.html +++ b/editor.html @@ -43,14 +43,6 @@ $(document).ready(function(){ // setup internal events... .on('pageChanged bookmarkAdded bookmarkRemoved bookmarksCleared', saveState) .on('pageChanged', updatePageNumberIndicator) - .on('bookmarksCleared', clearBookmarkIndicators) - .on('bookmarkAdded', function(_, n){makeBookmarkIndicator(n)}) - .on('bookmarkRemoved', function(_, n){removeBookmarkIndicator(n)}) - - // editor specific events... - .on('pageCreated articleCreated magazineCreated', resetNavigator) - .on('pageMoved articleMoved', resetNavigator) - .on('pageRemoved articleRemoved', resetNavigator) // templates... .on('pageCreated articleCreated magazineCreated ' + diff --git a/index.html b/index.html index 0ac03b7..07161a3 100755 --- a/index.html +++ b/index.html @@ -42,9 +42,6 @@ $(document).ready(function(){ // setup internal events... .on('pageChanged bookmarkAdded bookmarkRemoved bookmarksCleared', saveState) .on('pageChanged', updatePageNumberIndicator) - .on('bookmarksCleared', clearBookmarkIndicators) - .on('bookmarkAdded', function(_, n){makeBookmarkIndicator(n)}) - .on('bookmarkRemoved', function(_, n){removeBookmarkIndicator(n)}) // user interactions... .swipe({ diff --git a/navigator.js b/navigator.js index af9dfda..4360936 100755 --- a/navigator.js +++ b/navigator.js @@ -45,7 +45,7 @@ function clearArticleIndicators(){ } -function setupNavigator(){ +function setupNavigator(skip_events){ var bar = $('.navigator .bar') var elems = $('.navigator .indicator, .navigator .article') var pos = $('.navigator .indicator').fadeIn() @@ -68,10 +68,21 @@ function setupNavigator(){ makeBookmarkIndicator($(e).parents('.page')) }) - // setup event handlers... - $('.viewer') - .on('pageChanged', function(e, n){updateNavigator(n)}) - .on('magazineDragging', function(){updateNavigator()}) + if(!skip_events){ + // setup event handlers... + $('.viewer') + // basic functions... + .on('pageChanged', function(e, n){updateNavigator(n)}) + .on('magazineDragging', function(){updateNavigator()}) + // bookmarks... + .on('bookmarksCleared', clearBookmarkIndicators) + .on('bookmarkAdded', function(_, n){makeBookmarkIndicator(n)}) + .on('bookmarkRemoved', function(_, n){removeBookmarkIndicator(n)}) + // editor specific events... + .on('pageCreated articleCreated magazineCreated', resetNavigator) + .on('pageMoved articleMoved', resetNavigator) + .on('pageRemoved articleRemoved', resetNavigator) + } } // XXX this needs to unbind events... @@ -118,6 +129,9 @@ function updateNavigator(n){ } + +/******************************************************* bookmarks ***/ + function makeBookmarkIndicator(n){ if(n == null){ n = getPageNumber()