From ce000b261e6e77765ffd49bbc55358aea52a0239 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Wed, 15 Aug 2012 04:03:11 +0400
Subject: [PATCH] ...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui/fullscreen.html      |  2 +-
 ui/gallery-prototype.js | 60 ++++++++++++++++++++---------------------
 ui/gallery.html         | 10 +++----
 ui/keybindings.js       |  6 ++---
 4 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/ui/fullscreen.html b/ui/fullscreen.html
index dc40177e..9649902c 100755
--- a/ui/fullscreen.html
+++ b/ui/fullscreen.html
@@ -54,7 +54,7 @@ function setup(){
 
 	// XXX
 	ImageGrid.toggleSingleImageMode('off')
-	enableTransitions()
+	ImageGrid.toggleTransitions('on')
 
 	// setup event handlers...
 	setupEvents()
diff --git a/ui/gallery-prototype.js b/ui/gallery-prototype.js
index 19978d55..f9b10dbe 100755
--- a/ui/gallery-prototype.js
+++ b/ui/gallery-prototype.js
@@ -51,7 +51,7 @@ var ImageGrid = {
 
 ImageGrid.ACTION({
 	title: 'set',
-	doc: 'Set an option\'s value, calling apropriate callbacks.',
+	doc: 'Set option(s) value(s), calling apropriate callbacks.',
 	group: 'API',
 	call: function (obj){
 		for(var n in obj){
@@ -445,10 +445,11 @@ function setupControlElements(){
 	$('.screen-button.promote').click(shiftImageDown)
 	$('.screen-button.zoom-in').click(function(){scaleContainerBy(ImageGrid.option.ZOOM_FACTOR)})
 	$('.screen-button.zoom-out').click(function(){scaleContainerBy(1/ImageGrid.option.ZOOM_FACTOR)})
-	$('.screen-button.toggle-wide').click(ImageGrid.toggleWideView)
+	// XXX
+	$('.screen-button.toggle-wide').click(function(){scaleContainerBy(0.2)})
 	$('.screen-button.toggle-single').click(ImageGrid.toggleSingleImageMode)
 	$('.screen-button.fit-three').click(fitThreeImages)
-	$('.screen-button.show-controls').click(showControls)
+	$('.screen-button.show-controls').click(function(){ImageGrid.toggleControls('on')})
 	$('.screen-button.settings').click(function(){alert('not implemented yet...')})
 }
 
@@ -824,27 +825,6 @@ ImageGrid.ACTION({
 })
 
 
-// XXX is this worth it??
-ImageGrid.ACTION({
-	title: 'toggleWideView',
-	doc: 'Toggle wide view mode.',
-	group: 'Modes',
-	type: 'toggle',
-	call: createCSSClassToggler('.viewer', 'wide-view-mode',
-		// pre...
-		function(action){
-			if(action == 'on'){
-				ImageGrid.option.ORIGINAL_FIELD_SCALE = getElementScale($('.field'))
-				setContainerScale(0.1)
-			} else {
-				setContainerScale(ImageGrid.option.ORIGINAL_FIELD_SCALE)
-			}
-		}, 
-		// post...
-		function(){})
-})
-
-
 // XXX is this worth it??
 ImageGrid.ACTION({
 	title: 'toggleSingleRibbonMode',
@@ -932,17 +912,34 @@ function toggleBackgroundModes(){
 
 
 
-var toggleSingleImageModeTransitions = createCSSClassToggler('.viewer', 'no-single-image-transitions')
+//var toggleSingleImageModeTransitions = createCSSClassToggler('.viewer', 'no-single-image-transitions')
+ImageGrid.ACTION({
+	title: 'toggleSingleImageModeTransitions',
+	doc: 'Toggle transitions in single image mode.',
+	group: 'Modes',
+	type: 'toggle',
+	call: createCSSClassToggler('.viewer', 'no-single-image-transitions')
+})
 
 
-var toggleControls = createCSSClassToggler('.viewer', 'hidden-controls')
-var showControls = function(){toggleControls('on')}
-var hideControls = function(){toggleControls('off')}
+//var toggleControls = createCSSClassToggler('.viewer', 'hidden-controls')
+ImageGrid.ACTION({
+	title: 'toggleControls',
+	doc: 'Toggle UI controls.',
+	group: 'Modes',
+	type: 'toggle',
+	call: createCSSClassToggler('.viewer', 'hidden-controls')
+})
 
 
-var toggleTransitions = createCSSClassToggler('.viewer', 'transitions-enabled')
-var enableTransitions = function(){toggleTransitions('on')}
-var disableTransitions = function(){toggleTransitions('off')}
+//var toggleTransitions = createCSSClassToggler('.viewer', 'transitions-enabled')
+ImageGrid.ACTION({
+	title: 'toggleTransitions',
+	doc: 'Toggle global transitions.',
+	group: 'Modes',
+	type: 'toggle',
+	call: createCSSClassToggler('.viewer', 'transitions-enabled')
+})
 
 
 
@@ -1353,5 +1350,6 @@ function sortImagesByPath(){
 
 
 
+
 /*********************************************************************/
 // vim:set ts=4 sw=4 nowrap :
diff --git a/ui/gallery.html b/ui/gallery.html
index b22fd0d7..f18eb908 100755
--- a/ui/gallery.html
+++ b/ui/gallery.html
@@ -51,7 +51,7 @@ function setup(){
 	// XXX
 	// this will set the defaults...
 	ImageGrid.toggleSingleImageMode('off')
-	enableTransitions()
+	ImageGrid.toggleTransitions('on')
 
 	// setup event handlers...
 	setupEvents()
@@ -130,7 +130,7 @@ $(document).ready(setup);
 <div class="demo-buttons">
 	<button onclick="toggleMarkers()">Toggle Markers (m)</button>
 	<button onclick="toggleBackgroundModes()">toggle background modes (b)</button>
-	<button onclick="toggleControls()">toggle screen controls (tab)</button>
+	<button onclick="ImageGrid.toggleControls()">toggle screen controls (tab)</button>
 
 	<br><br>
 
@@ -139,7 +139,7 @@ $(document).ready(setup);
 
 	<br><br>
 
-	<button onclick="toggleSingleImageModeTransitions()">toggle single image mode transitions (t)</button>
+	<button onclick="ImageGrid.toggleSingleImageModeTransitions()">toggle single image mode transitions (t)</button>
 
 	<br><br>
 
@@ -171,10 +171,6 @@ $(document).ready(setup);
 
 	<br><br>
 
-	<button onclick="ImageGrid.toggleWideView()">toggle wide view</button>
-
-	<br><br>
-
 	<button onclick="createRibbon('prev')" disabled>create ribbon above (helper)</button><br>
 	<button onclick="createRibbonBelow('next')" disabled>create ribbon below (helper)</button>
 
diff --git a/ui/keybindings.js b/ui/keybindings.js
index 739b0de3..15946c31 100755
--- a/ui/keybindings.js
+++ b/ui/keybindings.js
@@ -6,10 +6,10 @@ var keybindings = {
 	70:		ImageGrid.toggleSingleImageMode,				//	f
 	83:		ImageGrid.toggleSingleRibbonMode,				//	s
 	13:		70,												//	Enter
-	84:		toggleSingleImageModeTransitions,				//	t
-	65:		toggleTransitions,								//	a
+	84:		ImageGrid.toggleSingleImageModeTransitions,		//	t
+	65:		ImageGrid.toggleTransitions,					//	a
+	9:		ImageGrid.toggleControls,						//	tab
 	66:		toggleBackgroundModes,							//	b
-	9:		toggleControls,									//	tab
 	77:		toggleMarkers,									//	m