From ae43366f9f6be9792958b6a487863497b7c1900c Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Tue, 19 Apr 2016 19:55:11 +0300
Subject: [PATCH] fixed cli problem (hackish) and found a bug in
 core.ImageGridFeatures.buildFeatureList() (w.o. args)...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui (gen4)/features/all.js  |  3 ++-
 ui (gen4)/features/cli.js  | 13 +++++--------
 ui (gen4)/lib/transform.js |  4 ++++
 ui (gen4)/ribbons.js       |  4 ++++
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ui (gen4)/features/all.js b/ui (gen4)/features/all.js
index 09700605..da32c3fe 100755
--- a/ui (gen4)/features/all.js	
+++ b/ui (gen4)/features/all.js	
@@ -30,7 +30,8 @@ require('features/meta')
 require('features/experimental')
 require('features/demo')
 
-if(window.nodejs != null){
+// node features...
+if(typeof(window) == 'undefined' || window.nodejs != null){
 	require('features/filesystem')
 	require('features/cli')
 }
diff --git a/ui (gen4)/features/cli.js b/ui (gen4)/features/cli.js
index cac851e2..9d42a3a9 100755
--- a/ui (gen4)/features/cli.js	
+++ b/ui (gen4)/features/cli.js	
@@ -98,7 +98,11 @@ module.CLI = core.ImageGridFeatures.Feature({
 							that.features.features.length, 
 							that.features.features.join('\n    '))
 					})
+					// XXX make this applicable features...
 					.option('laf, --list-available-features', 'list available features', function(){
+						// XXX bug, this hangs....
+						//console.log(core.ImageGridFeatures.buildFeatureList())
+
 						var f = core.ImageGridFeatures.features
 						console.log('Features available (%d):\n   ',
 							f.length, 
@@ -121,14 +125,7 @@ module.CLI = core.ImageGridFeatures.Feature({
 					// 		and after setup...
 					.option('sm, --setup-minimal', 'setup minimal features', function(){
 						// load features we might need...
-						// XXX require js loads these at the root...
-						var location = require('features/location')
-						var history = require('features/history')
-						var app = require('features/app')
-						var marks = require('features/ui-marks')
-						var filesystem = require('features/filesystem')
-						var metadata = require('features/metadata')
-						var experimental = require('features/experimental')
+						var all = require('features/all')
 
 						// extend the current instance to a minimal non-ui
 						// state...
diff --git a/ui (gen4)/lib/transform.js b/ui (gen4)/lib/transform.js
index 3d680902..7f6c827c 100755
--- a/ui (gen4)/lib/transform.js	
+++ b/ui (gen4)/lib/transform.js	
@@ -6,6 +6,10 @@
 
 define(function(require){ var module = {}
 
+if(typeof(window) == 'undefined'){
+	return
+}
+
 //var DEBUG = DEBUG != null ? DEBUG : true
 
 var object = require('lib/object')
diff --git a/ui (gen4)/ribbons.js b/ui (gen4)/ribbons.js
index c974e69f..7323011b 100755
--- a/ui (gen4)/ribbons.js	
+++ b/ui (gen4)/ribbons.js	
@@ -7,6 +7,10 @@
 
 define(function(require){ var module = {}
 
+if(typeof(window) == 'undefined'){
+	return
+}
+
 //var DEBUG = DEBUG != null ? DEBUG : true
 
 // XXX is this correct...