removed legacy/stub code from crop.js...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>

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
-//
+function makeCropModeToggler(crop){
-// XXX add "exclusive" crop option -- prevent other crop modes to enter...
-function makeCropModeToggler(cls, crop){
 	var res = createCSSClassToggler(
 			'.viewer',
-			//cls + ' cropped-mode',
+			'.cropped-view',
-			cls,
-			/* XXX make this an option...
-			function(action){
-				// prevent mixing marked-only and single-ribbon modes...
-				if(action == 'on' 
-						&& isViewCropped()
-						&& res('?') != 'on'){
-					return false
-				}
-			},
-			*/
 			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(
+var toggleCurrenAndAboveRibbonMode = makeCurrenAndAboveModeToggler()
-		'current-and-above-ribbon-mode')
+var toggleCurrenAndAboveRibbonsMode = makeCurrenAndAboveModeToggler(true)
-var toggleCurrenAndAboveRibbonsMode = makeCurrenAndAboveModeToggler(
-		'current-and-above-ribbons-mode', true)
 
 
 

ui/keybindings.js

@@ -273,13 +273,12 @@ var KEYBOARD_CONFIG = {
 			'single ribbon crop view press <b>F3</b> and to open the crop '+
 			'dialog for more options press <b>C</b>.'+
 			'<p>NOTE: toggling crop views is only possible from ribbon view.',
-		pattern: '.single-ribbon-mode:not(.single-image-mode), '
+		pattern: '.cropped-view:not(.single-image-mode)',
-			+'.marked-only-view:not(.single-image-mode)',
 
 		Esc: {
 				default: doc('Uncrop to last state', 
 					function(){ 
-						uncropLastState()
+						uncropData()
 						return false
 					}),
 				shift: doc('Exit crop view', 

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;
 }

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;
 }

ui/ui.js

@@ -97,10 +97,10 @@ function showCursor(elem){
 
 function setupIndicators(){
 	showGlobalIndicator(
-			'single-ribbon-mode', 
+			'cropped-view', 
-			'Single ribbon mode (F3)')
+			'Cropped view (shift-F2/F3/C/F)')
 		.css('cursor', 'hand')
-		.click(function(){ toggleSingleRibbonMode() })
+		.click(function(){ uncropData() })
 }