From 655d3ec27c5620ee811e01198af2bf4d6d4c5093 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Sun, 2 Feb 2014 05:23:13 +0400 Subject: [PATCH] removed legacy/stub code from crop.js... Signed-off-by: Alex A. Naanou --- ui/crop.js | 64 +++++++++++------------------------------------ ui/keybindings.js | 5 ++-- ui/layout.css | 2 +- ui/layout.less | 2 +- ui/ui.js | 6 ++--- 5 files changed, 22 insertions(+), 57 deletions(-) diff --git a/ui/crop.js b/ui/crop.js index de6b95cb..71d2286d 100755 --- a/ui/crop.js +++ b/ui/crop.js @@ -100,6 +100,8 @@ function cropDataTo(gids, keep_ribbons, keep_unloaded_gids){ cur = cur == null ? DATA.ribbons[r][0] : cur DATA.current = cur + $('.viewer').addClass('cropped-view') + reloadViewer() updateImages() @@ -123,6 +125,10 @@ function uncropData(){ DATA.current = cur } + if(!isViewCropped()){ + $('.viewer').removeClass('cropped-view') + } + reloadViewer() updateImages() @@ -144,6 +150,8 @@ function showAllData(){ // keep the current position... DATA.current = cur + $('.viewer').removeClass('cropped-view') + reloadViewer() updateImages() } @@ -156,63 +164,25 @@ function showAllData(){ // Make a generic crop mode toggler // -// NOTE: This will add the toggler to CROP_MODES, for use by -// uncropLastState(...) // NOTE: crop modes are exclusive -- it is not possible to enter one crop // mode from a different crop mode -// -// XXX add "exclusive" crop option -- prevent other crop modes to enter... -function makeCropModeToggler(cls, crop){ +function makeCropModeToggler(crop){ var res = createCSSClassToggler( '.viewer', - //cls + ' cropped-mode', - cls, - /* XXX make this an option... - function(action){ - // prevent mixing marked-only and single-ribbon modes... - if(action == 'on' - && isViewCropped() - && res('?') != 'on'){ - return false - } - }, - */ + '.cropped-view', function(action){ if(action == 'on'){ - showStatusQ('Cropping current ribbon...') + showStatusQ('Cropping ribbons...') crop() } else { - showStatusQ('Uncropping to all data...') + showStatusQ('Uncropping all...') showAllData() } }) - CROP_MODES.push(res) return res } -// Uncrop to last state and there is no states to uncrop then exit -// cropped mode. -// -// NOTE: this will exit all crop modes when uncropping the last step. -function uncropLastState(){ - // do nothing if we aren't in a crop mode... - if(!isViewCropped()){ - return - } - - // exit cropped all modes... - if(CROP_STACK.length == 1){ - $.each(CROP_MODES, function(_, e){ e('off') }) - - // ucrop one state... - } else { - showStatusQ('Uncropping...') - uncropData() - } -} - - /********************************************************************** * Modes... @@ -222,15 +192,13 @@ function uncropLastState(){ // one single mode... // XXX is this a mode??? var toggleSingleRibbonMode = makeCropModeToggler( - 'single-ribbon-mode', function(){ cropDataTo(getRibbonGIDs()) }) -function makeCurrenAndAboveModeToggler(name, keep_ribbons){ +function makeCurrenAndAboveModeToggler(keep_ribbons){ return makeCropModeToggler( - name, function(){ var gids = [] var c = getRibbonIndex() @@ -246,10 +214,8 @@ function makeCurrenAndAboveModeToggler(name, keep_ribbons){ cropDataTo(gids, keep_ribbons) }) } -var toggleCurrenAndAboveRibbonMode = makeCurrenAndAboveModeToggler( - 'current-and-above-ribbon-mode') -var toggleCurrenAndAboveRibbonsMode = makeCurrenAndAboveModeToggler( - 'current-and-above-ribbons-mode', true) +var toggleCurrenAndAboveRibbonMode = makeCurrenAndAboveModeToggler() +var toggleCurrenAndAboveRibbonsMode = makeCurrenAndAboveModeToggler(true) diff --git a/ui/keybindings.js b/ui/keybindings.js index 3d307bf3..6e06805c 100755 --- a/ui/keybindings.js +++ b/ui/keybindings.js @@ -273,13 +273,12 @@ var KEYBOARD_CONFIG = { 'single ribbon crop view press F3 and to open the crop '+ 'dialog for more options press C.'+ '

NOTE: toggling crop views is only possible from ribbon view.', - pattern: '.single-ribbon-mode:not(.single-image-mode), ' - +'.marked-only-view:not(.single-image-mode)', + pattern: '.cropped-view:not(.single-image-mode)', Esc: { default: doc('Uncrop to last state', function(){ - uncropLastState() + uncropData() return false }), shift: doc('Exit crop view', diff --git a/ui/layout.css b/ui/layout.css index 1d3c0a23..9d3894cc 100755 --- a/ui/layout.css +++ b/ui/layout.css @@ -1113,7 +1113,7 @@ button:hover { .single-image-mode.marks-visible.viewer .context-mode-indicators .current-image-marked:not(.shown):hover { opacity: 0.8; } -.single-ribbon-mode.viewer .global-mode-indicators .single-ribbon-mode { +.cropped-view.viewer .global-mode-indicators .cropped-view { color: gray; display: inline-block; } diff --git a/ui/layout.less b/ui/layout.less index 7dd68600..41fc3d83 100755 --- a/ui/layout.less +++ b/ui/layout.less @@ -1150,7 +1150,7 @@ button:hover { -.single-ribbon-mode.viewer .global-mode-indicators .single-ribbon-mode { +.cropped-view.viewer .global-mode-indicators .cropped-view { color: gray; display: inline-block; } diff --git a/ui/ui.js b/ui/ui.js index 5e68fee1..0561ac15 100755 --- a/ui/ui.js +++ b/ui/ui.js @@ -97,10 +97,10 @@ function showCursor(elem){ function setupIndicators(){ showGlobalIndicator( - 'single-ribbon-mode', - 'Single ribbon mode (F3)') + 'cropped-view', + 'Cropped view (shift-F2/F3/C/F)') .css('cursor', 'hand') - .click(function(){ toggleSingleRibbonMode() }) + .click(function(){ uncropData() }) }