From dbcb073a12b85e757c9cb0da2ef962bc15dbd024 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Thu, 31 Jan 2013 17:51:18 +0400 Subject: [PATCH] tweeking JSON builder/loader... Signed-off-by: Alex A. Naanou --- magazine.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/magazine.js b/magazine.js index b5eb684..318ae32 100755 --- a/magazine.js +++ b/magazine.js @@ -929,10 +929,7 @@ function loadJSONState(data){ // remove service classes... // XXX should we do this here, on build or in both places... mag.children('.current.page').removeClass('current') - loadMagazine(mag) - setupNavigator() - loadBookmarks(data.bookmarks) - setCurrentPage(data.position) + loadMagazine(mag, data.position, data.bookmarks) } @@ -1002,21 +999,23 @@ function _createCoverPage(template){ } +// XXX setup event handlers... +function loadMagazine(mag, position, bookmarks){ + clearMagazine() + return mag.appendTo($('.aligner')) + setCurrentPage(position) + loadBookmarks(bookmarks != null ? bookmarks : []) + setupNavigator() +} + // XXX create magazine... // - magazine // - cover // - article // - cover -function loadMagazine(mag){ - clearMagazine() - return mag.appendTo($('.aligner')) -} - function createMagazine(title, cover, article){ clearMagazine() var mag = loadMagazine(_createMagazine(title, cover, article)) - setCurrentPage() - setupNavigator() return mag } // XXX some things get really surprized when this is called, make things