some refactoring...

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

ui/gallery-prototype.js

@@ -113,16 +113,35 @@ ImageGrid.TYPE('toggle', function(obj){
 })
 
 
+function showInOverlay(obj){
+	// clean things up...
+	$('.overlay').children().remove()
+	
+	
+	// put it in the overlay...
+	$('.overlay').append(obj)
+	
+	// prepare the overlay...
+	$('.overlay')
+		.one('click', function(){
+			$('.overlay')
+				.fadeOut()
+				.children()
+					.remove()
+		})
+		.fadeIn()
+	return obj
+}
+
+
 // XXX use order and priority of options...
+// XXX make history work for this...
 function showSetup(){
 	var opts = ImageGrid.option
 	var opt_ps = ImageGrid.option_props
 	var groups = {}
 
-	// clean things up...
-	$('.overlay').children().remove()
 	var opts_container = $('<div class="options"/>')
-		.appendTo($('.overlay'))
 	// build options...
 	for(var n in opt_ps){
 		var disabled = false
@@ -175,15 +194,8 @@ function showSetup(){
 		e.preventDefault()
 		return false
 	})
-	// prepare the overlay...
+
-	$('.overlay')
+	showInOverlay(opts_container)
-		.one('click', function(){
-			$('.overlay')
-				.fadeOut()
-				.children()
-					.remove()
-		})
-		.fadeIn()
 }
 
 

ui/keybindings.js

@@ -13,6 +13,8 @@ var keybindings = {
 	77:		toggleMarkers,									//	m
 
 
+	27:		function(){$('.overlay').click()},				//	Esc
+
 	// zooming...
 	187:	function(){scaleContainerBy(ImageGrid.option.ZOOM_FACTOR)},		//	+
 	189:	function(){scaleContainerBy(1/ImageGrid.option.ZOOM_FACTOR)},	//	-