From c88482a807113a04ef8f4c02d9bc97129016ce97 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Sat, 26 Dec 2015 01:12:39 +0300
Subject: [PATCH] more refactoring and tweaking...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui (gen4)/features/core.js | 10 +++++++
 ui (gen4)/features/meta.js |  2 ++
 ui (gen4)/features/ui.js   | 54 +++++++++++++++++++++++++++++++++++---
 ui (gen4)/ribbons.js       | 38 ++++++++++++++++++++++-----
 4 files changed, 95 insertions(+), 9 deletions(-)

diff --git a/ui (gen4)/features/core.js b/ui (gen4)/features/core.js
index 40911c79..6ce9c686 100755
--- a/ui (gen4)/features/core.js	
+++ b/ui (gen4)/features/core.js	
@@ -122,6 +122,16 @@ var LifeCycleActions = actions.Actions({
 
 			this.logger && this.logger.emit('stop')
 		}],
+
+	/*
+	// XXX need a clear protocol for this...
+	// 		something like:
+	// 			- clear state
+	// 			- load state
+	reset: ['System/',
+		function(){
+		}],
+	*/
 })
 
 var LifeCycle = 
diff --git a/ui (gen4)/features/meta.js b/ui (gen4)/features/meta.js
index d9db3500..534fdddc 100755
--- a/ui (gen4)/features/meta.js	
+++ b/ui (gen4)/features/meta.js	
@@ -30,6 +30,8 @@ core.ImageGridFeatures.Feature('viewer-testing', [
 	'base-full',
 	'ui',
 
+	'ui-ribbons-placement',
+
 	// features...
 	'ui-ribbon-auto-align',
 	//'ui-ribbon-align-to-order',
diff --git a/ui (gen4)/features/ui.js b/ui (gen4)/features/ui.js
index eb553427..f30d4fe0 100755
--- a/ui (gen4)/features/ui.js	
+++ b/ui (gen4)/features/ui.js	
@@ -749,9 +749,9 @@ module.Viewer = core.ImageGridFeatures.Feature({
 			}],
 		['stop', 
 			function(){
-				if(that.__viewer_resize){
-					$(window).off('resize', that.__viewer_resize) 
-					delete that.__viewer_resize
+				if(this.__viewer_resize){
+					$(window).off('resize', this.__viewer_resize) 
+					delete this.__viewer_resize
 				}
 			}],
 	],
@@ -2585,6 +2585,54 @@ module.AutoRibbon = core.ImageGridFeatures.Feature({
 
 //---------------------------------------------------------------------
 
+
+var RibbonsPlacement = 
+module.RibbonsPlacement = core.ImageGridFeatures.Feature({
+	title: '',
+	doc: '',
+
+	tag: 'ui-ribbons-placement',
+	depends: [ 'ui' ],
+
+	config: {
+		'ui-ribbons-placement-mode': 'legacy',
+	},
+
+	actions: actions.Actions({
+		toggleRibbonsPlacementMode: ['Interfcae/',
+			Toggler(null, function(_, state){ 
+					if(state == null){
+						return this.config['ui-ribbons-placement-mode']
+					}
+
+					this.config['ui-ribbons-placement-mode'] = state
+					if(state == 'legacy'){
+						this.ribbons.dom = ribbons.legacyDOMAdapter
+
+					} else {
+						this.ribbons.dom = ribbons.DOMAdapter
+					}
+
+					// NOTE: this will lose any state/configuration that
+					// 		was stored in ribbon dom...
+					this.ribbons.clear('full')
+					this.reload(true)
+				},
+				[
+					'legacy', 
+					'new',
+				])],
+	}),
+
+	handlers: [
+		['setup', 
+			function(){
+				this.toggleRibbonsPlacementMode(this.config['ui-ribbons-placement-mode'])
+			}],
+	]
+})
+
+
 // XXX add setup/taredown...
 var Clickable = 
 module.Clickable = core.ImageGridFeatures.Feature({
diff --git a/ui (gen4)/ribbons.js b/ui (gen4)/ribbons.js
index 1e47dbd9..8f758434 100755
--- a/ui (gen4)/ribbons.js	
+++ b/ui (gen4)/ribbons.js	
@@ -77,7 +77,8 @@ var RIBBON = '.ribbon:not(.clone)'
 //
 // XXX not sure if this is the right way to go...
 
-var legacyDOMAdapter = {
+var legacyDOMAdapter =
+module.legacyDOMAdapter = {
 	getOrigin: getElementOrigin,
 	// XXX this is not used here...
 	setOrigin: setElementOrigin, 
@@ -99,8 +100,24 @@ var legacyDOMAdapter = {
 // 		to reproduce:
 // 			- .focusImage('j')
 // 			- .toggleSingleImage('on')
-// 		the image disappears...
-var DOMAdapter = {
+// 		the image disappears... (wrong offset)
+// 		
+// 		also reproducable in ribbon mode...
+//
+//
+// 		appears to be connected to partial ribbon loading in single 
+// 		image mode -- current image gets reloaded for some reason...
+//
+// 		seems to be a problem with resizeRibbon compensating and syncicng
+// 		differently as above...
+// 		...the problem is that when the ribbon gets resized, the initial offset is wrong...
+//
+// 		the problem is present in both cases, but the timing is different
+// 		so it is easier to spot here...
+// 		...appears to be connected with translate+origin vs. left being 
+// 		used to aign ribbons...
+var DOMAdapter =
+module.DOMAdapter = {
 	getOrigin: function(elem){
 		var o = $(elem).origin() || [0, 0] 
 		return { left: o[0], top: o[1], }
@@ -291,8 +308,8 @@ var RibbonsPrototype = {
 	},
 
 	// DOM Adapter...
-	//dom: legacyDOMAdapter,
-	dom: DOMAdapter,
+	dom: legacyDOMAdapter,
+	//dom: DOMAdapter,
 	
 	// Constructors...
 	createViewer: RibbonsClassPrototype.createViewer,
@@ -1709,12 +1726,21 @@ var RibbonsPrototype = {
 	// 	.clear([gid, ...])
 	// 		-> Ribbons
 	//
+	// Clear ribbon-set -- full rest:
+	// 	.clear('full')
+	// 		-> Ribbons
+	// 		NOTE: this will lose any state stored in the ribbon set, this
+	// 			includes vertical align and scaling...
+	//
 	//
 	// NOTE: another way to remove a ribbon or an image just to use 
 	// 		.getRibbon(..).remove() and .getImage(...).remove() respectivly.
 	clear: function(gids){
+		if(gids == 'full'){
+			this.getRibbonSet().remove()
+
 		// clear all...
-		if(gids == null || gids == '*'){
+		} else if(gids == null || gids == '*'){
 			this.preventTransitions()
 			this.dom.setOffset(this.getRibbonSet(), 0, 0).children().detach()
 			this.restoreTransitions()