some cleanup and refactring...

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

ui (gen4)/features/filesystem.js

@@ -859,6 +859,9 @@ var FileSystemLoaderUIActions = actions.Actions({
 			disableFiles: true,
 			showNonTraversable: true,
 			showDisabled: true,
+
+			// XXX not sure about this...
+			actionButton: '📂',
 		},
 	},
 
@@ -868,20 +871,17 @@ var FileSystemLoaderUIActions = actions.Actions({
 	browsePath: ['File/Browse file system...',
 		widgets.makeUIDialog(function(base, callback){
 			var that = this
-			var cfg = this.config['file-browser-settings']
+
+			var cfg = Object.create(this.config['file-browser-settings'])
+			cfg.cls = 'file-browser'
 
 			base = base || this.location.path || '/'
 			base = util.normalizePath(base)
 
-			var o = browseWalk.makeWalk(
+			var o = browseWalk.makeWalk(null, 
-						null, base, this.config['image-file-pattern'],
+						base, 
-						{
+						this.config['image-file-pattern'],
-							cls: 'file-browser',
+						cfg)
-
-							disableFiles: cfg.disableFiles,
-							showNonTraversable: cfg.showNonTraversable,
-							showDisabled: cfg.showDisabled,
-						})
 					// path selected...
 					.open(function(evt, path){ 
 						var item = o.selected

ui (gen4)/features/ui-widgets.js

@@ -865,10 +865,22 @@ var BrowseActionsActions = actions.Actions({
 			var priority = /^(-?[0-9]+)\s*:\s*/
 			var dialog
 
+			// prepare the config...
+			var cfg = {
+				cls: 'browse-actions',
+
+				path: path,
+
+				flat: false,
+				traversable: true,
+				pathPrefix: '/',
+				fullPathEdit: true,
+			}
+			cfg.__proto__ = this.config['browse-actions-settings']
+
 			// get keys for each action...
 			var keys = this.getKeysForAction ? this.getKeysForAction('*') : {}
 			var modes = this.getKeyboardModes ? this.getKeyboardModes() : []
-
 			// Get keys for action...
 			var getKeys = function(action){
 				var k = keys[action] || {}
@@ -1172,19 +1184,8 @@ var BrowseActionsActions = actions.Actions({
 							}
 						})
 				}
-			}, {
+			},
-				cls: 'browse-actions',
+			 cfg)
-
-				path: path,
-
-				flat: false,
-				traversable: true,
-				pathPrefix: '/',
-				fullPathEdit: true,
-
-				showDisabled: actions.config['browse-actions-settings'].showDisabled,
-				showHidden: actions.config['browse-actions-settings'].showHidden,
-			})
 			// save show disabled state to .config...
 			.on('close', function(){
 				var config = actions.config['browse-actions-settings'] 

ui (gen4)/lib/widget/browse-walk.js

@@ -334,9 +334,7 @@ module.makeWalk = function(elem, path, fileCountPattern, rest){
 		WalkPrototype.options.fileCountPattern
 		: fileCountPattern
 
-	var w = Walk(elem, opts)
+	return Walk(elem, opts)
-
-	return w
 }
 
 

ui (gen4)/lib/widget/browse.js

@@ -1008,6 +1008,7 @@ var BrowserPrototype = {
 		// XXX revise signature... 
 		var make = function(p, traversable, disabled, buttons){
 			var hidden = false
+			var push_on_open = false
 
 			if(that.options.holdSize){
 				// we've started, no need to hold the size any more...