diff --git a/ui (gen4)/lib/widget/browse.js b/ui (gen4)/lib/widget/browse.js index 3fa64820..2a8b9731 100755 --- a/ui (gen4)/lib/widget/browse.js +++ b/ui (gen4)/lib/widget/browse.js @@ -20,7 +20,6 @@ console.log('>>> browse') var keyboard = require('../keyboard') -// XXX var object = require('../../object') var widget = require('./widget') @@ -578,7 +577,7 @@ var BrowserPrototype = { // NOTE: this will be set to true if make(..) is called at least once... var interactive = false - var make = function(p, traversable){ + var make = function(p, traversable, disabled){ p = p + '' var dir = /[\\\/]\s*$/ traversable = dir.test(p) && traversable == null ? true : traversable @@ -599,6 +598,9 @@ var BrowserPrototype = { if(!traversable){ res.addClass('not-traversable') } + if(disabled){ + res.addClass('disabled') + } return res } @@ -607,7 +609,7 @@ var BrowserPrototype = { // second API: make is not called and .list(..) returns an Array // that will get loaded as list items... - if(!interactive){ + if(!interactive && res){ res.forEach(make) } diff --git a/ui (gen4)/nw.js b/ui (gen4)/nw.js index a658ee78..2580afe3 100755 --- a/ui (gen4)/nw.js +++ b/ui (gen4)/nw.js @@ -15,10 +15,15 @@ var browser = require('browser') //var DEBUG = DEBUG != null ? DEBUG : true +var walk = require('lib/widget/browse-walk') + + /*********************************************************************/ //var data = require('data') +window.dirLister = walk.listDir + window.toggleFullscreenMode = module.toggleFullscreenMode = CSSClassToggler( document.body, diff --git a/ui (gen4)/object.js b/ui (gen4)/object.js index 42e664b1..4078dbd7 100755 --- a/ui (gen4)/object.js +++ b/ui (gen4)/object.js @@ -48,9 +48,9 @@ function makeConstructor(name, a, b){ // this is here to make Chrome output more user friendly... // skip for IE... - if(_constructor.name == 'Constructor' + if(_constructor.name == 'Constructor'){ // skip for chrome app... - && !(window.chrome && chrome.runtime && chrome.runtime.id)){ + //&& !(window.chrome && chrome.runtime && chrome.runtime.id)){ eval('_constructor = '+ _constructor .toString() .replace(/Constructor/g, name)) diff --git a/ui (gen4)/package.json b/ui (gen4)/package.json index 6258bfb5..3c342cb8 100755 --- a/ui (gen4)/package.json +++ b/ui (gen4)/package.json @@ -17,6 +17,7 @@ }, "dependencies": { "flickrapi": "^0.3.28", + "fs-walk": "0.0.1", "fs.extra": "^1.2.1", "glob": "^4.0.6", "guarantee-events": "^1.0.0", diff --git a/ui (gen4)/viewer.js b/ui (gen4)/viewer.js index 047a056e..ca3e1cb3 100755 --- a/ui (gen4)/viewer.js +++ b/ui (gen4)/viewer.js @@ -2349,6 +2349,37 @@ var ActionTreeActions = actions.Actions({ && parent.focus() }) }], + // XXX make this nw only... + pathListerTest: ['Interface/Path lister test (floating)...', + function(path){ + var parent = this.preventClosing ? this.preventClosing() : null + + // we got an argument and can exit... + if(path){ + console.log('PATH:', path) + return + } + + var that = this + + var o = overlay.Overlay($('body'), + require('./lib/widget/browse-walk').makeWalk(null, '/') + .open(function(evt, path){ + o.close() + + // close the parent ui... + parent + && parent.close + && parent.close() + + that.pathListerTest(path) + })) + .close(function(){ + parent + && parent.focus + && parent.focus() + }) + }], drawerTest:['Interface/Drawer widget test', function(){ drawer.Drawer($('body'),