diff --git a/ui (gen4)/cfg/requirejs.js b/ui (gen4)/cfg/requirejs.js index 192ad605..c4df7df2 100644 --- a/ui (gen4)/cfg/requirejs.js +++ b/ui (gen4)/cfg/requirejs.js @@ -4,7 +4,7 @@ * **********************************************************************/ -var cfg = { +var requirejs_cfg = { // XXX this does not work on direct filesystem access... //urlArgs: 'bust='+Date.now(), @@ -37,17 +37,18 @@ var cfg = { if(typeof(require) != 'undefined'){ - cfg.nodeRequire = require - //cfg.baseUrl = __dirname + requirejs_cfg.nodeRequire = require + //requirejs_cfg.baseUrl = __dirname } +// XXX revise... if(typeof(require) != 'undefined' && typeof(global) != 'undefined'){ global.requirejs = global.requirejs || require('requirejs') } -requirejs.config(cfg) +requirejs.config(requirejs_cfg) diff --git a/ui (gen4)/features/core.js b/ui (gen4)/features/core.js index 16845009..a278f00d 100755 --- a/ui (gen4)/features/core.js +++ b/ui (gen4)/features/core.js @@ -375,6 +375,10 @@ var LifeCycleActions = actions.Actions({ nw.Window.get().on('close', this.__nw_stop_handler) + // electron... + } else if(runtime.electron){ + $(window).on('beforeunload', stop) + // node... } else if(runtime.node){ process.on('exit', stop)