diff --git a/ui (gen4)/features/cli.js b/ui (gen4)/features/cli.js index 56853547..46534b0f 100755 --- a/ui (gen4)/features/cli.js +++ b/ui (gen4)/features/cli.js @@ -93,7 +93,7 @@ module.CLI = core.ImageGridFeatures.Feature({ ], isApplicable: function(){ - return this.runtime == 'node' || this.runtime == 'nw' }, + return this.runtime == 'node' /*|| this.runtime == 'nw'*/ }, actions: CLIActions, diff --git a/ui (gen4)/features/core.js b/ui (gen4)/features/core.js index 5736a8d5..c3b99615 100755 --- a/ui (gen4)/features/core.js +++ b/ui (gen4)/features/core.js @@ -189,6 +189,7 @@ var LifeCycleActions = actions.Actions({ // other... } else { // XXX + console.warn('Unknown runtime:', runtime) } }], // unbind events... @@ -202,16 +203,14 @@ var LifeCycleActions = actions.Actions({ // nw... if(this.__nw_stop_handler && this.runtime == 'nw'){ - //nw.Window.get().off('close', this.__nw_stop_handler) + nw.Window.get().removeAllListeners('close') delete this.__nw_stop_handler } // node... - /* XXX there's no process.off(...) if(this.__stop_handler && this.runtime == 'node'){ - process.off('exit', this.__stop_handler) + process.removeAllListeners('exit') } - */ delete this.__stop_handler diff --git a/ui (gen4)/features/keyboard.js b/ui (gen4)/features/keyboard.js index 63fc7110..47ae93eb 100755 --- a/ui (gen4)/features/keyboard.js +++ b/ui (gen4)/features/keyboard.js @@ -396,7 +396,7 @@ var KeyboardActions = actions.Actions({ this.__keyboard_handler = keyboard.makeKeyboardHandler( function(){ return that.__keyboard_config }, - function(k){ window.DEBUG && console.log(k) }, + function(k){ window.DEBUG && console.log('KEY:', k) }, this) // drop keys if repeating too fast... diff --git a/ui (gen4)/imagegrid/data.js b/ui (gen4)/imagegrid/data.js index 43c3cbee..9356892e 100755 --- a/ui (gen4)/imagegrid/data.js +++ b/ui (gen4)/imagegrid/data.js @@ -2227,7 +2227,7 @@ var DataPrototype = { // split the data into three sections... var res = this.split(start, end) - var rest = res.splice(1) + var rest = res.shift() // set the base ribbon on the middle section... rest[0].setBase(0) diff --git a/ui (gen4)/imagegrid/ribbons.js b/ui (gen4)/imagegrid/ribbons.js index 753b381c..9c9293b2 100755 --- a/ui (gen4)/imagegrid/ribbons.js +++ b/ui (gen4)/imagegrid/ribbons.js @@ -230,6 +230,7 @@ var RibbonsClassPrototype = { createViewer: function(){ return $('
') .addClass('viewer') + .attr('tabindex', 0) //.append($('
') // .addClass('ribbon-set')) }, diff --git a/ui (gen4)/index.html b/ui (gen4)/index.html index ed85ddac..81dde0f0 100755 --- a/ui (gen4)/index.html +++ b/ui (gen4)/index.html @@ -88,7 +88,7 @@ if(window.require && window.nw){ -
+
diff --git a/ui (gen4)/lib/preview.js b/ui (gen4)/lib/preview.js index 4e839c1a..97b9107d 100755 --- a/ui (gen4)/lib/preview.js +++ b/ui (gen4)/lib/preview.js @@ -104,9 +104,6 @@ function(images, sizes, base_path, target_tpl, callback){ return img.clone() .resize(res, res) .max() - // XXX this causes odd image errors - // ...white pixels in random black areas... - //.interpolateWith('nohalo') .withMetadata() .toFile(full) .then(function(){ diff --git a/ui (gen4)/package.json b/ui (gen4)/package.json index db916543..dcede913 100755 --- a/ui (gen4)/package.json +++ b/ui (gen4)/package.json @@ -25,7 +25,7 @@ "guarantee-events": "^1.0.0", "openseadragon": "^2.1.0", "requirejs": "^2.1.23", - "sharp": "^0.12.0" + "sharp": "^0.15.0" }, "optionalDependencies": { "flickrapi": "^0.3.28" diff --git a/ui (gen4)/ui.js b/ui (gen4)/ui.js index d832ffc0..3c623146 100755 --- a/ui (gen4)/ui.js +++ b/ui (gen4)/ui.js @@ -71,6 +71,8 @@ $(function(){ // XXX this is not for production... 'experiments', + //'-commandline', + // XXX BUG: disabling features on this level does not // work, yet works deeper down... // Example: