From fa64b51e8965c2aa05fa9a04e5e1b9704b8dd82e Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Sat, 21 Sep 2013 05:26:18 +0400 Subject: [PATCH] made current crop modes a bit more generic... Signed-off-by: Alex A. Naanou --- ui/marks.js | 6 +++--- ui/modes.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ui/marks.js b/ui/marks.js index efe560a5..e86b6808 100755 --- a/ui/marks.js +++ b/ui/marks.js @@ -51,9 +51,9 @@ var toggleMarkedOnlyView = createCSSClassToggler( 'marked-only-view cropped-mode', function(action){ // prevent mixing marked-only and single-ribbon modes... - // XXX is there a more generic way to do this??? - // ..without including direct mode dependencies? - if(action == 'on' && toggleSingleRibbonMode('?') == 'on'){ + if(action == 'on' + && $('.viewer').hasClass('cropped-mode') + && toggleMarkedOnlyView('?') != 'on'){ return false } }, diff --git a/ui/modes.js b/ui/modes.js index d1e63ade..189148fc 100755 --- a/ui/modes.js +++ b/ui/modes.js @@ -178,9 +178,9 @@ var toggleSingleRibbonMode = createCSSClassToggler( 'single-ribbon-mode cropped-mode', function(action){ // prevent mixing marked-only and single-ribbon modes... - // XXX is there a more generic way to do this??? - // ..without including direct mode dependencies? - if(action == 'on' && toggleMarkedOnlyView('?') == 'on'){ + if(action == 'on' + && $('.viewer').hasClass('cropped-mode') + && toggleSingleRibbonMode('?') != 'on'){ return false } },