From b7d9257ca0c65c37ba1bc35a4ad19d0401aa1ccf Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Mon, 4 Mar 2013 20:57:35 +0400 Subject: [PATCH] some tweeks... Signed-off-by: Alex A. Naanou --- index-old.html | 2 +- index.html | 94 ++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 81 insertions(+), 15 deletions(-) diff --git a/index-old.html b/index-old.html index 2b0de68..b5681ec 100755 --- a/index-old.html +++ b/index-old.html @@ -17,7 +17,7 @@ - + + + + + @@ -239,6 +281,12 @@ function setupEditor(){ function setupEditorToolbars(){ var indicator = $('
') .appendTo($('.magazine')) + .click(function(){ + // NOTE: this does the same thing as handleClick... + togglePageView('on') + setCurrentPage(target) + setTransitionEasing(mag, 'cubic-bezier(0.33,0.66,0.66,1)') + }) // the toolbars... var left_bar = $('
') @@ -251,26 +299,45 @@ function setupEditor(){ .click(function(){ setTransitionDuration($('.magazine'), 0) removePage() + runMagazineTemplates() + + return false }) $('') .appendTo(right_bar) .click(function(){ shiftPageRight() + runMagazineTemplates() + + return false }) $('') .appendTo(right_bar) .click(function(){ + + return false }) $('') .appendTo(left_bar) .click(function(){ shiftPageLeft() + runMagazineTemplates() + + return false }) $('') .appendTo(left_bar) .click(function(){ + + return false + }) + + $('
Editor Mode
') + .appendTo($('.chrome')) + .click(function(){ + toggleEditor('off') }) } function clearEdiorToolbars(){ @@ -291,13 +358,7 @@ function setupEditor(){ if(togglePageView('?') == 'on'){ toggleInlineEditor('on') } - $('
Editor Mode
') - .appendTo($('.chrome')) - .click(function(){ - toggleEditor('off') - }) } else { - $('.editor-status').remove() toggleInlineEditor('off') } setCurrentPage($('.current.page')) @@ -396,7 +457,11 @@ $(document).ready(function(){ doc: '', Esc: function(){ - toggleEditor('?') == 'on' && toggleEditor('off') + if(toggleEditor('?') == 'on'){ + toggleEditor('off') + } else { + togglePageView('off') + } }, Home: firstPage, @@ -413,6 +478,7 @@ $(document).ready(function(){ default: nextPage, shift: prevPage }, + Enter: function(){ togglePageView('on') }, // combined navigation with actions.. Up: function(){ togglePageView() }, Down: function(){ togglePageView() },