From 9a32d04c4c3ec5cdf4a1f75520f92717d84050ba Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Fri, 17 Aug 2012 06:56:54 +0400
Subject: [PATCH] some refactoring...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui/gallery-prototype.js | 36 ++++++++++++++++++++++++------------
 ui/keybindings.js       |  2 ++
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/ui/gallery-prototype.js b/ui/gallery-prototype.js
index d925196d..7648d269 100755
--- a/ui/gallery-prototype.js
+++ b/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')
-		.one('click', function(){
-			$('.overlay')
-				.fadeOut()
-				.children()
-					.remove()
-		})
-		.fadeIn()
+
+	showInOverlay(opts_container)
 }
 
 
diff --git a/ui/keybindings.js b/ui/keybindings.js
index c9ae8a57..bd253144 100755
--- a/ui/keybindings.js
+++ b/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)},	//	-