minor refactoring + moved crop context keys to the crop context...

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

ui (gen4)/features/keyboard.js

@@ -64,12 +64,17 @@ module.GLOBAL_KEYBOARD = {
 		Esc: 'toggleSingleImage: "off" -- Exit single image view',
 	},
 
-	// XXX cropped -- needs a class to indicate a crop...
+	// XXX add "save as collection..."
 	'Cropped': {
-		// XXX make .crop(..) toggle the class...
 		pattern: '.crop-mode',
+
+		Esc: {
+			default: 'uncrop',
+			ctrl: 'uncropAll',
+		},
 	},
 
+	// XXX add "save as collection..." (???)
 	// XXX cleanup...
 	'Viewer': {
 		doc: 'NOTE: binding priority is the same as the order of sections '+
@@ -203,10 +208,6 @@ module.GLOBAL_KEYBOARD = {
 			ctrl: 'cropMarked',
 			alt: 'cropBookmarked',
 		},
-		Esc: {
-			default: 'uncrop',
-			ctrl: 'uncropAll',
-		},
 
 		// marking...
 		M: {

ui (gen4)/features/ui.js

@@ -758,14 +758,12 @@ module.Viewer = core.ImageGridFeatures.Feature({
 					delete this.__viewer_resize
 				}
 			}],
+		// manage the .crop-mode css class...
 		['crop uncrop',
 			function(){
-				if(this.cropped){
+				this.ribbons.viewer[this.cropped ? 
-					this.ribbons.viewer.addClass('crop-mode')
+						'addClass' 
-
+					: 'removeClass']('crop-mode')
-				} else {
-					this.ribbons.viewer.removeClass('crop-mode')
-				}
 			}],
 	],
 })