some refactoring...

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

ui/base.js

@@ -406,51 +406,6 @@ function rollRibbon(n, ribbon, extend, no_compensate_shift){
 
 
 
-/**********************************************************************
-* Modes
-*/
-
-// XXX add ability to take all marked images and open them in a separate view...
-
-
-// XXX should we use the createCSSClassToggler for this?
-// XXX revise: does extra stuff...
-function toggleImageProportions(mode){
-	var image = $('.image')
-	var h = image.outerHeight(true)
-	var w = image.outerWidth(true)
-
-	if(mode == '?'){
-		return h != w ? 'viewer' : 'square'
-
-	// square...
-	} else if(h != w || mode == 'square'){
-		var size = Math.min(w, h)
-		image.css({
-			width: size,
-			height: size
-		})
-		centerView(null, 'css')
-		return 'square'
-
-	// viewer size...
-	} else {
-		var viewer = $('.viewer')
-		var W = viewer.innerWidth()
-		var H = viewer.innerHeight()
-
-		if(W > H){
-			image.css('width', W * h/H)
-		} else {
-			image.css('height', H * w/W)
-		}
-		centerView(null, 'css')
-		return 'viewer'
-	}
-}
-
-
-
 /**********************************************************************
 * Layout
 */

ui/index.html

@@ -314,7 +314,7 @@ body {
 // setup...
 $(function(){
 
-	toggleTheme('light')
+	toggleTheme('gray')
 
 	//setElementOrigin($('.ribbon-set'), 'top', 'left')
 

ui/marks.js

@@ -9,7 +9,7 @@
 
 
 /**********************************************************************
-* Modes
+* helpers...
 */
 
 function loadMarkedOnlyData(cmp){
@@ -42,7 +42,13 @@ function loadAllImages(){
 }
 
 
-var toggleMarkedOnlyView = createCSSClassToggler('.viewer', 'marked-only-view',
+
+/**********************************************************************
+* Modes
+*/
+
+var toggleMarkedOnlyView = createCSSClassToggler('.viewer', 
+		'marked-only-view',
 		function(action){
 			if(action == 'on'){
 				loadMarkedOnlyData()
@@ -52,9 +58,6 @@ var toggleMarkedOnlyView = createCSSClassToggler('.viewer', 'marked-only-view',
 		})
 
 
-
-
-
 // XXX shifting images and unmarking in this mode do not work correctly...
 var toggleMarkesView = createCSSClassToggler('.viewer', 'marks-visible',
 	function(){
@@ -84,8 +87,6 @@ var toggleMarkesView = createCSSClassToggler('.viewer', 'marks-visible',
 * Actions
 */
 
-// XXX if this unmarks an image in marked-only mode no visible image is 
-// 		going to be current...
 var toggleImageMark = createCSSClassToggler('.current.image', 'marked',
 	function(action){
 		toggleMarkesView('on')

ui/modes.js

@@ -26,12 +26,52 @@ var toggleSingleImageMode = createCSSClassToggler('.viewer',
 
 var toggleTheme = createCSSClassToggler('.viewer',
 		[
-			'dark',
 			'gray',
+			'dark',
 			'light'
 		])
 
 
+// NOTE: this confirmsto the css toggler protocol, but is not implemented 
+// 		via createCSSClassToggler as we do not need to set any classes,
+// 		al least at this point...
+// XXX should we use the createCSSClassToggler for this?
+// XXX revise: does extra stuff...
+function toggleImageProportions(mode){
+	var image = $('.image')
+	var h = image.outerHeight(true)
+	var w = image.outerWidth(true)
+
+	if(mode == '?'){
+		return h != w ? 'viewer' : 'square'
+
+	// square...
+	} else if(h != w || mode == 'square'){
+		var size = Math.min(w, h)
+		image.css({
+			width: size,
+			height: size
+		})
+		centerView(null, 'css')
+		return 'square'
+
+	// viewer size...
+	} else {
+		var viewer = $('.viewer')
+		var W = viewer.innerWidth()
+		var H = viewer.innerHeight()
+
+		if(W > H){
+			image.css('width', W * h/H)
+		} else {
+			image.css('height', H * w/W)
+		}
+		centerView(null, 'css')
+		return 'viewer'
+	}
+}
+
+
 
 /**********************************************************************
 * vim:set ts=4 sw=4 :                                                */