From 435961d59652f5488d67830db1189cba6e7b4da8 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Mon, 17 Nov 2014 00:12:29 +0300
Subject: [PATCH] minor cleanup and tweaking...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui (gen4)/images.js    |  2 ++
 ui (gen4)/package.json |  1 +
 ui (gen4)/ribbons.js   |  6 ++++--
 ui (gen4)/testing.js   | 27 ++++++++++++++++++++-------
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/ui (gen4)/images.js b/ui (gen4)/images.js
index 594f912b..da058674 100755
--- a/ui (gen4)/images.js	
+++ b/ui (gen4)/images.js	
@@ -235,12 +235,14 @@ module.makeImageSeqOrNameCmp = function(data, get, seq){
 
 var ImagesClassPrototype =
 module.ImagesClassPrototype = {
+	// XXX populate the image doc better...
 	fromArray: function(data){
 		var images = new this()
 		// XXX stub...
 		var i = 0
 		data.forEach(function(path){
 			var gid = hash('I'+i)
+			// XXX populate the image doc better...
 			images[gid] = {
 				id: gid,
 				path: path,
diff --git a/ui (gen4)/package.json b/ui (gen4)/package.json
index 5ba19a16..14059df6 100755
--- a/ui (gen4)/package.json	
+++ b/ui (gen4)/package.json	
@@ -18,6 +18,7 @@
   "dependencies": {
     "fs.extra": "*",
     "glob": "^4.0.6",
+    "promise": "^6.0.1",
     "requirejs": "*"
   }
 }
diff --git a/ui (gen4)/ribbons.js b/ui (gen4)/ribbons.js
index fdd33092..0df4322c 100755
--- a/ui (gen4)/ribbons.js	
+++ b/ui (gen4)/ribbons.js	
@@ -270,7 +270,7 @@ module.RibbonsPrototype = {
 	// Get ribbon set scale...
 	//
 	getScale: function(){
-		return getElementScale(this.getRibbonSet())
+		return getElementScale(this.getRibbonSet()) || 1
 	},
 
 	// Set ribbon set scale...
@@ -1113,7 +1113,9 @@ module.RibbonsPrototype = {
 				return false
 			})
 		// remove everything in one go...
-		unloaded.detach()
+		unloaded
+			.detach()
+			.removeClass('moving')
 		unloaded = unloaded.toArray()
 
 		$(gids).each(function(i, gid){
diff --git a/ui (gen4)/testing.js b/ui (gen4)/testing.js
index c9303533..25f62f68 100755
--- a/ui (gen4)/testing.js	
+++ b/ui (gen4)/testing.js	
@@ -94,15 +94,28 @@ module.setupActions = function(viewer){
 }
 
 
-window.load2014 = function(){
-	return glob('l:/media/img/my/2014/*jpg')
-		.on('end', function(l){ window.a.loadURLs(l) })
-}
+/*********************************************************************/
+// node.js specific stuff...
+if(typeof(glob) != 'undefined'){
+
+	window.load2014 = function(){
+		return glob('l:/media/img/my/2014/*jpg')
+			.on('end', function(l){ window.a.loadURLs(l) })
+	}
 
 
-window.loadInsta = function(){
-	return glob('l:/mnt/Dropbox/Instagram/fav/ALL/*+(jpg|png)')
-		.on('end', function(l){ window.a.loadURLs(l) })
+	window.loadInsta = function(){
+		return glob('l:/mnt/Dropbox/Instagram/fav/ALL/*+(jpg|png)')
+			.on('end', function(l){ window.a.loadURLs(l) })
+	}
+
+
+	/*
+	window.loadSaved = function(){
+		a.data.loadJSON(require('fs').readFileSync('insta.json', 'utf-8'))
+	}
+	*/
+
 }