migrated to nw0.15.4

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2016-07-03 02:21:33 +03:00
parent f017c234b5
commit 1619c96a4c
9 changed files with 11 additions and 12 deletions

View File

@ -93,7 +93,7 @@ module.CLI = core.ImageGridFeatures.Feature({
], ],
isApplicable: function(){ isApplicable: function(){
return this.runtime == 'node' || this.runtime == 'nw' }, return this.runtime == 'node' /*|| this.runtime == 'nw'*/ },
actions: CLIActions, actions: CLIActions,

View File

@ -189,6 +189,7 @@ var LifeCycleActions = actions.Actions({
// other... // other...
} else { } else {
// XXX // XXX
console.warn('Unknown runtime:', runtime)
} }
}], }],
// unbind events... // unbind events...
@ -202,16 +203,14 @@ var LifeCycleActions = actions.Actions({
// nw... // nw...
if(this.__nw_stop_handler && this.runtime == '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 delete this.__nw_stop_handler
} }
// node... // node...
/* XXX there's no process.off(...)
if(this.__stop_handler && this.runtime == 'node'){ if(this.__stop_handler && this.runtime == 'node'){
process.off('exit', this.__stop_handler) process.removeAllListeners('exit')
} }
*/
delete this.__stop_handler delete this.__stop_handler

View File

@ -396,7 +396,7 @@ var KeyboardActions = actions.Actions({
this.__keyboard_handler = this.__keyboard_handler =
keyboard.makeKeyboardHandler( keyboard.makeKeyboardHandler(
function(){ return that.__keyboard_config }, function(){ return that.__keyboard_config },
function(k){ window.DEBUG && console.log(k) }, function(k){ window.DEBUG && console.log('KEY:', k) },
this) this)
// drop keys if repeating too fast... // drop keys if repeating too fast...

View File

@ -2227,7 +2227,7 @@ var DataPrototype = {
// split the data into three sections... // split the data into three sections...
var res = this.split(start, end) var res = this.split(start, end)
var rest = res.splice(1) var rest = res.shift()
// set the base ribbon on the middle section... // set the base ribbon on the middle section...
rest[0].setBase(0) rest[0].setBase(0)

View File

@ -230,6 +230,7 @@ var RibbonsClassPrototype = {
createViewer: function(){ createViewer: function(){
return $('<div>') return $('<div>')
.addClass('viewer') .addClass('viewer')
.attr('tabindex', 0)
//.append($('<div>') //.append($('<div>')
// .addClass('ribbon-set')) // .addClass('ribbon-set'))
}, },

View File

@ -88,7 +88,7 @@ if(window.require && window.nw){
<!--/div--> <!--/div-->
<div class="viewer gray marks-visible"></div> <div class="viewer gray marks-visible" tabindex="0"></div>
<!-- vim:set ts=4 sw=4 spell : --> <!-- vim:set ts=4 sw=4 spell : -->

View File

@ -104,9 +104,6 @@ function(images, sizes, base_path, target_tpl, callback){
return img.clone() return img.clone()
.resize(res, res) .resize(res, res)
.max() .max()
// XXX this causes odd image errors
// ...white pixels in random black areas...
//.interpolateWith('nohalo')
.withMetadata() .withMetadata()
.toFile(full) .toFile(full)
.then(function(){ .then(function(){

View File

@ -25,7 +25,7 @@
"guarantee-events": "^1.0.0", "guarantee-events": "^1.0.0",
"openseadragon": "^2.1.0", "openseadragon": "^2.1.0",
"requirejs": "^2.1.23", "requirejs": "^2.1.23",
"sharp": "^0.12.0" "sharp": "^0.15.0"
}, },
"optionalDependencies": { "optionalDependencies": {
"flickrapi": "^0.3.28" "flickrapi": "^0.3.28"

View File

@ -71,6 +71,8 @@ $(function(){
// XXX this is not for production... // XXX this is not for production...
'experiments', 'experiments',
//'-commandline',
// XXX BUG: disabling features on this level does not // XXX BUG: disabling features on this level does not
// work, yet works deeper down... // work, yet works deeper down...
// Example: // Example: