diff --git a/ui/marks.js b/ui/marks.js index 78bd354b..108cc0c6 100755 --- a/ui/marks.js +++ b/ui/marks.js @@ -50,18 +50,18 @@ var toggleMarkedOnlyView = createCSSClassToggler( '.viewer', 'marked-only-view cropped-mode', function(action){ - //// prevent reentering... - //if(action == 'on' && $('.viewer').hasClass('cropped-mode') - // || action == toggleMarkedOnlyView('?')){ + // 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' && toggleSingleImageMode('?') == 'on'){ return false } }, function(action){ if(action == 'on'){ + // XXX do we need to keep ribbons here??? cropMarkedImages() } else { - //uncropData() showAllData() } }) diff --git a/ui/modes.js b/ui/modes.js index 8e1f46ff..c1cc6b41 100755 --- a/ui/modes.js +++ b/ui/modes.js @@ -177,10 +177,9 @@ var toggleSingleRibbonMode = createCSSClassToggler( '.viewer', 'single-ribbon-mode cropped-mode', function(action){ - //// prevent reentering... - //if(action == 'on' && $('.viewer').hasClass('cropped-mode') - // || action == toggleSingleRibbonMode('?')){ // 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'){ return false } @@ -189,7 +188,6 @@ var toggleSingleRibbonMode = createCSSClassToggler( if(action == 'on'){ cropDataTo(DATA.ribbons[getRibbonIndex()].slice()) } else { - //uncropData() showAllData() } })