Merge pull request #4909 from atom/standard
Use `standard` JavaScript Style
This commit is contained in:
commit
7023528042
115 changed files with 7877 additions and 7952 deletions
|
@ -28,7 +28,7 @@ possible with your report. If you can, please include:
|
|||
## Submitting Pull Requests
|
||||
|
||||
* Include screenshots and animated GIFs in your pull request whenever possible.
|
||||
* Follow the CoffeeScript, JavaScript, C++ and Python [coding style defined in docs](/docs/development/coding-style.md).
|
||||
* Follow the JavaScript, C++, and Python [coding style defined in docs](/docs/development/coding-style.md).
|
||||
* Write documentation in [Markdown](https://daringfireball.net/projects/markdown).
|
||||
See the [Documentation Styleguide](/docs/styleguide.md).
|
||||
* Use short, present tense commit messages. See [Commit Message Styleguide](#git-commit-messages).
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
const electron = require('electron');
|
||||
const app = electron.app;
|
||||
const BrowserWindow = electron.BrowserWindow;
|
||||
const electron = require('electron')
|
||||
const app = electron.app
|
||||
const BrowserWindow = electron.BrowserWindow
|
||||
|
||||
var mainWindow = null;
|
||||
var mainWindow = null
|
||||
|
||||
// Quit when all windows are closed.
|
||||
app.on('window-all-closed', function () {
|
||||
app.quit();
|
||||
});
|
||||
app.quit()
|
||||
})
|
||||
|
||||
exports.load = function (appUrl) {
|
||||
app.on('ready', function () {
|
||||
|
@ -15,9 +15,9 @@ exports.load = function(appUrl) {
|
|||
width: 800,
|
||||
height: 600,
|
||||
autoHideMenuBar: true,
|
||||
useContentSize: true,
|
||||
});
|
||||
mainWindow.loadURL(appUrl);
|
||||
mainWindow.focus();
|
||||
});
|
||||
};
|
||||
useContentSize: true
|
||||
})
|
||||
mainWindow.loadURL(appUrl)
|
||||
mainWindow.focus()
|
||||
})
|
||||
}
|
||||
|
|
|
@ -1,52 +1,52 @@
|
|||
const electron = require('electron');
|
||||
const app = electron.app;
|
||||
const dialog = electron.dialog;
|
||||
const shell = electron.shell;
|
||||
const Menu = electron.Menu;
|
||||
const electron = require('electron')
|
||||
const app = electron.app
|
||||
const dialog = electron.dialog
|
||||
const shell = electron.shell
|
||||
const Menu = electron.Menu
|
||||
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const repl = require('repl');
|
||||
const url = require('url');
|
||||
const fs = require('fs')
|
||||
const path = require('path')
|
||||
const repl = require('repl')
|
||||
const url = require('url')
|
||||
|
||||
// Parse command line options.
|
||||
var argv = process.argv.slice(1);
|
||||
var option = { file: null, help: null, version: null, webdriver: null, modules: [] };
|
||||
var argv = process.argv.slice(1)
|
||||
var option = { file: null, help: null, version: null, webdriver: null, modules: [] }
|
||||
for (var i = 0; i < argv.length; i++) {
|
||||
if (argv[i] == '--version' || argv[i] == '-v') {
|
||||
option.version = true;
|
||||
break;
|
||||
if (argv[i] === '--version' || argv[i] === '-v') {
|
||||
option.version = true
|
||||
break
|
||||
} else if (argv[i].match(/^--app=/)) {
|
||||
option.file = argv[i].split('=')[1];
|
||||
break;
|
||||
} else if (argv[i] == '--help' || argv[i] == '-h') {
|
||||
option.help = true;
|
||||
break;
|
||||
} else if (argv[i] == '--interactive' || argv[i] == '-i') {
|
||||
option.interactive = true;
|
||||
} else if (argv[i] == '--test-type=webdriver') {
|
||||
option.webdriver = true;
|
||||
} else if (argv[i] == '--require' || argv[i] == '-r') {
|
||||
option.modules.push(argv[++i]);
|
||||
continue;
|
||||
} else if (argv[i][0] == '-') {
|
||||
continue;
|
||||
option.file = argv[i].split('=')[1]
|
||||
break
|
||||
} else if (argv[i] === '--help' || argv[i] === '-h') {
|
||||
option.help = true
|
||||
break
|
||||
} else if (argv[i] === '--interactive' || argv[i] === '-i') {
|
||||
option.interactive = true
|
||||
} else if (argv[i] === '--test-type=webdriver') {
|
||||
option.webdriver = true
|
||||
} else if (argv[i] === '--require' || argv[i] === '-r') {
|
||||
option.modules.push(argv[++i])
|
||||
continue
|
||||
} else if (argv[i][0] === '-') {
|
||||
continue
|
||||
} else {
|
||||
option.file = argv[i];
|
||||
break;
|
||||
option.file = argv[i]
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
// Quit when all windows are closed and no other one is listening to this.
|
||||
app.on('window-all-closed', function () {
|
||||
if (app.listeners('window-all-closed').length == 1 && !option.interactive)
|
||||
app.quit();
|
||||
});
|
||||
if (app.listeners('window-all-closed').length === 1 && !option.interactive) {
|
||||
app.quit()
|
||||
}
|
||||
})
|
||||
|
||||
// Create default menu.
|
||||
app.once('ready', function () {
|
||||
if (Menu.getApplicationMenu())
|
||||
return;
|
||||
if (Menu.getApplicationMenu()) return
|
||||
|
||||
var template = [
|
||||
{
|
||||
|
@ -84,7 +84,7 @@ app.once('ready', function() {
|
|||
label: 'Select All',
|
||||
accelerator: 'CmdOrCtrl+A',
|
||||
role: 'selectall'
|
||||
},
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
|
@ -94,36 +94,27 @@ app.once('ready', function() {
|
|||
label: 'Reload',
|
||||
accelerator: 'CmdOrCtrl+R',
|
||||
click: function (item, focusedWindow) {
|
||||
if (focusedWindow)
|
||||
focusedWindow.reload();
|
||||
if (focusedWindow) focusedWindow.reload()
|
||||
}
|
||||
},
|
||||
{
|
||||
label: 'Toggle Full Screen',
|
||||
accelerator: (function () {
|
||||
if (process.platform == 'darwin')
|
||||
return 'Ctrl+Command+F';
|
||||
else
|
||||
return 'F11';
|
||||
return (process.platform === 'darwin') ? 'Ctrl+Command+F' : 'F11'
|
||||
})(),
|
||||
click: function (item, focusedWindow) {
|
||||
if (focusedWindow)
|
||||
focusedWindow.setFullScreen(!focusedWindow.isFullScreen());
|
||||
if (focusedWindow) focusedWindow.setFullScreen(!focusedWindow.isFullScreen())
|
||||
}
|
||||
},
|
||||
{
|
||||
label: 'Toggle Developer Tools',
|
||||
accelerator: (function () {
|
||||
if (process.platform == 'darwin')
|
||||
return 'Alt+Command+I';
|
||||
else
|
||||
return 'Ctrl+Shift+I';
|
||||
return (process.platform === 'darwin') ? 'Alt+Command+I' : 'Ctrl+Shift+I'
|
||||
})(),
|
||||
click: function (item, focusedWindow) {
|
||||
if (focusedWindow)
|
||||
focusedWindow.toggleDevTools();
|
||||
if (focusedWindow) focusedWindow.toggleDevTools()
|
||||
}
|
||||
}
|
||||
},
|
||||
]
|
||||
},
|
||||
{
|
||||
|
@ -139,7 +130,7 @@ app.once('ready', function() {
|
|||
label: 'Close',
|
||||
accelerator: 'CmdOrCtrl+W',
|
||||
role: 'close'
|
||||
},
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
|
@ -149,7 +140,7 @@ app.once('ready', function() {
|
|||
{
|
||||
label: 'Learn More',
|
||||
click: function () {
|
||||
shell.openExternal('http://electron.atom.io');
|
||||
shell.openExternal('http://electron.atom.io')
|
||||
}
|
||||
},
|
||||
{
|
||||
|
@ -157,26 +148,26 @@ app.once('ready', function() {
|
|||
click: function () {
|
||||
shell.openExternal(
|
||||
`https://github.com/atom/electron/tree/v${process.versions.electron}/docs#readme`
|
||||
);
|
||||
)
|
||||
}
|
||||
},
|
||||
{
|
||||
label: 'Community Discussions',
|
||||
click: function () {
|
||||
shell.openExternal('https://discuss.atom.io/c/electron');
|
||||
shell.openExternal('https://discuss.atom.io/c/electron')
|
||||
}
|
||||
},
|
||||
{
|
||||
label: 'Search Issues',
|
||||
click: function () {
|
||||
shell.openExternal('https://github.com/atom/electron/issues');
|
||||
shell.openExternal('https://github.com/atom/electron/issues')
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
];
|
||||
}
|
||||
]
|
||||
|
||||
if (process.platform == 'darwin') {
|
||||
if (process.platform === 'darwin') {
|
||||
template.unshift({
|
||||
label: 'Electron',
|
||||
submenu: [
|
||||
|
@ -215,10 +206,10 @@ app.once('ready', function() {
|
|||
{
|
||||
label: 'Quit',
|
||||
accelerator: 'Command+Q',
|
||||
click: function() { app.quit(); }
|
||||
},
|
||||
click: function () { app.quit() }
|
||||
}
|
||||
]
|
||||
});
|
||||
})
|
||||
template[3].submenu.push(
|
||||
{
|
||||
type: 'separator'
|
||||
|
@ -227,98 +218,107 @@ app.once('ready', function() {
|
|||
label: 'Bring All to Front',
|
||||
role: 'front'
|
||||
}
|
||||
);
|
||||
)
|
||||
}
|
||||
|
||||
var menu = Menu.buildFromTemplate(template);
|
||||
Menu.setApplicationMenu(menu);
|
||||
});
|
||||
var menu = Menu.buildFromTemplate(template)
|
||||
Menu.setApplicationMenu(menu)
|
||||
})
|
||||
|
||||
if (option.modules.length > 0) {
|
||||
require('module')._preloadModules(option.modules);
|
||||
require('module')._preloadModules(option.modules)
|
||||
}
|
||||
|
||||
function loadApplicationPackage (packagePath) {
|
||||
try {
|
||||
// Override app name and version.
|
||||
packagePath = path.resolve(packagePath);
|
||||
var packageJsonPath = path.join(packagePath, 'package.json');
|
||||
packagePath = path.resolve(packagePath)
|
||||
var packageJsonPath = path.join(packagePath, 'package.json')
|
||||
if (fs.existsSync(packageJsonPath)) {
|
||||
var packageJson = JSON.parse(fs.readFileSync(packageJsonPath));
|
||||
if (packageJson.version)
|
||||
app.setVersion(packageJson.version);
|
||||
if (packageJson.productName)
|
||||
app.setName(packageJson.productName);
|
||||
else if (packageJson.name)
|
||||
app.setName(packageJson.name);
|
||||
app.setPath('userData', path.join(app.getPath('appData'), app.getName()));
|
||||
app.setPath('userCache', path.join(app.getPath('cache'), app.getName()));
|
||||
app.setAppPath(packagePath);
|
||||
var packageJson = JSON.parse(fs.readFileSync(packageJsonPath))
|
||||
if (packageJson.version) app.setVersion(packageJson.version)
|
||||
|
||||
if (packageJson.productName) {
|
||||
app.setName(packageJson.productName)
|
||||
} else if (packageJson.name) {
|
||||
app.setName(packageJson.name)
|
||||
}
|
||||
|
||||
app.setPath('userData', path.join(app.getPath('appData'), app.getName()))
|
||||
app.setPath('userCache', path.join(app.getPath('cache'), app.getName()))
|
||||
app.setAppPath(packagePath)
|
||||
}
|
||||
|
||||
// Run the app.
|
||||
require('module')._load(packagePath, module, true);
|
||||
require('module')._load(packagePath, module, true)
|
||||
} catch (e) {
|
||||
if (e.code == 'MODULE_NOT_FOUND') {
|
||||
app.focus();
|
||||
if (e.code === 'MODULE_NOT_FOUND') {
|
||||
app.focus()
|
||||
dialog.showErrorBox(
|
||||
'Error opening app',
|
||||
'The app provided is not a valid Electron app, please read the docs on how to write one:\n' +
|
||||
`https://github.com/atom/electron/tree/v${process.versions.electron}/docs\n\n${e.toString()}`
|
||||
);
|
||||
process.exit(1);
|
||||
`https://github.com/atom/electron/tree/v${process.versions.electron}/docs
|
||||
|
||||
${e.toString()}`
|
||||
)
|
||||
process.exit(1)
|
||||
} else {
|
||||
console.error('App threw an error when running', e);
|
||||
throw e;
|
||||
console.error('App threw an error when running', e)
|
||||
throw e
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function loadApplicationByUrl (appUrl) {
|
||||
require('./default_app').load(appUrl);
|
||||
require('./default_app').load(appUrl)
|
||||
}
|
||||
|
||||
function startRepl () {
|
||||
repl.start('> ').on('exit', function () {
|
||||
process.exit(0);
|
||||
});
|
||||
process.exit(0)
|
||||
})
|
||||
}
|
||||
|
||||
// Start the specified app if there is one specified in command line, otherwise
|
||||
// start the default app.
|
||||
if (option.file && !option.webdriver) {
|
||||
var file = option.file;
|
||||
var protocol = url.parse(file).protocol;
|
||||
var extension = path.extname(file);
|
||||
var file = option.file
|
||||
var protocol = url.parse(file).protocol
|
||||
var extension = path.extname(file)
|
||||
if (protocol === 'http:' || protocol === 'https:' || protocol === 'file:') {
|
||||
loadApplicationByUrl(file);
|
||||
loadApplicationByUrl(file)
|
||||
} else if (extension === '.html' || extension === '.htm') {
|
||||
loadApplicationByUrl('file://' + path.resolve(file));
|
||||
loadApplicationByUrl('file://' + path.resolve(file))
|
||||
} else {
|
||||
loadApplicationPackage(file);
|
||||
loadApplicationPackage(file)
|
||||
}
|
||||
} else if (option.version) {
|
||||
console.log('v' + process.versions.electron);
|
||||
process.exit(0);
|
||||
console.log('v' + process.versions.electron)
|
||||
process.exit(0)
|
||||
} else if (option.help) {
|
||||
var helpMessage = "Electron v" + process.versions.electron + " - Cross Platform Desktop Application Shell\n\n";
|
||||
helpMessage += "Usage: electron [options] [path]\n\n";
|
||||
helpMessage += "A path to an Electron application may be specified.\n";
|
||||
helpMessage += "The path must be one of the following:\n\n";
|
||||
helpMessage += " - index.js file.\n";
|
||||
helpMessage += " - Folder containing a package.json file.\n";
|
||||
helpMessage += " - Folder containing an index.js file.\n";
|
||||
helpMessage += " - .html/.htm file.\n";
|
||||
helpMessage += " - http://, https://, or file:// URL.\n";
|
||||
helpMessage += "\nOptions:\n";
|
||||
helpMessage += " -h, --help Print this usage message.\n";
|
||||
helpMessage += " -i, --interactive Open a REPL to the main process.\n";
|
||||
helpMessage += " -r, --require Module to preload (option can be repeated)\n";
|
||||
helpMessage += " -v, --version Print the version.";
|
||||
console.log(helpMessage);
|
||||
process.exit(0);
|
||||
var helpMessage = `Electron v${process.versions.electron} - Cross Platform Desktop Application Shell
|
||||
|
||||
Usage: electron [options] [path]
|
||||
|
||||
A path to an Electron application may be specified.
|
||||
The path must be one of the following:
|
||||
|
||||
- index.js file.
|
||||
- Folder containing a package.json file.
|
||||
- Folder containing an index.js file.
|
||||
- .html/.htm file.
|
||||
- http://, https://, or file:// URL.
|
||||
|
||||
Options:
|
||||
-h, --help Print this usage message.
|
||||
-i, --interactive Open a REPL to the main process.
|
||||
-r, --require Module to preload (option can be repeated)
|
||||
-v, --version Print the version.`
|
||||
console.log(helpMessage)
|
||||
process.exit(0)
|
||||
} else if (option.interactive) {
|
||||
startRepl();
|
||||
startRepl()
|
||||
} else {
|
||||
loadApplicationByUrl('file://' + __dirname + '/index.html');
|
||||
var indexPath = path.join(__dirname, '/index.html')
|
||||
loadApplicationByUrl(`file://${indexPath}`)
|
||||
}
|
||||
|
|
|
@ -22,8 +22,7 @@ etc.
|
|||
|
||||
## JavaScript
|
||||
|
||||
* Use a two space indent, no hard tabs.
|
||||
* End lines with a `;`
|
||||
* Write [standard](http://npm.im/standard) JavaScript style.
|
||||
* Files should **NOT** end with new line, because we want to match Google's
|
||||
styles.
|
||||
* File names should be concatenated with `-` instead of `_`, e.g.
|
||||
|
|
|
@ -1,36 +1,36 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const deprecate = require('electron').deprecate;
|
||||
const session = require('electron').session;
|
||||
const Menu = require('electron').Menu;
|
||||
const EventEmitter = require('events').EventEmitter;
|
||||
const deprecate = require('electron').deprecate
|
||||
const session = require('electron').session
|
||||
const Menu = require('electron').Menu
|
||||
const EventEmitter = require('events').EventEmitter
|
||||
|
||||
const bindings = process.atomBinding('app');
|
||||
const downloadItemBindings = process.atomBinding('download_item');
|
||||
const app = bindings.app;
|
||||
const bindings = process.atomBinding('app')
|
||||
const downloadItemBindings = process.atomBinding('download_item')
|
||||
const app = bindings.app
|
||||
|
||||
app.__proto__ = EventEmitter.prototype;
|
||||
Object.setPrototypeOf(app, EventEmitter.prototype)
|
||||
|
||||
app.setApplicationMenu = function (menu) {
|
||||
return Menu.setApplicationMenu(menu);
|
||||
};
|
||||
return Menu.setApplicationMenu(menu)
|
||||
}
|
||||
|
||||
app.getApplicationMenu = function () {
|
||||
return Menu.getApplicationMenu();
|
||||
};
|
||||
return Menu.getApplicationMenu()
|
||||
}
|
||||
|
||||
app.commandLine = {
|
||||
appendSwitch: bindings.appendSwitch,
|
||||
appendArgument: bindings.appendArgument
|
||||
};
|
||||
}
|
||||
|
||||
if (process.platform === 'darwin') {
|
||||
app.dock = {
|
||||
bounce: function (type) {
|
||||
if (type == null) {
|
||||
type = 'informational';
|
||||
type = 'informational'
|
||||
}
|
||||
return bindings.dockBounce(type);
|
||||
return bindings.dockBounce(type)
|
||||
},
|
||||
cancelBounce: bindings.dockCancelBounce,
|
||||
setBadge: bindings.dockSetBadgeText,
|
||||
|
@ -39,81 +39,79 @@ if (process.platform === 'darwin') {
|
|||
show: bindings.dockShow,
|
||||
setMenu: bindings.dockSetMenu,
|
||||
setIcon: bindings.dockSetIcon
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
var appPath = null;
|
||||
var appPath = null
|
||||
|
||||
app.setAppPath = function (path) {
|
||||
return appPath = path;
|
||||
};
|
||||
appPath = path
|
||||
}
|
||||
|
||||
app.getAppPath = function () {
|
||||
return appPath;
|
||||
};
|
||||
return appPath
|
||||
}
|
||||
|
||||
// Routes the events to webContents.
|
||||
var ref1 = ['login', 'certificate-error', 'select-client-certificate'];
|
||||
var ref1 = ['login', 'certificate-error', 'select-client-certificate']
|
||||
var fn = function (name) {
|
||||
return app.on(name, function (event, webContents, ...args) {
|
||||
return webContents.emit.apply(webContents, [name, event].concat(args));
|
||||
});
|
||||
};
|
||||
var i, len;
|
||||
return webContents.emit.apply(webContents, [name, event].concat(args))
|
||||
})
|
||||
}
|
||||
var i, len
|
||||
for (i = 0, len = ref1.length; i < len; i++) {
|
||||
fn(ref1[i]);
|
||||
fn(ref1[i])
|
||||
}
|
||||
|
||||
// Deprecated.
|
||||
|
||||
app.getHomeDir = deprecate('app.getHomeDir', 'app.getPath', function () {
|
||||
return this.getPath('home');
|
||||
});
|
||||
return this.getPath('home')
|
||||
})
|
||||
|
||||
app.getDataPath = deprecate('app.getDataPath', 'app.getPath', function () {
|
||||
return this.getPath('userData');
|
||||
});
|
||||
return this.getPath('userData')
|
||||
})
|
||||
|
||||
app.setDataPath = deprecate('app.setDataPath', 'app.setPath', function (path) {
|
||||
return this.setPath('userData', path);
|
||||
});
|
||||
return this.setPath('userData', path)
|
||||
})
|
||||
|
||||
app.resolveProxy = deprecate('app.resolveProxy', 'session.defaultSession.resolveProxy', function (url, callback) {
|
||||
return session.defaultSession.resolveProxy(url, callback);
|
||||
});
|
||||
return session.defaultSession.resolveProxy(url, callback)
|
||||
})
|
||||
|
||||
deprecate.rename(app, 'terminate', 'quit');
|
||||
deprecate.rename(app, 'terminate', 'quit')
|
||||
|
||||
deprecate.event(app, 'finish-launching', 'ready', function () {
|
||||
|
||||
// give default app a chance to setup default menu.
|
||||
setImmediate(() => {
|
||||
this.emit('finish-launching');
|
||||
});
|
||||
});
|
||||
this.emit('finish-launching')
|
||||
})
|
||||
})
|
||||
|
||||
deprecate.event(app, 'activate-with-no-open-windows', 'activate', function (event, hasVisibleWindows) {
|
||||
if (!hasVisibleWindows) {
|
||||
return this.emit('activate-with-no-open-windows', event);
|
||||
return this.emit('activate-with-no-open-windows', event)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
deprecate.event(app, 'select-certificate', 'select-client-certificate');
|
||||
deprecate.event(app, 'select-certificate', 'select-client-certificate')
|
||||
|
||||
// Wrappers for native classes.
|
||||
var wrapDownloadItem = function (downloadItem) {
|
||||
|
||||
// downloadItem is an EventEmitter.
|
||||
downloadItem.__proto__ = EventEmitter.prototype;
|
||||
Object.setPrototypeOf(downloadItem, EventEmitter.prototype)
|
||||
|
||||
// Deprecated.
|
||||
deprecate.property(downloadItem, 'url', 'getURL');
|
||||
deprecate.property(downloadItem, 'filename', 'getFilename');
|
||||
deprecate.property(downloadItem, 'mimeType', 'getMimeType');
|
||||
return deprecate.rename(downloadItem, 'getUrl', 'getURL');
|
||||
};
|
||||
deprecate.property(downloadItem, 'url', 'getURL')
|
||||
deprecate.property(downloadItem, 'filename', 'getFilename')
|
||||
deprecate.property(downloadItem, 'mimeType', 'getMimeType')
|
||||
return deprecate.rename(downloadItem, 'getUrl', 'getURL')
|
||||
}
|
||||
|
||||
downloadItemBindings._setWrapDownloadItem(wrapDownloadItem);
|
||||
downloadItemBindings._setWrapDownloadItem(wrapDownloadItem)
|
||||
|
||||
// Only one App object pemitted.
|
||||
module.exports = app;
|
||||
module.exports = app
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
const deprecate = require('electron').deprecate;
|
||||
const autoUpdater = process.platform === 'win32' ? require('./auto-updater/auto-updater-win') : require('./auto-updater/auto-updater-native');
|
||||
const deprecate = require('electron').deprecate
|
||||
const autoUpdater = process.platform === 'win32' ? require('./auto-updater/auto-updater-win') : require('./auto-updater/auto-updater-native')
|
||||
|
||||
// Deprecated.
|
||||
deprecate.rename(autoUpdater, 'setFeedUrl', 'setFeedURL');
|
||||
deprecate.rename(autoUpdater, 'setFeedUrl', 'setFeedURL')
|
||||
|
||||
module.exports = autoUpdater;
|
||||
module.exports = autoUpdater
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
const EventEmitter = require('events').EventEmitter;
|
||||
const autoUpdater = process.atomBinding('auto_updater').autoUpdater;
|
||||
const EventEmitter = require('events').EventEmitter
|
||||
const autoUpdater = process.atomBinding('auto_updater').autoUpdater
|
||||
|
||||
autoUpdater.__proto__ = EventEmitter.prototype;
|
||||
Object.setPrototypeOf(autoUpdater, EventEmitter.prototype)
|
||||
|
||||
module.exports = autoUpdater;
|
||||
module.exports = autoUpdater
|
||||
|
|
|
@ -1,61 +1,62 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const app = require('electron').app;
|
||||
const EventEmitter = require('events').EventEmitter;
|
||||
const squirrelUpdate = require('./squirrel-update-win');
|
||||
const util = require('util');
|
||||
const app = require('electron').app
|
||||
const EventEmitter = require('events').EventEmitter
|
||||
const squirrelUpdate = require('./squirrel-update-win')
|
||||
const util = require('util')
|
||||
|
||||
function AutoUpdater () {
|
||||
EventEmitter.call(this);
|
||||
EventEmitter.call(this)
|
||||
}
|
||||
|
||||
util.inherits(AutoUpdater, EventEmitter);
|
||||
util.inherits(AutoUpdater, EventEmitter)
|
||||
|
||||
AutoUpdater.prototype.quitAndInstall = function () {
|
||||
squirrelUpdate.processStart();
|
||||
return app.quit();
|
||||
};
|
||||
squirrelUpdate.processStart()
|
||||
return app.quit()
|
||||
}
|
||||
|
||||
AutoUpdater.prototype.setFeedURL = function (updateURL) {
|
||||
return this.updateURL = updateURL;
|
||||
};
|
||||
this.updateURL = updateURL
|
||||
}
|
||||
|
||||
AutoUpdater.prototype.checkForUpdates = function () {
|
||||
if (!this.updateURL) {
|
||||
return this.emitError('Update URL is not set');
|
||||
return this.emitError('Update URL is not set')
|
||||
}
|
||||
if (!squirrelUpdate.supported()) {
|
||||
return this.emitError('Can not find Squirrel');
|
||||
return this.emitError('Can not find Squirrel')
|
||||
}
|
||||
this.emit('checking-for-update');
|
||||
this.emit('checking-for-update')
|
||||
squirrelUpdate.download(this.updateURL, (error, update) => {
|
||||
if (error != null) {
|
||||
return this.emitError(error);
|
||||
return this.emitError(error)
|
||||
}
|
||||
if (update == null) {
|
||||
return this.emit('update-not-available');
|
||||
return this.emit('update-not-available')
|
||||
}
|
||||
this.emit('update-available');
|
||||
this.emit('update-available')
|
||||
squirrelUpdate.update(this.updateURL, (error) => {
|
||||
var date, releaseNotes, version;
|
||||
var date, releaseNotes, version
|
||||
if (error != null) {
|
||||
return this.emitError(error);
|
||||
return this.emitError(error)
|
||||
}
|
||||
releaseNotes = update.releaseNotes, version = update.version;
|
||||
releaseNotes = update.releaseNotes
|
||||
version = update.version
|
||||
|
||||
// Following information is not available on Windows, so fake them.
|
||||
date = new Date;
|
||||
date = new Date()
|
||||
this.emit('update-downloaded', {}, releaseNotes, version, date, this.updateURL, () => {
|
||||
this.quitAndInstall();
|
||||
});
|
||||
});
|
||||
});
|
||||
};
|
||||
this.quitAndInstall()
|
||||
})
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
// Private: Emit both error object and message, this is to keep compatibility
|
||||
// with Old APIs.
|
||||
AutoUpdater.prototype.emitError = function (message) {
|
||||
return this.emit('error', new Error(message), message);
|
||||
};
|
||||
return this.emit('error', new Error(message), message)
|
||||
}
|
||||
|
||||
module.exports = new AutoUpdater;
|
||||
module.exports = new AutoUpdater()
|
||||
|
|
|
@ -1,98 +1,95 @@
|
|||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const spawn = require('child_process').spawn;
|
||||
const fs = require('fs')
|
||||
const path = require('path')
|
||||
const spawn = require('child_process').spawn
|
||||
|
||||
// i.e. my-app/app-0.1.13/
|
||||
const appFolder = path.dirname(process.execPath);
|
||||
const appFolder = path.dirname(process.execPath)
|
||||
|
||||
// i.e. my-app/Update.exe
|
||||
const updateExe = path.resolve(appFolder, '..', 'Update.exe');
|
||||
const updateExe = path.resolve(appFolder, '..', 'Update.exe')
|
||||
|
||||
const exeName = path.basename(process.execPath);
|
||||
const exeName = path.basename(process.execPath)
|
||||
|
||||
// Spawn a command and invoke the callback when it completes with an error
|
||||
// and the output from standard out.
|
||||
var spawnUpdate = function (args, detached, callback) {
|
||||
var error, errorEmitted, spawnedProcess, stderr, stdout;
|
||||
var error, errorEmitted, spawnedProcess, stderr, stdout
|
||||
try {
|
||||
spawnedProcess = spawn(updateExe, args, {
|
||||
detached: detached
|
||||
});
|
||||
})
|
||||
} catch (error1) {
|
||||
error = error1;
|
||||
error = error1
|
||||
|
||||
// Shouldn't happen, but still guard it.
|
||||
process.nextTick(function () {
|
||||
return callback(error);
|
||||
});
|
||||
return;
|
||||
return callback(error)
|
||||
})
|
||||
return
|
||||
}
|
||||
stdout = '';
|
||||
stderr = '';
|
||||
stdout = ''
|
||||
stderr = ''
|
||||
spawnedProcess.stdout.on('data', function (data) {
|
||||
return stdout += data;
|
||||
});
|
||||
stdout += data
|
||||
})
|
||||
spawnedProcess.stderr.on('data', function (data) {
|
||||
return stderr += data;
|
||||
});
|
||||
errorEmitted = false;
|
||||
stderr += data
|
||||
})
|
||||
errorEmitted = false
|
||||
spawnedProcess.on('error', function (error) {
|
||||
errorEmitted = true;
|
||||
return callback(error);
|
||||
});
|
||||
errorEmitted = true
|
||||
return callback(error)
|
||||
})
|
||||
return spawnedProcess.on('exit', function (code, signal) {
|
||||
|
||||
// We may have already emitted an error.
|
||||
if (errorEmitted) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
|
||||
// Process terminated with error.
|
||||
if (code !== 0) {
|
||||
return callback("Command failed: " + (signal != null ? signal : code) + "\n" + stderr);
|
||||
return callback('Command failed: ' + (signal != null ? signal : code) + '\n' + stderr)
|
||||
}
|
||||
|
||||
// Success.
|
||||
return callback(null, stdout);
|
||||
});
|
||||
};
|
||||
return callback(null, stdout)
|
||||
})
|
||||
}
|
||||
|
||||
// Start an instance of the installed app.
|
||||
exports.processStart = function () {
|
||||
return spawnUpdate(['--processStart', exeName], true, function() {});
|
||||
};
|
||||
return spawnUpdate(['--processStart', exeName], true, function () {})
|
||||
}
|
||||
|
||||
// Download the releases specified by the URL and write new results to stdout.
|
||||
exports.download = function (updateURL, callback) {
|
||||
return spawnUpdate(['--download', updateURL], false, function (error, stdout) {
|
||||
var json, ref, ref1, update;
|
||||
var json, ref, ref1, update
|
||||
if (error != null) {
|
||||
return callback(error);
|
||||
return callback(error)
|
||||
}
|
||||
try {
|
||||
// Last line of output is the JSON details about the releases
|
||||
json = stdout.trim().split('\n').pop();
|
||||
update = (ref = JSON.parse(json)) != null ? (ref1 = ref.releasesToApply) != null ? typeof ref1.pop === "function" ? ref1.pop() : void 0 : void 0 : void 0;
|
||||
json = stdout.trim().split('\n').pop()
|
||||
update = (ref = JSON.parse(json)) != null ? (ref1 = ref.releasesToApply) != null ? typeof ref1.pop === 'function' ? ref1.pop() : void 0 : void 0 : void 0
|
||||
} catch (jsonError) {
|
||||
return callback("Invalid result:\n" + stdout);
|
||||
return callback('Invalid result:\n' + stdout)
|
||||
}
|
||||
return callback(null, update)
|
||||
})
|
||||
}
|
||||
return callback(null, update);
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
// Update the application to the latest remote version specified by URL.
|
||||
exports.update = function (updateURL, callback) {
|
||||
return spawnUpdate(['--update', updateURL], false, callback);
|
||||
};
|
||||
|
||||
return spawnUpdate(['--update', updateURL], false, callback)
|
||||
}
|
||||
|
||||
// Is the Update.exe installed with the current application?
|
||||
exports.supported = function () {
|
||||
try {
|
||||
fs.accessSync(updateExe, fs.R_OK);
|
||||
return true;
|
||||
fs.accessSync(updateExe, fs.R_OK)
|
||||
return true
|
||||
} catch (error) {
|
||||
return false;
|
||||
return false
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
@ -1,65 +1,64 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const ipcMain = require('electron').ipcMain;
|
||||
const deprecate = require('electron').deprecate;
|
||||
const EventEmitter = require('events').EventEmitter;
|
||||
const {BrowserWindow, _setDeprecatedOptionsCheck} = process.atomBinding('window');
|
||||
const ipcMain = require('electron').ipcMain
|
||||
const deprecate = require('electron').deprecate
|
||||
const EventEmitter = require('events').EventEmitter
|
||||
const {BrowserWindow, _setDeprecatedOptionsCheck} = process.atomBinding('window')
|
||||
|
||||
BrowserWindow.prototype.__proto__ = EventEmitter.prototype;
|
||||
Object.setPrototypeOf(BrowserWindow.prototype, EventEmitter.prototype)
|
||||
|
||||
BrowserWindow.prototype._init = function () {
|
||||
// avoid recursive require.
|
||||
var app, menu;
|
||||
app = require('electron').app;
|
||||
var app, menu
|
||||
app = require('electron').app
|
||||
|
||||
// Simulate the application menu on platforms other than OS X.
|
||||
if (process.platform !== 'darwin') {
|
||||
menu = app.getApplicationMenu();
|
||||
menu = app.getApplicationMenu()
|
||||
if (menu != null) {
|
||||
this.setMenu(menu);
|
||||
this.setMenu(menu)
|
||||
}
|
||||
}
|
||||
|
||||
// Make new windows requested by links behave like "window.open"
|
||||
this.webContents.on('-new-window', (event, url, frameName) => {
|
||||
var options;
|
||||
var options
|
||||
options = {
|
||||
show: true,
|
||||
width: 800,
|
||||
height: 600
|
||||
};
|
||||
return ipcMain.emit('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_OPEN', event, url, frameName, options);
|
||||
});
|
||||
}
|
||||
return ipcMain.emit('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_OPEN', event, url, frameName, options)
|
||||
})
|
||||
|
||||
// window.resizeTo(...)
|
||||
// window.moveTo(...)
|
||||
this.webContents.on('move', (event, size) => {
|
||||
this.setBounds(size);
|
||||
});
|
||||
this.setBounds(size)
|
||||
})
|
||||
|
||||
// Hide the auto-hide menu when webContents is focused.
|
||||
this.webContents.on('activate', () => {
|
||||
if (process.platform !== 'darwin' && this.isMenuBarAutoHide() && this.isMenuBarVisible()) {
|
||||
this.setMenuBarVisibility(false);
|
||||
this.setMenuBarVisibility(false)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
// Forward the crashed event.
|
||||
this.webContents.on('crashed', () => {
|
||||
this.emit('crashed');
|
||||
});
|
||||
this.emit('crashed')
|
||||
})
|
||||
|
||||
// Change window title to page title.
|
||||
this.webContents.on('page-title-updated', (event, title) => {
|
||||
// The page-title-updated event is not emitted immediately (see #3645), so
|
||||
// when the callback is called the BrowserWindow might have been closed.
|
||||
if (this.isDestroyed())
|
||||
return;
|
||||
if (this.isDestroyed()) return
|
||||
|
||||
// Route the event to BrowserWindow.
|
||||
this.emit('page-title-updated', event, title);
|
||||
if (!event.defaultPrevented)
|
||||
this.setTitle(title);
|
||||
});
|
||||
this.emit('page-title-updated', event, title)
|
||||
if (!event.defaultPrevented) this.setTitle(title)
|
||||
})
|
||||
|
||||
// Sometimes the webContents doesn't get focus when window is shown, so we have
|
||||
// to force focusing on webContents in this case. The safest way is to focus it
|
||||
|
@ -68,227 +67,227 @@ BrowserWindow.prototype._init = function() {
|
|||
// Though this hack is only needed on OS X when the app is launched from
|
||||
// Finder, we still do it on all platforms in case of other bugs we don't know.
|
||||
this.webContents.once('load-url', function () {
|
||||
this.focus();
|
||||
});
|
||||
this.focus()
|
||||
})
|
||||
|
||||
// Redirect focus/blur event to app instance too.
|
||||
this.on('blur', (event) => {
|
||||
app.emit('browser-window-blur', event, this);
|
||||
});
|
||||
app.emit('browser-window-blur', event, this)
|
||||
})
|
||||
this.on('focus', (event) => {
|
||||
app.emit('browser-window-focus', event, this);
|
||||
});
|
||||
app.emit('browser-window-focus', event, this)
|
||||
})
|
||||
|
||||
// Evented visibilityState changes
|
||||
this.on('show', () => {
|
||||
this.webContents.send('ATOM_RENDERER_WINDOW_VISIBILITY_CHANGE', this.isVisible(), this.isMinimized());
|
||||
});
|
||||
this.webContents.send('ATOM_RENDERER_WINDOW_VISIBILITY_CHANGE', this.isVisible(), this.isMinimized())
|
||||
})
|
||||
this.on('hide', () => {
|
||||
this.webContents.send('ATOM_RENDERER_WINDOW_VISIBILITY_CHANGE', this.isVisible(), this.isMinimized());
|
||||
});
|
||||
this.webContents.send('ATOM_RENDERER_WINDOW_VISIBILITY_CHANGE', this.isVisible(), this.isMinimized())
|
||||
})
|
||||
this.on('minimize', () => {
|
||||
this.webContents.send('ATOM_RENDERER_WINDOW_VISIBILITY_CHANGE', this.isVisible(), this.isMinimized());
|
||||
});
|
||||
this.webContents.send('ATOM_RENDERER_WINDOW_VISIBILITY_CHANGE', this.isVisible(), this.isMinimized())
|
||||
})
|
||||
this.on('restore', () => {
|
||||
this.webContents.send('ATOM_RENDERER_WINDOW_VISIBILITY_CHANGE', this.isVisible(), this.isMinimized());
|
||||
});
|
||||
this.webContents.send('ATOM_RENDERER_WINDOW_VISIBILITY_CHANGE', this.isVisible(), this.isMinimized())
|
||||
})
|
||||
|
||||
// Notify the creation of the window.
|
||||
app.emit('browser-window-created', {}, this);
|
||||
app.emit('browser-window-created', {}, this)
|
||||
|
||||
// Be compatible with old APIs.
|
||||
this.webContents.on('devtools-focused', () => {
|
||||
this.emit('devtools-focused');
|
||||
});
|
||||
this.emit('devtools-focused')
|
||||
})
|
||||
this.webContents.on('devtools-opened', () => {
|
||||
this.emit('devtools-opened');
|
||||
});
|
||||
this.emit('devtools-opened')
|
||||
})
|
||||
this.webContents.on('devtools-closed', () => {
|
||||
this.emit('devtools-closed');
|
||||
});
|
||||
this.emit('devtools-closed')
|
||||
})
|
||||
Object.defineProperty(this, 'devToolsWebContents', {
|
||||
enumerable: true,
|
||||
configurable: false,
|
||||
get: function () {
|
||||
return this.webContents.devToolsWebContents;
|
||||
return this.webContents.devToolsWebContents
|
||||
}
|
||||
})
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
BrowserWindow.getFocusedWindow = function () {
|
||||
var i, len, window, windows;
|
||||
windows = BrowserWindow.getAllWindows();
|
||||
var i, len, window, windows
|
||||
windows = BrowserWindow.getAllWindows()
|
||||
for (i = 0, len = windows.length; i < len; i++) {
|
||||
window = windows[i];
|
||||
window = windows[i]
|
||||
if (window.isFocused()) {
|
||||
return window;
|
||||
return window
|
||||
}
|
||||
}
|
||||
return null;
|
||||
};
|
||||
return null
|
||||
}
|
||||
|
||||
BrowserWindow.fromWebContents = function (webContents) {
|
||||
var i, len, ref1, window, windows;
|
||||
windows = BrowserWindow.getAllWindows();
|
||||
var i, len, ref1, window, windows
|
||||
windows = BrowserWindow.getAllWindows()
|
||||
for (i = 0, len = windows.length; i < len; i++) {
|
||||
window = windows[i];
|
||||
window = windows[i]
|
||||
if ((ref1 = window.webContents) != null ? ref1.equal(webContents) : void 0) {
|
||||
return window;
|
||||
return window
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
BrowserWindow.fromDevToolsWebContents = function (webContents) {
|
||||
var i, len, ref1, window, windows;
|
||||
windows = BrowserWindow.getAllWindows();
|
||||
var i, len, ref1, window, windows
|
||||
windows = BrowserWindow.getAllWindows()
|
||||
for (i = 0, len = windows.length; i < len; i++) {
|
||||
window = windows[i];
|
||||
window = windows[i]
|
||||
if ((ref1 = window.devToolsWebContents) != null ? ref1.equal(webContents) : void 0) {
|
||||
return window;
|
||||
return window
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// Helpers.
|
||||
|
||||
BrowserWindow.prototype.loadURL = function () {
|
||||
return this.webContents.loadURL.apply(this.webContents, arguments);
|
||||
};
|
||||
return this.webContents.loadURL.apply(this.webContents, arguments)
|
||||
}
|
||||
|
||||
BrowserWindow.prototype.getURL = function () {
|
||||
return this.webContents.getURL();
|
||||
};
|
||||
return this.webContents.getURL()
|
||||
}
|
||||
|
||||
BrowserWindow.prototype.reload = function () {
|
||||
return this.webContents.reload.apply(this.webContents, arguments);
|
||||
};
|
||||
return this.webContents.reload.apply(this.webContents, arguments)
|
||||
}
|
||||
|
||||
BrowserWindow.prototype.send = function () {
|
||||
return this.webContents.send.apply(this.webContents, arguments);
|
||||
};
|
||||
return this.webContents.send.apply(this.webContents, arguments)
|
||||
}
|
||||
|
||||
BrowserWindow.prototype.openDevTools = function () {
|
||||
return this.webContents.openDevTools.apply(this.webContents, arguments);
|
||||
};
|
||||
return this.webContents.openDevTools.apply(this.webContents, arguments)
|
||||
}
|
||||
|
||||
BrowserWindow.prototype.closeDevTools = function () {
|
||||
return this.webContents.closeDevTools();
|
||||
};
|
||||
return this.webContents.closeDevTools()
|
||||
}
|
||||
|
||||
BrowserWindow.prototype.isDevToolsOpened = function () {
|
||||
return this.webContents.isDevToolsOpened();
|
||||
};
|
||||
return this.webContents.isDevToolsOpened()
|
||||
}
|
||||
|
||||
BrowserWindow.prototype.isDevToolsFocused = function () {
|
||||
return this.webContents.isDevToolsFocused();
|
||||
};
|
||||
return this.webContents.isDevToolsFocused()
|
||||
}
|
||||
|
||||
BrowserWindow.prototype.toggleDevTools = function () {
|
||||
return this.webContents.toggleDevTools();
|
||||
};
|
||||
return this.webContents.toggleDevTools()
|
||||
}
|
||||
|
||||
BrowserWindow.prototype.inspectElement = function () {
|
||||
return this.webContents.inspectElement.apply(this.webContents, arguments);
|
||||
};
|
||||
return this.webContents.inspectElement.apply(this.webContents, arguments)
|
||||
}
|
||||
|
||||
BrowserWindow.prototype.inspectServiceWorker = function () {
|
||||
return this.webContents.inspectServiceWorker();
|
||||
};
|
||||
return this.webContents.inspectServiceWorker()
|
||||
}
|
||||
|
||||
// Deprecated.
|
||||
|
||||
deprecate.member(BrowserWindow, 'undo', 'webContents');
|
||||
deprecate.member(BrowserWindow, 'undo', 'webContents')
|
||||
|
||||
deprecate.member(BrowserWindow, 'redo', 'webContents');
|
||||
deprecate.member(BrowserWindow, 'redo', 'webContents')
|
||||
|
||||
deprecate.member(BrowserWindow, 'cut', 'webContents');
|
||||
deprecate.member(BrowserWindow, 'cut', 'webContents')
|
||||
|
||||
deprecate.member(BrowserWindow, 'copy', 'webContents');
|
||||
deprecate.member(BrowserWindow, 'copy', 'webContents')
|
||||
|
||||
deprecate.member(BrowserWindow, 'paste', 'webContents');
|
||||
deprecate.member(BrowserWindow, 'paste', 'webContents')
|
||||
|
||||
deprecate.member(BrowserWindow, 'selectAll', 'webContents');
|
||||
deprecate.member(BrowserWindow, 'selectAll', 'webContents')
|
||||
|
||||
deprecate.member(BrowserWindow, 'reloadIgnoringCache', 'webContents');
|
||||
deprecate.member(BrowserWindow, 'reloadIgnoringCache', 'webContents')
|
||||
|
||||
deprecate.member(BrowserWindow, 'isLoading', 'webContents');
|
||||
deprecate.member(BrowserWindow, 'isLoading', 'webContents')
|
||||
|
||||
deprecate.member(BrowserWindow, 'isWaitingForResponse', 'webContents');
|
||||
deprecate.member(BrowserWindow, 'isWaitingForResponse', 'webContents')
|
||||
|
||||
deprecate.member(BrowserWindow, 'stop', 'webContents');
|
||||
deprecate.member(BrowserWindow, 'stop', 'webContents')
|
||||
|
||||
deprecate.member(BrowserWindow, 'isCrashed', 'webContents');
|
||||
deprecate.member(BrowserWindow, 'isCrashed', 'webContents')
|
||||
|
||||
deprecate.member(BrowserWindow, 'print', 'webContents');
|
||||
deprecate.member(BrowserWindow, 'print', 'webContents')
|
||||
|
||||
deprecate.member(BrowserWindow, 'printToPDF', 'webContents');
|
||||
deprecate.member(BrowserWindow, 'printToPDF', 'webContents')
|
||||
|
||||
deprecate.rename(BrowserWindow, 'restart', 'reload');
|
||||
deprecate.rename(BrowserWindow, 'restart', 'reload')
|
||||
|
||||
deprecate.rename(BrowserWindow, 'loadUrl', 'loadURL');
|
||||
deprecate.rename(BrowserWindow, 'loadUrl', 'loadURL')
|
||||
|
||||
deprecate.rename(BrowserWindow, 'getUrl', 'getURL');
|
||||
deprecate.rename(BrowserWindow, 'getUrl', 'getURL')
|
||||
|
||||
BrowserWindow.prototype.executeJavaScriptInDevTools = deprecate('executeJavaScriptInDevTools', 'devToolsWebContents.executeJavaScript', function (code) {
|
||||
var ref1;
|
||||
return (ref1 = this.devToolsWebContents) != null ? ref1.executeJavaScript(code) : void 0;
|
||||
});
|
||||
var ref1
|
||||
return (ref1 = this.devToolsWebContents) != null ? ref1.executeJavaScript(code) : void 0
|
||||
})
|
||||
|
||||
BrowserWindow.prototype.getPageTitle = deprecate('getPageTitle', 'webContents.getTitle', function () {
|
||||
var ref1;
|
||||
return (ref1 = this.webContents) != null ? ref1.getTitle() : void 0;
|
||||
});
|
||||
var ref1
|
||||
return (ref1 = this.webContents) != null ? ref1.getTitle() : void 0
|
||||
})
|
||||
|
||||
const isDeprecatedKey = function (key) {
|
||||
return key.indexOf('-') >= 0;
|
||||
};
|
||||
return key.indexOf('-') >= 0
|
||||
}
|
||||
|
||||
// Map deprecated key with hyphens to camel case key
|
||||
const getNonDeprecatedKey = function (deprecatedKey) {
|
||||
return deprecatedKey.replace(/-./g, function (match) {
|
||||
return match[1].toUpperCase();
|
||||
});
|
||||
};
|
||||
return match[1].toUpperCase()
|
||||
})
|
||||
}
|
||||
|
||||
// TODO Remove for 1.0
|
||||
const checkForDeprecatedOptions = function (options) {
|
||||
if (!options) return '';
|
||||
if (!options) return ''
|
||||
|
||||
let keysToCheck = Object.keys(options);
|
||||
let keysToCheck = Object.keys(options)
|
||||
if (options.webPreferences) {
|
||||
keysToCheck = keysToCheck.concat(Object.keys(options.webPreferences));
|
||||
keysToCheck = keysToCheck.concat(Object.keys(options.webPreferences))
|
||||
}
|
||||
|
||||
// Check options for keys with hyphens in them
|
||||
let deprecatedKey = keysToCheck.filter(isDeprecatedKey)[0];
|
||||
let deprecatedKey = keysToCheck.filter(isDeprecatedKey)[0]
|
||||
if (deprecatedKey) {
|
||||
try {
|
||||
deprecate.warn(deprecatedKey, getNonDeprecatedKey(deprecatedKey));
|
||||
deprecate.warn(deprecatedKey, getNonDeprecatedKey(deprecatedKey))
|
||||
} catch (error) {
|
||||
// Return error message so it can be rethrown via C++
|
||||
return error.message;
|
||||
return error.message
|
||||
}
|
||||
}
|
||||
|
||||
let webPreferenceOption;
|
||||
let webPreferenceOption
|
||||
if (options.hasOwnProperty('nodeIntegration')) {
|
||||
webPreferenceOption = 'nodeIntegration';
|
||||
webPreferenceOption = 'nodeIntegration'
|
||||
} else if (options.hasOwnProperty('preload')) {
|
||||
webPreferenceOption = 'preload';
|
||||
webPreferenceOption = 'preload'
|
||||
} else if (options.hasOwnProperty('zoomFactor')) {
|
||||
webPreferenceOption = 'zoomFactor';
|
||||
webPreferenceOption = 'zoomFactor'
|
||||
}
|
||||
if (webPreferenceOption) {
|
||||
try {
|
||||
deprecate.warn(`options.${webPreferenceOption}`, `options.webPreferences.${webPreferenceOption}`);
|
||||
deprecate.warn(`options.${webPreferenceOption}`, `options.webPreferences.${webPreferenceOption}`)
|
||||
} catch (error) {
|
||||
// Return error message so it can be rethrown via C++
|
||||
return error.message;
|
||||
return error.message
|
||||
}
|
||||
}
|
||||
|
||||
return '';
|
||||
};
|
||||
_setDeprecatedOptionsCheck(checkForDeprecatedOptions);
|
||||
return ''
|
||||
}
|
||||
_setDeprecatedOptionsCheck(checkForDeprecatedOptions)
|
||||
|
||||
module.exports = BrowserWindow;
|
||||
module.exports = BrowserWindow
|
||||
|
|
|
@ -1 +1 @@
|
|||
module.exports = process.atomBinding('content_tracing');
|
||||
module.exports = process.atomBinding('content_tracing')
|
||||
|
|
|
@ -1,183 +1,183 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const app = require('electron').app;
|
||||
const BrowserWindow = require('electron').BrowserWindow;
|
||||
const binding = process.atomBinding('dialog');
|
||||
const v8Util = process.atomBinding('v8_util');
|
||||
const app = require('electron').app
|
||||
const BrowserWindow = require('electron').BrowserWindow
|
||||
const binding = process.atomBinding('dialog')
|
||||
const v8Util = process.atomBinding('v8_util')
|
||||
|
||||
var includes = [].includes;
|
||||
var includes = [].includes
|
||||
|
||||
var fileDialogProperties = {
|
||||
openFile: 1 << 0,
|
||||
openDirectory: 1 << 1,
|
||||
multiSelections: 1 << 2,
|
||||
createDirectory: 1 << 3
|
||||
};
|
||||
}
|
||||
|
||||
var messageBoxTypes = ['none', 'info', 'warning', 'error', 'question'];
|
||||
var messageBoxTypes = ['none', 'info', 'warning', 'error', 'question']
|
||||
|
||||
var messageBoxOptions = {
|
||||
noLink: 1 << 0
|
||||
};
|
||||
}
|
||||
|
||||
var parseArgs = function (window, options, callback) {
|
||||
if (!(window === null || (window != null ? window.constructor : void 0) === BrowserWindow)) {
|
||||
// Shift.
|
||||
callback = options;
|
||||
options = window;
|
||||
window = null;
|
||||
callback = options
|
||||
options = window
|
||||
window = null
|
||||
}
|
||||
if ((callback == null) && typeof options === 'function') {
|
||||
// Shift.
|
||||
callback = options;
|
||||
options = null;
|
||||
callback = options
|
||||
options = null
|
||||
}
|
||||
return [window, options, callback]
|
||||
}
|
||||
return [window, options, callback];
|
||||
};
|
||||
|
||||
var checkAppInitialized = function () {
|
||||
if (!app.isReady()) {
|
||||
throw new Error('dialog module can only be used after app is ready');
|
||||
throw new Error('dialog module can only be used after app is ready')
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
module.exports = {
|
||||
showOpenDialog: function (...args) {
|
||||
var prop, properties, value, wrappedCallback;
|
||||
checkAppInitialized();
|
||||
let [window, options, callback] = parseArgs.apply(null, args);
|
||||
var prop, properties, value, wrappedCallback
|
||||
checkAppInitialized()
|
||||
let [window, options, callback] = parseArgs.apply(null, args)
|
||||
if (options == null) {
|
||||
options = {
|
||||
title: 'Open',
|
||||
properties: ['openFile']
|
||||
};
|
||||
}
|
||||
}
|
||||
if (options.properties == null) {
|
||||
options.properties = ['openFile'];
|
||||
options.properties = ['openFile']
|
||||
}
|
||||
if (!Array.isArray(options.properties)) {
|
||||
throw new TypeError('Properties must be an array');
|
||||
throw new TypeError('Properties must be an array')
|
||||
}
|
||||
properties = 0;
|
||||
properties = 0
|
||||
for (prop in fileDialogProperties) {
|
||||
value = fileDialogProperties[prop];
|
||||
value = fileDialogProperties[prop]
|
||||
if (includes.call(options.properties, prop)) {
|
||||
properties |= value;
|
||||
properties |= value
|
||||
}
|
||||
}
|
||||
if (options.title == null) {
|
||||
options.title = '';
|
||||
options.title = ''
|
||||
} else if (typeof options.title !== 'string') {
|
||||
throw new TypeError('Title must be a string');
|
||||
throw new TypeError('Title must be a string')
|
||||
}
|
||||
if (options.defaultPath == null) {
|
||||
options.defaultPath = '';
|
||||
options.defaultPath = ''
|
||||
} else if (typeof options.defaultPath !== 'string') {
|
||||
throw new TypeError('Default path must be a string');
|
||||
throw new TypeError('Default path must be a string')
|
||||
}
|
||||
if (options.filters == null) {
|
||||
options.filters = [];
|
||||
options.filters = []
|
||||
}
|
||||
wrappedCallback = typeof callback === 'function' ? function (success, result) {
|
||||
return callback(success ? result : void 0);
|
||||
} : null;
|
||||
return binding.showOpenDialog(String(options.title), String(options.defaultPath), options.filters, properties, window, wrappedCallback);
|
||||
return callback(success ? result : void 0)
|
||||
} : null
|
||||
return binding.showOpenDialog(String(options.title), String(options.defaultPath), options.filters, properties, window, wrappedCallback)
|
||||
},
|
||||
|
||||
showSaveDialog: function (...args) {
|
||||
var wrappedCallback;
|
||||
checkAppInitialized();
|
||||
let [window, options, callback] = parseArgs.apply(null, args);
|
||||
var wrappedCallback
|
||||
checkAppInitialized()
|
||||
let [window, options, callback] = parseArgs.apply(null, args)
|
||||
if (options == null) {
|
||||
options = {
|
||||
title: 'Save'
|
||||
};
|
||||
}
|
||||
}
|
||||
if (options.title == null) {
|
||||
options.title = '';
|
||||
options.title = ''
|
||||
} else if (typeof options.title !== 'string') {
|
||||
throw new TypeError('Title must be a string');
|
||||
throw new TypeError('Title must be a string')
|
||||
}
|
||||
if (options.defaultPath == null) {
|
||||
options.defaultPath = '';
|
||||
options.defaultPath = ''
|
||||
} else if (typeof options.defaultPath !== 'string') {
|
||||
throw new TypeError('Default path must be a string');
|
||||
throw new TypeError('Default path must be a string')
|
||||
}
|
||||
if (options.filters == null) {
|
||||
options.filters = [];
|
||||
options.filters = []
|
||||
}
|
||||
wrappedCallback = typeof callback === 'function' ? function (success, result) {
|
||||
return callback(success ? result : void 0);
|
||||
} : null;
|
||||
return binding.showSaveDialog(String(options.title), String(options.defaultPath), options.filters, window, wrappedCallback);
|
||||
return callback(success ? result : void 0)
|
||||
} : null
|
||||
return binding.showSaveDialog(String(options.title), String(options.defaultPath), options.filters, window, wrappedCallback)
|
||||
},
|
||||
|
||||
showMessageBox: function (...args) {
|
||||
var flags, i, j, len, messageBoxType, ref2, ref3, text;
|
||||
checkAppInitialized();
|
||||
let [window, options, callback] = parseArgs.apply(null, args);
|
||||
var flags, i, j, len, messageBoxType, ref2, ref3, text
|
||||
checkAppInitialized()
|
||||
let [window, options, callback] = parseArgs.apply(null, args)
|
||||
if (options == null) {
|
||||
options = {
|
||||
type: 'none'
|
||||
};
|
||||
}
|
||||
}
|
||||
if (options.type == null) {
|
||||
options.type = 'none';
|
||||
options.type = 'none'
|
||||
}
|
||||
messageBoxType = messageBoxTypes.indexOf(options.type);
|
||||
messageBoxType = messageBoxTypes.indexOf(options.type)
|
||||
if (!(messageBoxType > -1)) {
|
||||
throw new TypeError('Invalid message box type');
|
||||
throw new TypeError('Invalid message box type')
|
||||
}
|
||||
if (!Array.isArray(options.buttons)) {
|
||||
throw new TypeError('Buttons must be an array');
|
||||
throw new TypeError('Buttons must be an array')
|
||||
}
|
||||
if (options.title == null) {
|
||||
options.title = '';
|
||||
options.title = ''
|
||||
} else if (typeof options.title !== 'string') {
|
||||
throw new TypeError('Title must be a string');
|
||||
throw new TypeError('Title must be a string')
|
||||
}
|
||||
if (options.message == null) {
|
||||
options.message = '';
|
||||
options.message = ''
|
||||
} else if (typeof options.message !== 'string') {
|
||||
throw new TypeError('Message must be a string');
|
||||
throw new TypeError('Message must be a string')
|
||||
}
|
||||
if (options.detail == null) {
|
||||
options.detail = '';
|
||||
options.detail = ''
|
||||
} else if (typeof options.detail !== 'string') {
|
||||
throw new TypeError('Detail must be a string');
|
||||
throw new TypeError('Detail must be a string')
|
||||
}
|
||||
if (options.icon == null) {
|
||||
options.icon = null;
|
||||
options.icon = null
|
||||
}
|
||||
if (options.defaultId == null) {
|
||||
options.defaultId = -1;
|
||||
options.defaultId = -1
|
||||
}
|
||||
|
||||
// Choose a default button to get selected when dialog is cancelled.
|
||||
if (options.cancelId == null) {
|
||||
options.cancelId = 0;
|
||||
ref2 = options.buttons;
|
||||
options.cancelId = 0
|
||||
ref2 = options.buttons
|
||||
for (i = j = 0, len = ref2.length; j < len; i = ++j) {
|
||||
text = ref2[i];
|
||||
text = ref2[i]
|
||||
if ((ref3 = text.toLowerCase()) === 'cancel' || ref3 === 'no') {
|
||||
options.cancelId = i;
|
||||
break;
|
||||
options.cancelId = i
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
flags = options.noLink ? messageBoxOptions.noLink : 0;
|
||||
return binding.showMessageBox(messageBoxType, options.buttons, options.defaultId, options.cancelId, flags, options.title, options.message, options.detail, options.icon, window, callback);
|
||||
flags = options.noLink ? messageBoxOptions.noLink : 0
|
||||
return binding.showMessageBox(messageBoxType, options.buttons, options.defaultId, options.cancelId, flags, options.title, options.message, options.detail, options.icon, window, callback)
|
||||
},
|
||||
|
||||
showErrorBox: function (...args) {
|
||||
return binding.showErrorBox.apply(binding, args);
|
||||
return binding.showErrorBox.apply(binding, args)
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// Mark standard asynchronous functions.
|
||||
var ref1 = ['showMessageBox', 'showOpenDialog', 'showSaveDialog'];
|
||||
var j, len, api;
|
||||
var ref1 = ['showMessageBox', 'showOpenDialog', 'showSaveDialog']
|
||||
var j, len, api
|
||||
for (j = 0, len = ref1.length; j < len; j++) {
|
||||
api = ref1[j];
|
||||
v8Util.setHiddenValue(module.exports[api], 'asynchronous', true);
|
||||
api = ref1[j]
|
||||
v8Util.setHiddenValue(module.exports[api], 'asynchronous', true)
|
||||
}
|
||||
|
|
|
@ -1,112 +1,110 @@
|
|||
const common = require('../../../common/api/exports/electron');
|
||||
|
||||
const common = require('../../../common/api/exports/electron')
|
||||
|
||||
// Import common modules.
|
||||
common.defineProperties(exports);
|
||||
common.defineProperties(exports)
|
||||
|
||||
Object.defineProperties(exports, {
|
||||
|
||||
// Browser side modules, please sort with alphabet order.
|
||||
app: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../app');
|
||||
return require('../app')
|
||||
}
|
||||
},
|
||||
autoUpdater: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../auto-updater');
|
||||
return require('../auto-updater')
|
||||
}
|
||||
},
|
||||
BrowserWindow: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../browser-window');
|
||||
return require('../browser-window')
|
||||
}
|
||||
},
|
||||
contentTracing: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../content-tracing');
|
||||
return require('../content-tracing')
|
||||
}
|
||||
},
|
||||
dialog: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../dialog');
|
||||
return require('../dialog')
|
||||
}
|
||||
},
|
||||
ipcMain: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../ipc-main');
|
||||
return require('../ipc-main')
|
||||
}
|
||||
},
|
||||
globalShortcut: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../global-shortcut');
|
||||
return require('../global-shortcut')
|
||||
}
|
||||
},
|
||||
Menu: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../menu');
|
||||
return require('../menu')
|
||||
}
|
||||
},
|
||||
MenuItem: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../menu-item');
|
||||
return require('../menu-item')
|
||||
}
|
||||
},
|
||||
powerMonitor: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../power-monitor');
|
||||
return require('../power-monitor')
|
||||
}
|
||||
},
|
||||
powerSaveBlocker: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../power-save-blocker');
|
||||
return require('../power-save-blocker')
|
||||
}
|
||||
},
|
||||
protocol: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../protocol');
|
||||
return require('../protocol')
|
||||
}
|
||||
},
|
||||
screen: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../screen');
|
||||
return require('../screen')
|
||||
}
|
||||
},
|
||||
session: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../session');
|
||||
return require('../session')
|
||||
}
|
||||
},
|
||||
Tray: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../tray');
|
||||
return require('../tray')
|
||||
}
|
||||
},
|
||||
|
||||
// The internal modules, invisible unless you know their names.
|
||||
NavigationController: {
|
||||
get: function () {
|
||||
return require('../navigation-controller');
|
||||
return require('../navigation-controller')
|
||||
}
|
||||
},
|
||||
webContents: {
|
||||
get: function () {
|
||||
return require('../web-contents');
|
||||
return require('../web-contents')
|
||||
}
|
||||
}
|
||||
});
|
||||
})
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
var globalShortcut;
|
||||
var globalShortcut
|
||||
|
||||
globalShortcut = process.atomBinding('global_shortcut').globalShortcut;
|
||||
globalShortcut = process.atomBinding('global_shortcut').globalShortcut
|
||||
|
||||
module.exports = globalShortcut;
|
||||
module.exports = globalShortcut
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
const EventEmitter = require('events').EventEmitter;
|
||||
const EventEmitter = require('events').EventEmitter
|
||||
|
||||
module.exports = new EventEmitter;
|
||||
module.exports = new EventEmitter()
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
const deprecate = require('electron').deprecate;
|
||||
const ipcMain = require('electron').ipcMain;
|
||||
const deprecate = require('electron').deprecate
|
||||
const ipcMain = require('electron').ipcMain
|
||||
|
||||
// This module is deprecated, we mirror everything from ipcMain.
|
||||
deprecate.warn('ipc module', 'require("electron").ipcMain');
|
||||
deprecate.warn('ipc module', 'require("electron").ipcMain')
|
||||
|
||||
module.exports = ipcMain;
|
||||
module.exports = ipcMain
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
var MenuItem, methodInBrowserWindow, nextCommandId, rolesMap;
|
||||
var MenuItem, methodInBrowserWindow, nextCommandId, rolesMap
|
||||
|
||||
nextCommandId = 0;
|
||||
nextCommandId = 0
|
||||
|
||||
// Maps role to methods of webContents
|
||||
rolesMap = {
|
||||
|
@ -15,88 +15,98 @@ rolesMap = {
|
|||
minimize: 'minimize',
|
||||
close: 'close',
|
||||
delete: 'delete'
|
||||
};
|
||||
}
|
||||
|
||||
// Maps methods that should be called directly on the BrowserWindow instance
|
||||
methodInBrowserWindow = {
|
||||
minimize: true,
|
||||
close: true
|
||||
};
|
||||
}
|
||||
|
||||
MenuItem = (function () {
|
||||
MenuItem.types = ['normal', 'separator', 'submenu', 'checkbox', 'radio'];
|
||||
MenuItem.types = ['normal', 'separator', 'submenu', 'checkbox', 'radio']
|
||||
|
||||
function MenuItem (options) {
|
||||
var click, ref;
|
||||
const Menu = require('electron').Menu;
|
||||
click = options.click, this.selector = options.selector, this.type = options.type, this.role = options.role, this.label = options.label, this.sublabel = options.sublabel, this.accelerator = options.accelerator, this.icon = options.icon, this.enabled = options.enabled, this.visible = options.visible, this.checked = options.checked, this.submenu = options.submenu;
|
||||
var click, ref
|
||||
const Menu = require('electron').Menu
|
||||
click = options.click
|
||||
this.selector = options.selector
|
||||
this.type = options.type
|
||||
this.role = options.role
|
||||
this.label = options.label
|
||||
this.sublabel = options.sublabel
|
||||
this.accelerator = options.accelerator
|
||||
this.icon = options.icon
|
||||
this.enabled = options.enabled
|
||||
this.visible = options.visible
|
||||
this.checked = options.checked
|
||||
this.submenu = options.submenu
|
||||
if ((this.submenu != null) && this.submenu.constructor !== Menu) {
|
||||
this.submenu = Menu.buildFromTemplate(this.submenu);
|
||||
this.submenu = Menu.buildFromTemplate(this.submenu)
|
||||
}
|
||||
if ((this.type == null) && (this.submenu != null)) {
|
||||
this.type = 'submenu';
|
||||
this.type = 'submenu'
|
||||
}
|
||||
if (this.type === 'submenu' && ((ref = this.submenu) != null ? ref.constructor : void 0) !== Menu) {
|
||||
throw new Error('Invalid submenu');
|
||||
throw new Error('Invalid submenu')
|
||||
}
|
||||
this.overrideReadOnlyProperty('type', 'normal');
|
||||
this.overrideReadOnlyProperty('role');
|
||||
this.overrideReadOnlyProperty('accelerator');
|
||||
this.overrideReadOnlyProperty('icon');
|
||||
this.overrideReadOnlyProperty('submenu');
|
||||
this.overrideProperty('label', '');
|
||||
this.overrideProperty('sublabel', '');
|
||||
this.overrideProperty('enabled', true);
|
||||
this.overrideProperty('visible', true);
|
||||
this.overrideProperty('checked', false);
|
||||
this.overrideReadOnlyProperty('type', 'normal')
|
||||
this.overrideReadOnlyProperty('role')
|
||||
this.overrideReadOnlyProperty('accelerator')
|
||||
this.overrideReadOnlyProperty('icon')
|
||||
this.overrideReadOnlyProperty('submenu')
|
||||
this.overrideProperty('label', '')
|
||||
this.overrideProperty('sublabel', '')
|
||||
this.overrideProperty('enabled', true)
|
||||
this.overrideProperty('visible', true)
|
||||
this.overrideProperty('checked', false)
|
||||
if (MenuItem.types.indexOf(this.type) === -1) {
|
||||
throw new Error("Unknown menu type " + this.type);
|
||||
throw new Error('Unknown menu type ' + this.type)
|
||||
}
|
||||
this.commandId = ++nextCommandId;
|
||||
this.commandId = ++nextCommandId
|
||||
this.click = (focusedWindow) => {
|
||||
// Manually flip the checked flags when clicked.
|
||||
var methodName, ref1, ref2;
|
||||
var methodName, ref1, ref2
|
||||
if ((ref1 = this.type) === 'checkbox' || ref1 === 'radio') {
|
||||
this.checked = !this.checked;
|
||||
this.checked = !this.checked
|
||||
}
|
||||
if (this.role && rolesMap[this.role] && process.platform !== 'darwin' && (focusedWindow != null)) {
|
||||
methodName = rolesMap[this.role];
|
||||
methodName = rolesMap[this.role]
|
||||
if (methodInBrowserWindow[methodName]) {
|
||||
return focusedWindow[methodName]();
|
||||
return focusedWindow[methodName]()
|
||||
} else {
|
||||
return (ref2 = focusedWindow.webContents) != null ? ref2[methodName]() : void 0;
|
||||
return (ref2 = focusedWindow.webContents) != null ? ref2[methodName]() : void 0
|
||||
}
|
||||
} else if (typeof click === 'function') {
|
||||
return click(this, focusedWindow);
|
||||
return click(this, focusedWindow)
|
||||
} else if (typeof this.selector === 'string' && process.platform === 'darwin') {
|
||||
return Menu.sendActionToFirstResponder(this.selector);
|
||||
return Menu.sendActionToFirstResponder(this.selector)
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
MenuItem.prototype.overrideProperty = function (name, defaultValue) {
|
||||
if (defaultValue == null) {
|
||||
defaultValue = null;
|
||||
defaultValue = null
|
||||
}
|
||||
return this[name] != null ? this[name] : this[name] = defaultValue
|
||||
}
|
||||
return this[name] != null ? this[name] : this[name] = defaultValue;
|
||||
};
|
||||
|
||||
MenuItem.prototype.overrideReadOnlyProperty = function (name, defaultValue) {
|
||||
if (defaultValue == null) {
|
||||
defaultValue = null;
|
||||
defaultValue = null
|
||||
}
|
||||
if (this[name] == null) {
|
||||
this[name] = defaultValue;
|
||||
this[name] = defaultValue
|
||||
}
|
||||
return Object.defineProperty(this, name, {
|
||||
enumerable: true,
|
||||
writable: false,
|
||||
value: this[name]
|
||||
});
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
return MenuItem;
|
||||
return MenuItem
|
||||
})()
|
||||
|
||||
})();
|
||||
|
||||
module.exports = MenuItem;
|
||||
module.exports = MenuItem
|
||||
|
|
|
@ -1,70 +1,70 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const BrowserWindow = require('electron').BrowserWindow;
|
||||
const MenuItem = require('electron').MenuItem;
|
||||
const EventEmitter = require('events').EventEmitter;
|
||||
const v8Util = process.atomBinding('v8_util');
|
||||
const bindings = process.atomBinding('menu');
|
||||
const BrowserWindow = require('electron').BrowserWindow
|
||||
const MenuItem = require('electron').MenuItem
|
||||
const EventEmitter = require('events').EventEmitter
|
||||
const v8Util = process.atomBinding('v8_util')
|
||||
const bindings = process.atomBinding('menu')
|
||||
|
||||
// Automatically generated radio menu item's group id.
|
||||
var nextGroupId = 0;
|
||||
var nextGroupId = 0
|
||||
|
||||
// Search between separators to find a radio menu item and return its group id,
|
||||
// otherwise generate a group id.
|
||||
var generateGroupId = function (items, pos) {
|
||||
var i, item, j, k, ref1, ref2, ref3;
|
||||
var i, item, j, k, ref1, ref2, ref3
|
||||
if (pos > 0) {
|
||||
for (i = j = ref1 = pos - 1; ref1 <= 0 ? j <= 0 : j >= 0; i = ref1 <= 0 ? ++j : --j) {
|
||||
item = items[i];
|
||||
item = items[i]
|
||||
if (item.type === 'radio') {
|
||||
return item.groupId;
|
||||
return item.groupId
|
||||
}
|
||||
if (item.type === 'separator') {
|
||||
break;
|
||||
break
|
||||
}
|
||||
}
|
||||
} else if (pos < items.length) {
|
||||
for (i = k = ref2 = pos, ref3 = items.length - 1; ref2 <= ref3 ? k <= ref3 : k >= ref3; i = ref2 <= ref3 ? ++k : --k) {
|
||||
item = items[i];
|
||||
item = items[i]
|
||||
if (item.type === 'radio') {
|
||||
return item.groupId;
|
||||
return item.groupId
|
||||
}
|
||||
if (item.type === 'separator') {
|
||||
break;
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
return ++nextGroupId;
|
||||
};
|
||||
return ++nextGroupId
|
||||
}
|
||||
|
||||
// Returns the index of item according to |id|.
|
||||
var indexOfItemById = function (items, id) {
|
||||
var i, item, j, len;
|
||||
var i, item, j, len
|
||||
for (i = j = 0, len = items.length; j < len; i = ++j) {
|
||||
item = items[i];
|
||||
item = items[i]
|
||||
if (item.id === id) {
|
||||
return i;
|
||||
return i
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
};
|
||||
return -1
|
||||
}
|
||||
|
||||
// Returns the index of where to insert the item according to |position|.
|
||||
var indexToInsertByPosition = function (items, position) {
|
||||
var insertIndex;
|
||||
var insertIndex
|
||||
if (!position) {
|
||||
return items.length;
|
||||
return items.length
|
||||
}
|
||||
const [query, id] = position.split('=');
|
||||
insertIndex = indexOfItemById(items, id);
|
||||
const [query, id] = position.split('=')
|
||||
insertIndex = indexOfItemById(items, id)
|
||||
if (insertIndex === -1 && query !== 'endof') {
|
||||
console.warn("Item with id '" + id + "' is not found");
|
||||
return items.length;
|
||||
console.warn("Item with id '" + id + "' is not found")
|
||||
return items.length
|
||||
}
|
||||
switch (query) {
|
||||
case 'after':
|
||||
insertIndex++;
|
||||
break;
|
||||
insertIndex++
|
||||
break
|
||||
case 'endof':
|
||||
|
||||
// If the |id| doesn't exist, then create a new group with the |id|.
|
||||
|
@ -72,235 +72,234 @@ var indexToInsertByPosition = function(items, position) {
|
|||
items.push({
|
||||
id: id,
|
||||
type: 'separator'
|
||||
});
|
||||
insertIndex = items.length - 1;
|
||||
})
|
||||
insertIndex = items.length - 1
|
||||
}
|
||||
|
||||
// Find the end of the group.
|
||||
insertIndex++;
|
||||
insertIndex++
|
||||
while (insertIndex < items.length && items[insertIndex].type !== 'separator') {
|
||||
insertIndex++;
|
||||
insertIndex++
|
||||
}
|
||||
}
|
||||
return insertIndex;
|
||||
};
|
||||
return insertIndex
|
||||
}
|
||||
|
||||
const Menu = bindings.Menu;
|
||||
const Menu = bindings.Menu
|
||||
|
||||
Menu.prototype.__proto__ = EventEmitter.prototype;
|
||||
Object.setPrototypeOf(Menu.prototype, EventEmitter.prototype)
|
||||
|
||||
Menu.prototype._init = function () {
|
||||
this.commandsMap = {};
|
||||
this.groupsMap = {};
|
||||
this.items = [];
|
||||
return this.delegate = {
|
||||
this.commandsMap = {}
|
||||
this.groupsMap = {}
|
||||
this.items = []
|
||||
this.delegate = {
|
||||
isCommandIdChecked: (commandId) => {
|
||||
var command = this.commandsMap[commandId];
|
||||
return command != null ? command.checked : undefined;
|
||||
var command = this.commandsMap[commandId]
|
||||
return command != null ? command.checked : undefined
|
||||
},
|
||||
isCommandIdEnabled: (commandId) => {
|
||||
var command = this.commandsMap[commandId];
|
||||
return command != null ? command.enabled : undefined;
|
||||
var command = this.commandsMap[commandId]
|
||||
return command != null ? command.enabled : undefined
|
||||
},
|
||||
isCommandIdVisible: (commandId) => {
|
||||
var command = this.commandsMap[commandId];
|
||||
return command != null ? command.visible : undefined;
|
||||
var command = this.commandsMap[commandId]
|
||||
return command != null ? command.visible : undefined
|
||||
},
|
||||
getAcceleratorForCommandId: (commandId) => {
|
||||
var command = this.commandsMap[commandId];
|
||||
return command != null ? command.accelerator : undefined;
|
||||
var command = this.commandsMap[commandId]
|
||||
return command != null ? command.accelerator : undefined
|
||||
},
|
||||
getIconForCommandId: (commandId) => {
|
||||
var command = this.commandsMap[commandId];
|
||||
return command != null ? command.icon : undefined;
|
||||
var command = this.commandsMap[commandId]
|
||||
return command != null ? command.icon : undefined
|
||||
},
|
||||
executeCommand: (commandId) => {
|
||||
var command = this.commandsMap[commandId];
|
||||
return command != null ? command.click(BrowserWindow.getFocusedWindow()) : undefined;
|
||||
var command = this.commandsMap[commandId]
|
||||
return command != null ? command.click(BrowserWindow.getFocusedWindow()) : undefined
|
||||
},
|
||||
menuWillShow: () => {
|
||||
// Make sure radio groups have at least one menu item seleted.
|
||||
var checked, group, id, j, len, radioItem, ref1;
|
||||
ref1 = this.groupsMap;
|
||||
var checked, group, id, j, len, radioItem, ref1
|
||||
ref1 = this.groupsMap
|
||||
for (id in ref1) {
|
||||
group = ref1[id];
|
||||
checked = false;
|
||||
group = ref1[id]
|
||||
checked = false
|
||||
for (j = 0, len = group.length; j < len; j++) {
|
||||
radioItem = group[j];
|
||||
radioItem = group[j]
|
||||
if (!radioItem.checked) {
|
||||
continue;
|
||||
continue
|
||||
}
|
||||
checked = true;
|
||||
break;
|
||||
checked = true
|
||||
break
|
||||
}
|
||||
if (!checked) {
|
||||
v8Util.setHiddenValue(group[0], 'checked', true);
|
||||
v8Util.setHiddenValue(group[0], 'checked', true)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
Menu.prototype.popup = function (window, x, y, positioningItem) {
|
||||
if (typeof window != 'object' || window.constructor !== BrowserWindow) {
|
||||
if (typeof window !== 'object' || window.constructor !== BrowserWindow) {
|
||||
// Shift.
|
||||
positioningItem = y;
|
||||
y = x;
|
||||
x = window;
|
||||
window = BrowserWindow.getFocusedWindow();
|
||||
positioningItem = y
|
||||
y = x
|
||||
x = window
|
||||
window = BrowserWindow.getFocusedWindow()
|
||||
}
|
||||
|
||||
// Default parameters.
|
||||
if (typeof x !== 'number') x = -1;
|
||||
if (typeof y !== 'number') y = -1;
|
||||
if (typeof positioningItem !== 'number') positioningItem = 0;
|
||||
if (typeof x !== 'number') x = -1
|
||||
if (typeof y !== 'number') y = -1
|
||||
if (typeof positioningItem !== 'number') positioningItem = 0
|
||||
|
||||
this.popupAt(window, x, y, positioningItem);
|
||||
};
|
||||
this.popupAt(window, x, y, positioningItem)
|
||||
}
|
||||
|
||||
Menu.prototype.append = function (item) {
|
||||
return this.insert(this.getItemCount(), item);
|
||||
};
|
||||
return this.insert(this.getItemCount(), item)
|
||||
}
|
||||
|
||||
Menu.prototype.insert = function (pos, item) {
|
||||
var base, name;
|
||||
var base, name
|
||||
if ((item != null ? item.constructor : void 0) !== MenuItem) {
|
||||
throw new TypeError('Invalid item');
|
||||
throw new TypeError('Invalid item')
|
||||
}
|
||||
switch (item.type) {
|
||||
case 'normal':
|
||||
this.insertItem(pos, item.commandId, item.label);
|
||||
break;
|
||||
this.insertItem(pos, item.commandId, item.label)
|
||||
break
|
||||
case 'checkbox':
|
||||
this.insertCheckItem(pos, item.commandId, item.label);
|
||||
break;
|
||||
this.insertCheckItem(pos, item.commandId, item.label)
|
||||
break
|
||||
case 'separator':
|
||||
this.insertSeparator(pos);
|
||||
break;
|
||||
this.insertSeparator(pos)
|
||||
break
|
||||
case 'submenu':
|
||||
this.insertSubMenu(pos, item.commandId, item.label, item.submenu);
|
||||
break;
|
||||
this.insertSubMenu(pos, item.commandId, item.label, item.submenu)
|
||||
break
|
||||
case 'radio':
|
||||
// Grouping radio menu items.
|
||||
item.overrideReadOnlyProperty('groupId', generateGroupId(this.items, pos));
|
||||
item.overrideReadOnlyProperty('groupId', generateGroupId(this.items, pos))
|
||||
if ((base = this.groupsMap)[name = item.groupId] == null) {
|
||||
base[name] = [];
|
||||
base[name] = []
|
||||
}
|
||||
this.groupsMap[item.groupId].push(item);
|
||||
this.groupsMap[item.groupId].push(item)
|
||||
|
||||
// Setting a radio menu item should flip other items in the group.
|
||||
v8Util.setHiddenValue(item, 'checked', item.checked);
|
||||
v8Util.setHiddenValue(item, 'checked', item.checked)
|
||||
Object.defineProperty(item, 'checked', {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return v8Util.getHiddenValue(item, 'checked');
|
||||
return v8Util.getHiddenValue(item, 'checked')
|
||||
},
|
||||
set: () => {
|
||||
var j, len, otherItem, ref1;
|
||||
ref1 = this.groupsMap[item.groupId];
|
||||
var j, len, otherItem, ref1
|
||||
ref1 = this.groupsMap[item.groupId]
|
||||
for (j = 0, len = ref1.length; j < len; j++) {
|
||||
otherItem = ref1[j];
|
||||
otherItem = ref1[j]
|
||||
if (otherItem !== item) {
|
||||
v8Util.setHiddenValue(otherItem, 'checked', false);
|
||||
v8Util.setHiddenValue(otherItem, 'checked', false)
|
||||
}
|
||||
}
|
||||
return v8Util.setHiddenValue(item, 'checked', true);
|
||||
return v8Util.setHiddenValue(item, 'checked', true)
|
||||
}
|
||||
});
|
||||
this.insertRadioItem(pos, item.commandId, item.label, item.groupId);
|
||||
})
|
||||
this.insertRadioItem(pos, item.commandId, item.label, item.groupId)
|
||||
}
|
||||
if (item.sublabel != null) {
|
||||
this.setSublabel(pos, item.sublabel);
|
||||
this.setSublabel(pos, item.sublabel)
|
||||
}
|
||||
if (item.icon != null) {
|
||||
this.setIcon(pos, item.icon);
|
||||
this.setIcon(pos, item.icon)
|
||||
}
|
||||
if (item.role != null) {
|
||||
this.setRole(pos, item.role);
|
||||
this.setRole(pos, item.role)
|
||||
}
|
||||
|
||||
// Make menu accessable to items.
|
||||
item.overrideReadOnlyProperty('menu', this);
|
||||
item.overrideReadOnlyProperty('menu', this)
|
||||
|
||||
// Remember the items.
|
||||
this.items.splice(pos, 0, item);
|
||||
return this.commandsMap[item.commandId] = item;
|
||||
};
|
||||
|
||||
this.items.splice(pos, 0, item)
|
||||
this.commandsMap[item.commandId] = item
|
||||
}
|
||||
|
||||
// Force menuWillShow to be called
|
||||
Menu.prototype._callMenuWillShow = function () {
|
||||
if (this.delegate != null) {
|
||||
this.delegate.menuWillShow();
|
||||
this.delegate.menuWillShow()
|
||||
}
|
||||
this.items.forEach(function (item) {
|
||||
if (item.submenu != null) {
|
||||
item.submenu._callMenuWillShow();
|
||||
item.submenu._callMenuWillShow()
|
||||
}
|
||||
})
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
var applicationMenu = null;
|
||||
var applicationMenu = null
|
||||
|
||||
Menu.setApplicationMenu = function (menu) {
|
||||
if (!(menu === null || menu.constructor === Menu)) {
|
||||
throw new TypeError('Invalid menu');
|
||||
throw new TypeError('Invalid menu')
|
||||
}
|
||||
|
||||
// Keep a reference.
|
||||
applicationMenu = menu;
|
||||
applicationMenu = menu
|
||||
if (process.platform === 'darwin') {
|
||||
if (menu === null) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
menu._callMenuWillShow();
|
||||
bindings.setApplicationMenu(menu);
|
||||
menu._callMenuWillShow()
|
||||
bindings.setApplicationMenu(menu)
|
||||
} else {
|
||||
BrowserWindow.getAllWindows().forEach(function (window) {
|
||||
window.setMenu(menu);
|
||||
});
|
||||
window.setMenu(menu)
|
||||
})
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
Menu.getApplicationMenu = function () {
|
||||
return applicationMenu;
|
||||
};
|
||||
return applicationMenu
|
||||
}
|
||||
|
||||
Menu.sendActionToFirstResponder = bindings.sendActionToFirstResponder;
|
||||
Menu.sendActionToFirstResponder = bindings.sendActionToFirstResponder
|
||||
|
||||
Menu.buildFromTemplate = function (template) {
|
||||
var insertIndex, item, j, k, key, len, len1, menu, menuItem, positionedTemplate;
|
||||
var insertIndex, item, j, k, key, len, len1, menu, menuItem, positionedTemplate
|
||||
if (!Array.isArray(template)) {
|
||||
throw new TypeError('Invalid template for Menu');
|
||||
throw new TypeError('Invalid template for Menu')
|
||||
}
|
||||
positionedTemplate = [];
|
||||
insertIndex = 0;
|
||||
positionedTemplate = []
|
||||
insertIndex = 0
|
||||
for (j = 0, len = template.length; j < len; j++) {
|
||||
item = template[j];
|
||||
item = template[j]
|
||||
if (item.position) {
|
||||
insertIndex = indexToInsertByPosition(positionedTemplate, item.position);
|
||||
insertIndex = indexToInsertByPosition(positionedTemplate, item.position)
|
||||
} else {
|
||||
// If no |position| is specified, insert after last item.
|
||||
insertIndex++;
|
||||
insertIndex++
|
||||
}
|
||||
positionedTemplate.splice(insertIndex, 0, item);
|
||||
positionedTemplate.splice(insertIndex, 0, item)
|
||||
}
|
||||
menu = new Menu;
|
||||
menu = new Menu()
|
||||
for (k = 0, len1 = positionedTemplate.length; k < len1; k++) {
|
||||
item = positionedTemplate[k];
|
||||
item = positionedTemplate[k]
|
||||
if (typeof item !== 'object') {
|
||||
throw new TypeError('Invalid template for MenuItem');
|
||||
throw new TypeError('Invalid template for MenuItem')
|
||||
}
|
||||
menuItem = new MenuItem(item);
|
||||
menuItem = new MenuItem(item)
|
||||
for (key in item) {
|
||||
// Preserve extra fields specified by user
|
||||
if (!menuItem.hasOwnProperty(key)) {
|
||||
menuItem[key] = item[key];
|
||||
menuItem[key] = item[key]
|
||||
}
|
||||
}
|
||||
menu.append(menuItem);
|
||||
menu.append(menuItem)
|
||||
}
|
||||
return menu
|
||||
}
|
||||
return menu;
|
||||
};
|
||||
|
||||
module.exports = Menu;
|
||||
module.exports = Menu
|
||||
|
|
|
@ -1,17 +1,17 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const ipcMain = require('electron').ipcMain;
|
||||
const ipcMain = require('electron').ipcMain
|
||||
|
||||
// The history operation in renderer is redirected to browser.
|
||||
ipcMain.on('ATOM_SHELL_NAVIGATION_CONTROLLER', function (event, method, ...args) {
|
||||
var ref;
|
||||
return (ref = event.sender)[method].apply(ref, args);
|
||||
});
|
||||
var ref
|
||||
(ref = event.sender)[method].apply(ref, args)
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_SHELL_SYNC_NAVIGATION_CONTROLLER', function (event, method, ...args) {
|
||||
var ref;
|
||||
return event.returnValue = (ref = event.sender)[method].apply(ref, args);
|
||||
});
|
||||
var ref
|
||||
event.returnValue = (ref = event.sender)[method].apply(ref, args)
|
||||
})
|
||||
|
||||
// JavaScript implementation of Chromium's NavigationController.
|
||||
// Instead of relying on Chromium for history control, we compeletely do history
|
||||
|
@ -20,160 +20,159 @@ ipcMain.on('ATOM_SHELL_SYNC_NAVIGATION_CONTROLLER', function(event, method, ...a
|
|||
// process is restarted everytime.
|
||||
var NavigationController = (function () {
|
||||
function NavigationController (webContents) {
|
||||
this.webContents = webContents;
|
||||
this.clearHistory();
|
||||
this.webContents = webContents
|
||||
this.clearHistory()
|
||||
|
||||
// webContents may have already navigated to a page.
|
||||
if (this.webContents._getURL()) {
|
||||
this.currentIndex++;
|
||||
this.history.push(this.webContents._getURL());
|
||||
this.currentIndex++
|
||||
this.history.push(this.webContents._getURL())
|
||||
}
|
||||
this.webContents.on('navigation-entry-commited', (event, url, inPage, replaceEntry) => {
|
||||
var currentEntry;
|
||||
var currentEntry
|
||||
if (this.inPageIndex > -1 && !inPage) {
|
||||
// Navigated to a new page, clear in-page mark.
|
||||
this.inPageIndex = -1;
|
||||
this.inPageIndex = -1
|
||||
} else if (this.inPageIndex === -1 && inPage) {
|
||||
// Started in-page navigations.
|
||||
this.inPageIndex = this.currentIndex;
|
||||
this.inPageIndex = this.currentIndex
|
||||
}
|
||||
if (this.pendingIndex >= 0) {
|
||||
// Go to index.
|
||||
this.currentIndex = this.pendingIndex;
|
||||
this.pendingIndex = -1;
|
||||
return this.history[this.currentIndex] = url;
|
||||
this.currentIndex = this.pendingIndex
|
||||
this.pendingIndex = -1
|
||||
this.history[this.currentIndex] = url
|
||||
} else if (replaceEntry) {
|
||||
// Non-user initialized navigation.
|
||||
return this.history[this.currentIndex] = url;
|
||||
this.history[this.currentIndex] = url
|
||||
} else {
|
||||
// Normal navigation. Clear history.
|
||||
this.history = this.history.slice(0, this.currentIndex + 1);
|
||||
currentEntry = this.history[this.currentIndex];
|
||||
this.history = this.history.slice(0, this.currentIndex + 1)
|
||||
currentEntry = this.history[this.currentIndex]
|
||||
if ((currentEntry != null ? currentEntry.url : void 0) !== url) {
|
||||
this.currentIndex++;
|
||||
return this.history.push(url);
|
||||
this.currentIndex++
|
||||
return this.history.push(url)
|
||||
}
|
||||
}
|
||||
});
|
||||
})
|
||||
}
|
||||
|
||||
NavigationController.prototype.loadURL = function (url, options) {
|
||||
if (options == null) {
|
||||
options = {};
|
||||
options = {}
|
||||
}
|
||||
this.pendingIndex = -1
|
||||
this.webContents._loadURL(url, options)
|
||||
return this.webContents.emit('load-url', url, options)
|
||||
}
|
||||
this.pendingIndex = -1;
|
||||
this.webContents._loadURL(url, options);
|
||||
return this.webContents.emit('load-url', url, options);
|
||||
};
|
||||
|
||||
NavigationController.prototype.getURL = function () {
|
||||
if (this.currentIndex === -1) {
|
||||
return '';
|
||||
return ''
|
||||
} else {
|
||||
return this.history[this.currentIndex];
|
||||
return this.history[this.currentIndex]
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
NavigationController.prototype.stop = function () {
|
||||
this.pendingIndex = -1;
|
||||
return this.webContents._stop();
|
||||
};
|
||||
this.pendingIndex = -1
|
||||
return this.webContents._stop()
|
||||
}
|
||||
|
||||
NavigationController.prototype.reload = function () {
|
||||
this.pendingIndex = this.currentIndex;
|
||||
return this.webContents._loadURL(this.getURL(), {});
|
||||
};
|
||||
this.pendingIndex = this.currentIndex
|
||||
return this.webContents._loadURL(this.getURL(), {})
|
||||
}
|
||||
|
||||
NavigationController.prototype.reloadIgnoringCache = function () {
|
||||
this.pendingIndex = this.currentIndex;
|
||||
this.pendingIndex = this.currentIndex
|
||||
return this.webContents._loadURL(this.getURL(), {
|
||||
extraHeaders: "pragma: no-cache\n"
|
||||
});
|
||||
};
|
||||
extraHeaders: 'pragma: no-cache\n'
|
||||
})
|
||||
}
|
||||
|
||||
NavigationController.prototype.canGoBack = function () {
|
||||
return this.getActiveIndex() > 0;
|
||||
};
|
||||
return this.getActiveIndex() > 0
|
||||
}
|
||||
|
||||
NavigationController.prototype.canGoForward = function () {
|
||||
return this.getActiveIndex() < this.history.length - 1;
|
||||
};
|
||||
return this.getActiveIndex() < this.history.length - 1
|
||||
}
|
||||
|
||||
NavigationController.prototype.canGoToIndex = function (index) {
|
||||
return index >= 0 && index < this.history.length;
|
||||
};
|
||||
return index >= 0 && index < this.history.length
|
||||
}
|
||||
|
||||
NavigationController.prototype.canGoToOffset = function (offset) {
|
||||
return this.canGoToIndex(this.currentIndex + offset);
|
||||
};
|
||||
return this.canGoToIndex(this.currentIndex + offset)
|
||||
}
|
||||
|
||||
NavigationController.prototype.clearHistory = function () {
|
||||
this.history = [];
|
||||
this.currentIndex = -1;
|
||||
this.pendingIndex = -1;
|
||||
return this.inPageIndex = -1;
|
||||
};
|
||||
this.history = []
|
||||
this.currentIndex = -1
|
||||
this.pendingIndex = -1
|
||||
this.inPageIndex = -1
|
||||
}
|
||||
|
||||
NavigationController.prototype.goBack = function () {
|
||||
if (!this.canGoBack()) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
this.pendingIndex = this.getActiveIndex() - 1;
|
||||
this.pendingIndex = this.getActiveIndex() - 1
|
||||
if (this.inPageIndex > -1 && this.pendingIndex >= this.inPageIndex) {
|
||||
return this.webContents._goBack();
|
||||
return this.webContents._goBack()
|
||||
} else {
|
||||
return this.webContents._loadURL(this.history[this.pendingIndex], {});
|
||||
return this.webContents._loadURL(this.history[this.pendingIndex], {})
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
NavigationController.prototype.goForward = function () {
|
||||
if (!this.canGoForward()) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
this.pendingIndex = this.getActiveIndex() + 1;
|
||||
this.pendingIndex = this.getActiveIndex() + 1
|
||||
if (this.inPageIndex > -1 && this.pendingIndex >= this.inPageIndex) {
|
||||
return this.webContents._goForward();
|
||||
return this.webContents._goForward()
|
||||
} else {
|
||||
return this.webContents._loadURL(this.history[this.pendingIndex], {});
|
||||
return this.webContents._loadURL(this.history[this.pendingIndex], {})
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
NavigationController.prototype.goToIndex = function (index) {
|
||||
if (!this.canGoToIndex(index)) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
this.pendingIndex = index
|
||||
return this.webContents._loadURL(this.history[this.pendingIndex], {})
|
||||
}
|
||||
this.pendingIndex = index;
|
||||
return this.webContents._loadURL(this.history[this.pendingIndex], {});
|
||||
};
|
||||
|
||||
NavigationController.prototype.goToOffset = function (offset) {
|
||||
var pendingIndex;
|
||||
var pendingIndex
|
||||
if (!this.canGoToOffset(offset)) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
pendingIndex = this.currentIndex + offset;
|
||||
pendingIndex = this.currentIndex + offset
|
||||
if (this.inPageIndex > -1 && pendingIndex >= this.inPageIndex) {
|
||||
this.pendingIndex = pendingIndex;
|
||||
return this.webContents._goToOffset(offset);
|
||||
this.pendingIndex = pendingIndex
|
||||
return this.webContents._goToOffset(offset)
|
||||
} else {
|
||||
return this.goToIndex(pendingIndex);
|
||||
return this.goToIndex(pendingIndex)
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
NavigationController.prototype.getActiveIndex = function () {
|
||||
if (this.pendingIndex === -1) {
|
||||
return this.currentIndex;
|
||||
return this.currentIndex
|
||||
} else {
|
||||
return this.pendingIndex;
|
||||
return this.pendingIndex
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
NavigationController.prototype.length = function () {
|
||||
return this.history.length;
|
||||
};
|
||||
return this.history.length
|
||||
}
|
||||
|
||||
return NavigationController;
|
||||
return NavigationController
|
||||
})()
|
||||
|
||||
})();
|
||||
|
||||
module.exports = NavigationController;
|
||||
module.exports = NavigationController
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
const EventEmitter = require('events').EventEmitter;
|
||||
const powerMonitor = process.atomBinding('power_monitor').powerMonitor;
|
||||
const EventEmitter = require('events').EventEmitter
|
||||
const powerMonitor = process.atomBinding('power_monitor').powerMonitor
|
||||
|
||||
powerMonitor.__proto__ = EventEmitter.prototype;
|
||||
Object.setPrototypeOf(powerMonitor, EventEmitter.prototype)
|
||||
|
||||
module.exports = powerMonitor;
|
||||
module.exports = powerMonitor
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
var powerSaveBlocker;
|
||||
var powerSaveBlocker
|
||||
|
||||
powerSaveBlocker = process.atomBinding('power_save_blocker').powerSaveBlocker;
|
||||
powerSaveBlocker = process.atomBinding('power_save_blocker').powerSaveBlocker
|
||||
|
||||
module.exports = powerSaveBlocker;
|
||||
module.exports = powerSaveBlocker
|
||||
|
|
|
@ -1,31 +1,31 @@
|
|||
const app = require('electron').app;
|
||||
const app = require('electron').app
|
||||
|
||||
if (!app.isReady()) {
|
||||
throw new Error('Can not initialize protocol module before app is ready');
|
||||
throw new Error('Can not initialize protocol module before app is ready')
|
||||
}
|
||||
|
||||
const protocol = process.atomBinding('protocol').protocol;
|
||||
const protocol = process.atomBinding('protocol').protocol
|
||||
|
||||
// Warn about removed APIs.
|
||||
var logAndThrow = function (callback, message) {
|
||||
console.error(message);
|
||||
console.error(message)
|
||||
if (callback) {
|
||||
return callback(new Error(message));
|
||||
return callback(new Error(message))
|
||||
} else {
|
||||
throw new Error(message);
|
||||
throw new Error(message)
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
protocol.registerProtocol = function (scheme, handler, callback) {
|
||||
return logAndThrow(callback, 'registerProtocol API has been replaced by the register[File/Http/Buffer/String]Protocol API family, please switch to the new APIs.');
|
||||
};
|
||||
return logAndThrow(callback, 'registerProtocol API has been replaced by the register[File/Http/Buffer/String]Protocol API family, please switch to the new APIs.')
|
||||
}
|
||||
|
||||
protocol.isHandledProtocol = function (scheme, callback) {
|
||||
return logAndThrow(callback, 'isHandledProtocol API has been replaced by isProtocolHandled.');
|
||||
};
|
||||
return logAndThrow(callback, 'isHandledProtocol API has been replaced by isProtocolHandled.')
|
||||
}
|
||||
|
||||
protocol.interceptProtocol = function (scheme, handler, callback) {
|
||||
return logAndThrow(callback, 'interceptProtocol API has been replaced by the intercept[File/Http/Buffer/String]Protocol API family, please switch to the new APIs.');
|
||||
};
|
||||
return logAndThrow(callback, 'interceptProtocol API has been replaced by the intercept[File/Http/Buffer/String]Protocol API family, please switch to the new APIs.')
|
||||
}
|
||||
|
||||
module.exports = protocol;
|
||||
module.exports = protocol
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
const EventEmitter = require('events').EventEmitter;
|
||||
const screen = process.atomBinding('screen').screen;
|
||||
const EventEmitter = require('events').EventEmitter
|
||||
const screen = process.atomBinding('screen').screen
|
||||
|
||||
screen.__proto__ = EventEmitter.prototype;
|
||||
Object.setPrototypeOf(screen, EventEmitter.prototype)
|
||||
|
||||
module.exports = screen;
|
||||
module.exports = screen
|
||||
|
|
|
@ -1,33 +1,33 @@
|
|||
const EventEmitter = require('events').EventEmitter;
|
||||
const bindings = process.atomBinding('session');
|
||||
const PERSIST_PREFIX = 'persist:';
|
||||
const EventEmitter = require('events').EventEmitter
|
||||
const bindings = process.atomBinding('session')
|
||||
const PERSIST_PREFIX = 'persist:'
|
||||
|
||||
// Returns the Session from |partition| string.
|
||||
exports.fromPartition = function (partition) {
|
||||
if (partition == null) {
|
||||
partition = '';
|
||||
partition = ''
|
||||
}
|
||||
if (partition === '') {
|
||||
return exports.defaultSession;
|
||||
return exports.defaultSession
|
||||
}
|
||||
if (partition.startsWith(PERSIST_PREFIX)) {
|
||||
return bindings.fromPartition(partition.substr(PERSIST_PREFIX.length), false);
|
||||
return bindings.fromPartition(partition.substr(PERSIST_PREFIX.length), false)
|
||||
} else {
|
||||
return bindings.fromPartition(partition, true);
|
||||
return bindings.fromPartition(partition, true)
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// Returns the default session.
|
||||
Object.defineProperty(exports, 'defaultSession', {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return bindings.fromPartition('', false);
|
||||
return bindings.fromPartition('', false)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
var wrapSession = function (session) {
|
||||
// session is an EventEmitter.
|
||||
return session.__proto__ = EventEmitter.prototype;
|
||||
};
|
||||
Object.setPrototypeOf(session, EventEmitter.prototype)
|
||||
}
|
||||
|
||||
bindings._setWrapSession(wrapSession);
|
||||
bindings._setWrapSession(wrapSession)
|
||||
|
|
|
@ -1,23 +1,23 @@
|
|||
const deprecate = require('electron').deprecate;
|
||||
const EventEmitter = require('events').EventEmitter;
|
||||
const Tray = process.atomBinding('tray').Tray;
|
||||
const deprecate = require('electron').deprecate
|
||||
const EventEmitter = require('events').EventEmitter
|
||||
const Tray = process.atomBinding('tray').Tray
|
||||
|
||||
Tray.prototype.__proto__ = EventEmitter.prototype;
|
||||
Object.setPrototypeOf(Tray.prototype, EventEmitter.prototype)
|
||||
|
||||
Tray.prototype._init = function () {
|
||||
// Deprecated.
|
||||
deprecate.rename(this, 'popContextMenu', 'popUpContextMenu');
|
||||
deprecate.event(this, 'clicked', 'click');
|
||||
deprecate.event(this, 'double-clicked', 'double-click');
|
||||
deprecate.event(this, 'right-clicked', 'right-click');
|
||||
return deprecate.event(this, 'balloon-clicked', 'balloon-click');
|
||||
};
|
||||
deprecate.rename(this, 'popContextMenu', 'popUpContextMenu')
|
||||
deprecate.event(this, 'clicked', 'click')
|
||||
deprecate.event(this, 'double-clicked', 'double-click')
|
||||
deprecate.event(this, 'right-clicked', 'right-click')
|
||||
return deprecate.event(this, 'balloon-clicked', 'balloon-click')
|
||||
}
|
||||
|
||||
Tray.prototype.setContextMenu = function (menu) {
|
||||
this._setContextMenu(menu);
|
||||
this._setContextMenu(menu)
|
||||
|
||||
// Keep a strong reference of menu.
|
||||
return this.menu = menu;
|
||||
};
|
||||
this.menu = menu
|
||||
}
|
||||
|
||||
module.exports = Tray;
|
||||
module.exports = Tray
|
||||
|
|
|
@ -1,59 +1,59 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const EventEmitter = require('events').EventEmitter;
|
||||
const deprecate = require('electron').deprecate;
|
||||
const ipcMain = require('electron').ipcMain;
|
||||
const NavigationController = require('electron').NavigationController;
|
||||
const Menu = require('electron').Menu;
|
||||
const EventEmitter = require('events').EventEmitter
|
||||
const deprecate = require('electron').deprecate
|
||||
const ipcMain = require('electron').ipcMain
|
||||
const NavigationController = require('electron').NavigationController
|
||||
const Menu = require('electron').Menu
|
||||
|
||||
const binding = process.atomBinding('web_contents');
|
||||
const debuggerBinding = process.atomBinding('debugger');
|
||||
const binding = process.atomBinding('web_contents')
|
||||
const debuggerBinding = process.atomBinding('debugger')
|
||||
|
||||
let nextId = 0;
|
||||
let nextId = 0
|
||||
|
||||
let getNextId = function () {
|
||||
return ++nextId;
|
||||
};
|
||||
return ++nextId
|
||||
}
|
||||
|
||||
let PDFPageSize = {
|
||||
A5: {
|
||||
custom_display_name: "A5",
|
||||
custom_display_name: 'A5',
|
||||
height_microns: 210000,
|
||||
name: "ISO_A5",
|
||||
name: 'ISO_A5',
|
||||
width_microns: 148000
|
||||
},
|
||||
A4: {
|
||||
custom_display_name: "A4",
|
||||
custom_display_name: 'A4',
|
||||
height_microns: 297000,
|
||||
name: "ISO_A4",
|
||||
is_default: "true",
|
||||
name: 'ISO_A4',
|
||||
is_default: 'true',
|
||||
width_microns: 210000
|
||||
},
|
||||
A3: {
|
||||
custom_display_name: "A3",
|
||||
custom_display_name: 'A3',
|
||||
height_microns: 420000,
|
||||
name: "ISO_A3",
|
||||
name: 'ISO_A3',
|
||||
width_microns: 297000
|
||||
},
|
||||
Legal: {
|
||||
custom_display_name: "Legal",
|
||||
custom_display_name: 'Legal',
|
||||
height_microns: 355600,
|
||||
name: "NA_LEGAL",
|
||||
name: 'NA_LEGAL',
|
||||
width_microns: 215900
|
||||
},
|
||||
Letter: {
|
||||
custom_display_name: "Letter",
|
||||
custom_display_name: 'Letter',
|
||||
height_microns: 279400,
|
||||
name: "NA_LETTER",
|
||||
name: 'NA_LETTER',
|
||||
width_microns: 215900
|
||||
},
|
||||
Tabloid: {
|
||||
height_microns: 431800,
|
||||
name: "NA_LEDGER",
|
||||
name: 'NA_LEDGER',
|
||||
width_microns: 279400,
|
||||
custom_display_name: "Tabloid"
|
||||
custom_display_name: 'Tabloid'
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// Following methods are mapped to webFrame.
|
||||
const webFrameMethods = [
|
||||
|
@ -61,112 +61,115 @@ const webFrameMethods = [
|
|||
'setZoomFactor',
|
||||
'setZoomLevel',
|
||||
'setZoomLevelLimits'
|
||||
];
|
||||
]
|
||||
|
||||
let wrapWebContents = function (webContents) {
|
||||
// webContents is an EventEmitter.
|
||||
var controller, method, name, ref1;
|
||||
webContents.__proto__ = EventEmitter.prototype;
|
||||
var controller, method, name, ref1
|
||||
Object.setPrototypeOf(webContents, EventEmitter.prototype)
|
||||
|
||||
// Every remote callback from renderer process would add a listenter to the
|
||||
// render-view-deleted event, so ignore the listenters warning.
|
||||
webContents.setMaxListeners(0);
|
||||
webContents.setMaxListeners(0)
|
||||
|
||||
// WebContents::send(channel, args..)
|
||||
webContents.send = function (channel, ...args) {
|
||||
if (channel == null) {
|
||||
throw new Error('Missing required channel argument');
|
||||
throw new Error('Missing required channel argument')
|
||||
}
|
||||
return this._send(channel, args)
|
||||
}
|
||||
return this._send(channel, args);
|
||||
};
|
||||
|
||||
// The navigation controller.
|
||||
controller = new NavigationController(webContents);
|
||||
ref1 = NavigationController.prototype;
|
||||
controller = new NavigationController(webContents)
|
||||
ref1 = NavigationController.prototype
|
||||
for (name in ref1) {
|
||||
method = ref1[name];
|
||||
method = ref1[name]
|
||||
if (method instanceof Function) {
|
||||
(function (name, method) {
|
||||
return webContents[name] = function() {
|
||||
return method.apply(controller, arguments);
|
||||
};
|
||||
})(name, method);
|
||||
webContents[name] = function () {
|
||||
return method.apply(controller, arguments)
|
||||
}
|
||||
})(name, method)
|
||||
}
|
||||
}
|
||||
|
||||
// Mapping webFrame methods.
|
||||
for (let method of webFrameMethods) {
|
||||
webContents[method] = function (...args) {
|
||||
this.send('ELECTRON_INTERNAL_RENDERER_WEB_FRAME_METHOD', method, args);
|
||||
};
|
||||
this.send('ELECTRON_INTERNAL_RENDERER_WEB_FRAME_METHOD', method, args)
|
||||
}
|
||||
}
|
||||
|
||||
const asyncWebFrameMethods = function (requestId, method, callback, ...args) {
|
||||
this.send('ELECTRON_INTERNAL_RENDERER_ASYNC_WEB_FRAME_METHOD', requestId, method, args);
|
||||
this.send('ELECTRON_INTERNAL_RENDERER_ASYNC_WEB_FRAME_METHOD', requestId, method, args)
|
||||
ipcMain.once(`ELECTRON_INTERNAL_BROWSER_ASYNC_WEB_FRAME_RESPONSE_${requestId}`, function (event, result) {
|
||||
if (callback)
|
||||
callback(result);
|
||||
});
|
||||
};
|
||||
if (callback) callback(result)
|
||||
})
|
||||
}
|
||||
|
||||
// Make sure webContents.executeJavaScript would run the code only when the
|
||||
// webContents has been loaded.
|
||||
webContents.executeJavaScript = function (code, hasUserGesture, callback) {
|
||||
let requestId = getNextId();
|
||||
if (typeof hasUserGesture === "function") {
|
||||
callback = hasUserGesture;
|
||||
hasUserGesture = false;
|
||||
let requestId = getNextId()
|
||||
if (typeof hasUserGesture === 'function') {
|
||||
callback = hasUserGesture
|
||||
hasUserGesture = false
|
||||
}
|
||||
if (this.getURL() && !this.isLoading()) {
|
||||
return asyncWebFrameMethods.call(this, requestId, 'executeJavaScript', callback, code, hasUserGesture)
|
||||
} else {
|
||||
return this.once('did-finish-load', asyncWebFrameMethods.bind(this, requestId, 'executeJavaScript', callback, code, hasUserGesture))
|
||||
}
|
||||
}
|
||||
if (this.getURL() && !this.isLoading())
|
||||
return asyncWebFrameMethods.call(this, requestId, "executeJavaScript", callback, code, hasUserGesture);
|
||||
else
|
||||
return this.once('did-finish-load', asyncWebFrameMethods.bind(this, requestId, "executeJavaScript", callback, code, hasUserGesture));
|
||||
};
|
||||
|
||||
// Dispatch IPC messages to the ipc module.
|
||||
webContents.on('ipc-message', function (event, [channel, ...args]) {
|
||||
return ipcMain.emit.apply(ipcMain, [channel, event].concat(args));
|
||||
});
|
||||
return ipcMain.emit.apply(ipcMain, [channel, event].concat(args))
|
||||
})
|
||||
webContents.on('ipc-message-sync', function (event, [channel, ...args]) {
|
||||
Object.defineProperty(event, 'returnValue', {
|
||||
set: function (value) {
|
||||
return event.sendReply(JSON.stringify(value));
|
||||
return event.sendReply(JSON.stringify(value))
|
||||
},
|
||||
get: function () {
|
||||
return undefined
|
||||
}
|
||||
});
|
||||
return ipcMain.emit.apply(ipcMain, [channel, event].concat(args));
|
||||
});
|
||||
})
|
||||
return ipcMain.emit.apply(ipcMain, [channel, event].concat(args))
|
||||
})
|
||||
|
||||
// Handle context menu action request from pepper plugin.
|
||||
webContents.on('pepper-context-menu', function (event, params) {
|
||||
var menu;
|
||||
menu = Menu.buildFromTemplate(params.menu);
|
||||
return menu.popup(params.x, params.y);
|
||||
});
|
||||
var menu
|
||||
menu = Menu.buildFromTemplate(params.menu)
|
||||
return menu.popup(params.x, params.y)
|
||||
})
|
||||
|
||||
// This error occurs when host could not be found.
|
||||
webContents.on('did-fail-provisional-load', function (...args) {
|
||||
// Calling loadURL during this event might cause crash, so delay the event
|
||||
// until next tick.
|
||||
setImmediate(() => {
|
||||
this.emit.apply(this, ['did-fail-load'].concat(args));
|
||||
});
|
||||
});
|
||||
this.emit.apply(this, ['did-fail-load'].concat(args))
|
||||
})
|
||||
})
|
||||
|
||||
// Delays the page-title-updated event to next tick.
|
||||
webContents.on('-page-title-updated', function (...args) {
|
||||
setImmediate(() => {
|
||||
this.emit.apply(this, ['page-title-updated'].concat(args));
|
||||
});
|
||||
});
|
||||
this.emit.apply(this, ['page-title-updated'].concat(args))
|
||||
})
|
||||
})
|
||||
|
||||
// Deprecated.
|
||||
deprecate.rename(webContents, 'loadUrl', 'loadURL');
|
||||
deprecate.rename(webContents, 'getUrl', 'getURL');
|
||||
deprecate.rename(webContents, 'loadUrl', 'loadURL')
|
||||
deprecate.rename(webContents, 'getUrl', 'getURL')
|
||||
deprecate.event(webContents, 'page-title-set', 'page-title-updated', function (...args) {
|
||||
return this.emit.apply(this, ['page-title-set'].concat(args));
|
||||
});
|
||||
return webContents.printToPDF = function(options, callback) {
|
||||
var printingSetting;
|
||||
return this.emit.apply(this, ['page-title-set'].concat(args))
|
||||
})
|
||||
webContents.printToPDF = function (options, callback) {
|
||||
var printingSetting
|
||||
printingSetting = {
|
||||
pageRage: [],
|
||||
mediaSize: {},
|
||||
|
@ -181,7 +184,7 @@ let wrapWebContents = function(webContents) {
|
|||
printWithCloudPrint: false,
|
||||
printWithPrivet: false,
|
||||
printWithExtension: false,
|
||||
deviceName: "Save as PDF",
|
||||
deviceName: 'Save as PDF',
|
||||
generateDraftData: true,
|
||||
fitToPageEnabled: false,
|
||||
duplex: 0,
|
||||
|
@ -189,40 +192,40 @@ let wrapWebContents = function(webContents) {
|
|||
collate: true,
|
||||
shouldPrintBackgrounds: false,
|
||||
shouldPrintSelectionOnly: false
|
||||
};
|
||||
}
|
||||
if (options.landscape) {
|
||||
printingSetting.landscape = options.landscape;
|
||||
printingSetting.landscape = options.landscape
|
||||
}
|
||||
if (options.marginsType) {
|
||||
printingSetting.marginsType = options.marginsType;
|
||||
printingSetting.marginsType = options.marginsType
|
||||
}
|
||||
if (options.printSelectionOnly) {
|
||||
printingSetting.shouldPrintSelectionOnly = options.printSelectionOnly;
|
||||
printingSetting.shouldPrintSelectionOnly = options.printSelectionOnly
|
||||
}
|
||||
if (options.printBackground) {
|
||||
printingSetting.shouldPrintBackgrounds = options.printBackground;
|
||||
printingSetting.shouldPrintBackgrounds = options.printBackground
|
||||
}
|
||||
if (options.pageSize && PDFPageSize[options.pageSize]) {
|
||||
printingSetting.mediaSize = PDFPageSize[options.pageSize];
|
||||
printingSetting.mediaSize = PDFPageSize[options.pageSize]
|
||||
} else {
|
||||
printingSetting.mediaSize = PDFPageSize['A4'];
|
||||
printingSetting.mediaSize = PDFPageSize['A4']
|
||||
}
|
||||
return this._printToPDF(printingSetting, callback)
|
||||
}
|
||||
}
|
||||
return this._printToPDF(printingSetting, callback);
|
||||
};
|
||||
};
|
||||
|
||||
// Wrapper for native class.
|
||||
let wrapDebugger = function (webContentsDebugger) {
|
||||
// debugger is an EventEmitter.
|
||||
webContentsDebugger.__proto__ = EventEmitter.prototype;
|
||||
};
|
||||
Object.setPrototypeOf(webContentsDebugger, EventEmitter.prototype)
|
||||
}
|
||||
|
||||
binding._setWrapWebContents(wrapWebContents);
|
||||
debuggerBinding._setWrapDebugger(wrapDebugger);
|
||||
binding._setWrapWebContents(wrapWebContents)
|
||||
debuggerBinding._setWrapDebugger(wrapDebugger)
|
||||
|
||||
module.exports.create = function (options) {
|
||||
if (options == null) {
|
||||
options = {};
|
||||
options = {}
|
||||
}
|
||||
return binding.create(options)
|
||||
}
|
||||
return binding.create(options);
|
||||
};
|
||||
|
|
|
@ -1,32 +1,31 @@
|
|||
const electron = require('electron');
|
||||
const app = electron.app;
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const url = require('url');
|
||||
const electron = require('electron')
|
||||
const app = electron.app
|
||||
const fs = require('fs')
|
||||
const path = require('path')
|
||||
const url = require('url')
|
||||
|
||||
// Mapping between hostname and file path.
|
||||
var hostPathMap = {};
|
||||
var hostPathMapNextKey = 0;
|
||||
var hostPathMap = {}
|
||||
var hostPathMapNextKey = 0
|
||||
|
||||
var getHostForPath = function (path) {
|
||||
var key;
|
||||
key = "extension-" + (++hostPathMapNextKey);
|
||||
hostPathMap[key] = path;
|
||||
return key;
|
||||
};
|
||||
var key
|
||||
key = 'extension-' + (++hostPathMapNextKey)
|
||||
hostPathMap[key] = path
|
||||
return key
|
||||
}
|
||||
|
||||
var getPathForHost = function (host) {
|
||||
return hostPathMap[host];
|
||||
};
|
||||
return hostPathMap[host]
|
||||
}
|
||||
|
||||
// Cache extensionInfo.
|
||||
var extensionInfoMap = {};
|
||||
var extensionInfoMap = {}
|
||||
|
||||
var getExtensionInfoFromPath = function (srcDirectory) {
|
||||
var manifest, page;
|
||||
manifest = JSON.parse(fs.readFileSync(path.join(srcDirectory, 'manifest.json')));
|
||||
var manifest, page
|
||||
manifest = JSON.parse(fs.readFileSync(path.join(srcDirectory, 'manifest.json')))
|
||||
if (extensionInfoMap[manifest.name] == null) {
|
||||
|
||||
// We can not use 'file://' directly because all resources in the extension
|
||||
// will be treated as relative to the root in Chrome.
|
||||
page = url.format({
|
||||
|
@ -34,58 +33,59 @@ var getExtensionInfoFromPath = function(srcDirectory) {
|
|||
slashes: true,
|
||||
hostname: getHostForPath(srcDirectory),
|
||||
pathname: manifest.devtools_page
|
||||
});
|
||||
})
|
||||
extensionInfoMap[manifest.name] = {
|
||||
startPage: page,
|
||||
name: manifest.name,
|
||||
srcDirectory: srcDirectory,
|
||||
exposeExperimentalAPIs: true
|
||||
};
|
||||
return extensionInfoMap[manifest.name];
|
||||
}
|
||||
};
|
||||
return extensionInfoMap[manifest.name]
|
||||
}
|
||||
}
|
||||
|
||||
// The loaded extensions cache and its persistent path.
|
||||
var loadedExtensions = null;
|
||||
var loadedExtensionsPath = null;
|
||||
var loadedExtensions = null
|
||||
var loadedExtensionsPath = null
|
||||
|
||||
app.on('will-quit', function () {
|
||||
try {
|
||||
loadedExtensions = Object.keys(extensionInfoMap).map(function (key) {
|
||||
return extensionInfoMap[key].srcDirectory;
|
||||
});
|
||||
return extensionInfoMap[key].srcDirectory
|
||||
})
|
||||
if (loadedExtensions.length > 0) {
|
||||
try {
|
||||
fs.mkdirSync(path.dirname(loadedExtensionsPath));
|
||||
fs.mkdirSync(path.dirname(loadedExtensionsPath))
|
||||
} catch (error) {
|
||||
// Ignore error
|
||||
}
|
||||
fs.writeFileSync(loadedExtensionsPath, JSON.stringify(loadedExtensions));
|
||||
fs.writeFileSync(loadedExtensionsPath, JSON.stringify(loadedExtensions))
|
||||
} else {
|
||||
fs.unlinkSync(loadedExtensionsPath);
|
||||
fs.unlinkSync(loadedExtensionsPath)
|
||||
}
|
||||
} catch (error) {
|
||||
// Ignore error
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
// We can not use protocol or BrowserWindow until app is ready.
|
||||
app.once('ready', function () {
|
||||
var BrowserWindow, chromeExtensionHandler, i, init, len, protocol, srcDirectory;
|
||||
protocol = electron.protocol, BrowserWindow = electron.BrowserWindow;
|
||||
var BrowserWindow, chromeExtensionHandler, i, init, len, protocol, srcDirectory
|
||||
protocol = electron.protocol
|
||||
BrowserWindow = electron.BrowserWindow
|
||||
|
||||
// Load persisted extensions.
|
||||
loadedExtensionsPath = path.join(app.getPath('userData'), 'DevTools Extensions');
|
||||
loadedExtensionsPath = path.join(app.getPath('userData'), 'DevTools Extensions')
|
||||
try {
|
||||
loadedExtensions = JSON.parse(fs.readFileSync(loadedExtensionsPath));
|
||||
loadedExtensions = JSON.parse(fs.readFileSync(loadedExtensionsPath))
|
||||
if (!Array.isArray(loadedExtensions)) {
|
||||
loadedExtensions = [];
|
||||
loadedExtensions = []
|
||||
}
|
||||
|
||||
// Preheat the extensionInfo cache.
|
||||
for (i = 0, len = loadedExtensions.length; i < len; i++) {
|
||||
srcDirectory = loadedExtensions[i];
|
||||
getExtensionInfoFromPath(srcDirectory);
|
||||
srcDirectory = loadedExtensions[i]
|
||||
getExtensionInfoFromPath(srcDirectory)
|
||||
}
|
||||
} catch (error) {
|
||||
// Ignore error
|
||||
|
@ -93,53 +93,53 @@ app.once('ready', function() {
|
|||
|
||||
// The chrome-extension: can map a extension URL request to real file path.
|
||||
chromeExtensionHandler = function (request, callback) {
|
||||
var directory, parsed;
|
||||
parsed = url.parse(request.url);
|
||||
var directory, parsed
|
||||
parsed = url.parse(request.url)
|
||||
if (!(parsed.hostname && (parsed.path != null))) {
|
||||
return callback();
|
||||
return callback()
|
||||
}
|
||||
if (!/extension-\d+/.test(parsed.hostname)) {
|
||||
return callback();
|
||||
return callback()
|
||||
}
|
||||
directory = getPathForHost(parsed.hostname);
|
||||
directory = getPathForHost(parsed.hostname)
|
||||
if (directory == null) {
|
||||
return callback();
|
||||
return callback()
|
||||
}
|
||||
return callback(path.join(directory, parsed.path))
|
||||
}
|
||||
return callback(path.join(directory, parsed.path));
|
||||
};
|
||||
protocol.registerFileProtocol('chrome-extension', chromeExtensionHandler, function (error) {
|
||||
if (error) {
|
||||
return console.error('Unable to register chrome-extension protocol');
|
||||
return console.error('Unable to register chrome-extension protocol')
|
||||
}
|
||||
});
|
||||
})
|
||||
BrowserWindow.prototype._loadDevToolsExtensions = function (extensionInfoArray) {
|
||||
var ref;
|
||||
return (ref = this.devToolsWebContents) != null ? ref.executeJavaScript("DevToolsAPI.addExtensions(" + (JSON.stringify(extensionInfoArray)) + ");") : void 0;
|
||||
};
|
||||
var ref
|
||||
return (ref = this.devToolsWebContents) != null ? ref.executeJavaScript('DevToolsAPI.addExtensions(' + (JSON.stringify(extensionInfoArray)) + ');') : void 0
|
||||
}
|
||||
BrowserWindow.addDevToolsExtension = function (srcDirectory) {
|
||||
var extensionInfo, j, len1, ref, window;
|
||||
extensionInfo = getExtensionInfoFromPath(srcDirectory);
|
||||
var extensionInfo, j, len1, ref, window
|
||||
extensionInfo = getExtensionInfoFromPath(srcDirectory)
|
||||
if (extensionInfo) {
|
||||
ref = BrowserWindow.getAllWindows();
|
||||
ref = BrowserWindow.getAllWindows()
|
||||
for (j = 0, len1 = ref.length; j < len1; j++) {
|
||||
window = ref[j];
|
||||
window._loadDevToolsExtensions([extensionInfo]);
|
||||
window = ref[j]
|
||||
window._loadDevToolsExtensions([extensionInfo])
|
||||
}
|
||||
return extensionInfo.name
|
||||
}
|
||||
return extensionInfo.name;
|
||||
}
|
||||
};
|
||||
BrowserWindow.removeDevToolsExtension = function (name) {
|
||||
return delete extensionInfoMap[name];
|
||||
};
|
||||
return delete extensionInfoMap[name]
|
||||
}
|
||||
|
||||
// Load persisted extensions when devtools is opened.
|
||||
init = BrowserWindow.prototype._init;
|
||||
return BrowserWindow.prototype._init = function() {
|
||||
init.call(this);
|
||||
init = BrowserWindow.prototype._init
|
||||
BrowserWindow.prototype._init = function () {
|
||||
init.call(this)
|
||||
return this.on('devtools-opened', function () {
|
||||
return this._loadDevToolsExtensions(Object.keys(extensionInfoMap).map(function (key) {
|
||||
return extensionInfoMap[key];
|
||||
}));
|
||||
});
|
||||
};
|
||||
});
|
||||
return extensionInfoMap[key]
|
||||
}))
|
||||
})
|
||||
}
|
||||
})
|
||||
|
|
|
@ -1,17 +1,17 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const ipcMain = require('electron').ipcMain;
|
||||
const desktopCapturer = process.atomBinding('desktop_capturer').desktopCapturer;
|
||||
const ipcMain = require('electron').ipcMain
|
||||
const desktopCapturer = process.atomBinding('desktop_capturer').desktopCapturer
|
||||
|
||||
var deepEqual = function (opt1, opt2) {
|
||||
return JSON.stringify(opt1) === JSON.stringify(opt2);
|
||||
};
|
||||
return JSON.stringify(opt1) === JSON.stringify(opt2)
|
||||
}
|
||||
|
||||
// A queue for holding all requests from renderer process.
|
||||
var requestsQueue = [];
|
||||
var requestsQueue = []
|
||||
|
||||
ipcMain.on('ATOM_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', function (event, captureWindow, captureScreen, thumbnailSize, id) {
|
||||
var request;
|
||||
var request
|
||||
request = {
|
||||
id: id,
|
||||
options: {
|
||||
|
@ -20,58 +20,58 @@ ipcMain.on('ATOM_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', function(event, captureW
|
|||
thumbnailSize: thumbnailSize
|
||||
},
|
||||
webContents: event.sender
|
||||
};
|
||||
requestsQueue.push(request);
|
||||
}
|
||||
requestsQueue.push(request)
|
||||
if (requestsQueue.length === 1) {
|
||||
desktopCapturer.startHandling(captureWindow, captureScreen, thumbnailSize);
|
||||
desktopCapturer.startHandling(captureWindow, captureScreen, thumbnailSize)
|
||||
}
|
||||
|
||||
// If the WebContents is destroyed before receiving result, just remove the
|
||||
// reference from requestsQueue to make the module not send the result to it.
|
||||
return event.sender.once('destroyed', function () {
|
||||
return request.webContents = null;
|
||||
});
|
||||
});
|
||||
request.webContents = null
|
||||
})
|
||||
})
|
||||
|
||||
desktopCapturer.emit = function (event, name, sources) {
|
||||
// Receiving sources result from main process, now send them back to renderer.
|
||||
var handledRequest, i, len, ref, ref1, request, result, source, unhandledRequestsQueue;
|
||||
handledRequest = requestsQueue.shift(0);
|
||||
var handledRequest, i, len, ref, ref1, request, result, source, unhandledRequestsQueue
|
||||
handledRequest = requestsQueue.shift(0)
|
||||
result = (function () {
|
||||
var i, len, results;
|
||||
results = [];
|
||||
var i, len, results
|
||||
results = []
|
||||
for (i = 0, len = sources.length; i < len; i++) {
|
||||
source = sources[i];
|
||||
source = sources[i]
|
||||
results.push({
|
||||
id: source.id,
|
||||
name: source.name,
|
||||
thumbnail: source.thumbnail.toDataUrl()
|
||||
});
|
||||
})
|
||||
}
|
||||
return results;
|
||||
})();
|
||||
return results
|
||||
})()
|
||||
if ((ref = handledRequest.webContents) != null) {
|
||||
ref.send("ATOM_RENDERER_DESKTOP_CAPTURER_RESULT_" + handledRequest.id, result);
|
||||
ref.send('ATOM_RENDERER_DESKTOP_CAPTURER_RESULT_' + handledRequest.id, result)
|
||||
}
|
||||
|
||||
// Check the queue to see whether there is other same request. If has, handle
|
||||
// it for reducing redunplicated `desktopCaptuer.startHandling` calls.
|
||||
unhandledRequestsQueue = [];
|
||||
unhandledRequestsQueue = []
|
||||
for (i = 0, len = requestsQueue.length; i < len; i++) {
|
||||
request = requestsQueue[i];
|
||||
request = requestsQueue[i]
|
||||
if (deepEqual(handledRequest.options, request.options)) {
|
||||
if ((ref1 = request.webContents) != null) {
|
||||
ref1.send("ATOM_RENDERER_DESKTOP_CAPTURER_RESULT_" + request.id, result);
|
||||
ref1.send('ATOM_RENDERER_DESKTOP_CAPTURER_RESULT_' + request.id, result)
|
||||
}
|
||||
} else {
|
||||
unhandledRequestsQueue.push(request);
|
||||
unhandledRequestsQueue.push(request)
|
||||
}
|
||||
}
|
||||
requestsQueue = unhandledRequestsQueue;
|
||||
requestsQueue = unhandledRequestsQueue
|
||||
|
||||
// If the requestsQueue is not empty, start a new request handling.
|
||||
if (requestsQueue.length > 0) {
|
||||
const {captureWindow, captureScreen, thumbnailSize} = requestsQueue[0].options;
|
||||
return desktopCapturer.startHandling(captureWindow, captureScreen, thumbnailSize);
|
||||
const {captureWindow, captureScreen, thumbnailSize} = requestsQueue[0].options
|
||||
return desktopCapturer.startHandling(captureWindow, captureScreen, thumbnailSize)
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const ipcMain = require('electron').ipcMain;
|
||||
const webContents = require('electron').webContents;
|
||||
const ipcMain = require('electron').ipcMain
|
||||
const webContents = require('electron').webContents
|
||||
|
||||
// Doesn't exist in early initialization.
|
||||
var webViewManager = null;
|
||||
var webViewManager = null
|
||||
|
||||
var supportedWebViewEvents = [
|
||||
'load-commit',
|
||||
|
@ -37,75 +37,75 @@ var supportedWebViewEvents = [
|
|||
'media-paused',
|
||||
'found-in-page',
|
||||
'did-change-theme-color'
|
||||
];
|
||||
]
|
||||
|
||||
var nextInstanceId = 0;
|
||||
var guestInstances = {};
|
||||
var embedderElementsMap = {};
|
||||
var reverseEmbedderElementsMap = {};
|
||||
var nextInstanceId = 0
|
||||
var guestInstances = {}
|
||||
var embedderElementsMap = {}
|
||||
var reverseEmbedderElementsMap = {}
|
||||
|
||||
// Moves the last element of array to the first one.
|
||||
var moveLastToFirst = function (list) {
|
||||
return list.unshift(list.pop());
|
||||
};
|
||||
return list.unshift(list.pop())
|
||||
}
|
||||
|
||||
// Generate guestInstanceId.
|
||||
var getNextInstanceId = function () {
|
||||
return ++nextInstanceId;
|
||||
};
|
||||
return ++nextInstanceId
|
||||
}
|
||||
|
||||
// Create a new guest instance.
|
||||
var createGuest = function (embedder, params) {
|
||||
var destroy, destroyEvents, event, fn, guest, i, id, j, len, len1, listeners;
|
||||
var destroy, destroyEvents, event, fn, guest, i, id, j, len, len1, listeners
|
||||
if (webViewManager == null) {
|
||||
webViewManager = process.atomBinding('web_view_manager');
|
||||
webViewManager = process.atomBinding('web_view_manager')
|
||||
}
|
||||
id = getNextInstanceId(embedder);
|
||||
id = getNextInstanceId(embedder)
|
||||
guest = webContents.create({
|
||||
isGuest: true,
|
||||
partition: params.partition,
|
||||
embedder: embedder
|
||||
});
|
||||
})
|
||||
guestInstances[id] = {
|
||||
guest: guest,
|
||||
embedder: embedder
|
||||
};
|
||||
}
|
||||
|
||||
// Destroy guest when the embedder is gone or navigated.
|
||||
destroyEvents = ['will-destroy', 'crashed', 'did-navigate'];
|
||||
destroyEvents = ['will-destroy', 'crashed', 'did-navigate']
|
||||
destroy = function () {
|
||||
if (guestInstances[id] != null) {
|
||||
return destroyGuest(embedder, id);
|
||||
return destroyGuest(embedder, id)
|
||||
}
|
||||
}
|
||||
};
|
||||
for (i = 0, len = destroyEvents.length; i < len; i++) {
|
||||
event = destroyEvents[i];
|
||||
embedder.once(event, destroy);
|
||||
event = destroyEvents[i]
|
||||
embedder.once(event, destroy)
|
||||
|
||||
// Users might also listen to the crashed event, so We must ensure the guest
|
||||
// is destroyed before users' listener gets called. It is done by moving our
|
||||
// listener to the first one in queue.
|
||||
listeners = embedder._events[event];
|
||||
listeners = embedder._events[event]
|
||||
if (Array.isArray(listeners)) {
|
||||
moveLastToFirst(listeners);
|
||||
moveLastToFirst(listeners)
|
||||
}
|
||||
}
|
||||
guest.once('destroyed', function () {
|
||||
var j, len1, results;
|
||||
results = [];
|
||||
var j, len1, results
|
||||
results = []
|
||||
for (j = 0, len1 = destroyEvents.length; j < len1; j++) {
|
||||
event = destroyEvents[j];
|
||||
results.push(embedder.removeListener(event, destroy));
|
||||
event = destroyEvents[j]
|
||||
results.push(embedder.removeListener(event, destroy))
|
||||
}
|
||||
return results;
|
||||
});
|
||||
return results
|
||||
})
|
||||
|
||||
// Init guest web view after attached.
|
||||
guest.once('did-attach', function () {
|
||||
var opts;
|
||||
params = this.attachParams;
|
||||
delete this.attachParams;
|
||||
this.viewInstanceId = params.instanceId;
|
||||
var opts
|
||||
params = this.attachParams
|
||||
delete this.attachParams
|
||||
this.viewInstanceId = params.instanceId
|
||||
this.setSize({
|
||||
normal: {
|
||||
width: params.elementWidth,
|
||||
|
@ -120,61 +120,60 @@ var createGuest = function(embedder, params) {
|
|||
width: params.maxwidth,
|
||||
height: params.maxheight
|
||||
}
|
||||
});
|
||||
})
|
||||
if (params.src) {
|
||||
opts = {};
|
||||
opts = {}
|
||||
if (params.httpreferrer) {
|
||||
opts.httpReferrer = params.httpreferrer;
|
||||
opts.httpReferrer = params.httpreferrer
|
||||
}
|
||||
if (params.useragent) {
|
||||
opts.userAgent = params.useragent;
|
||||
opts.userAgent = params.useragent
|
||||
}
|
||||
this.loadURL(params.src, opts);
|
||||
this.loadURL(params.src, opts)
|
||||
}
|
||||
return guest.allowPopups = params.allowpopups;
|
||||
});
|
||||
guest.allowPopups = params.allowpopups
|
||||
})
|
||||
|
||||
// Dispatch events to embedder.
|
||||
fn = function (event) {
|
||||
return guest.on(event, function (_, ...args) {
|
||||
return embedder.send.apply(embedder, ["ATOM_SHELL_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-" + guest.viewInstanceId, event].concat(args));
|
||||
});
|
||||
};
|
||||
return embedder.send.apply(embedder, ['ATOM_SHELL_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-' + guest.viewInstanceId, event].concat(args))
|
||||
})
|
||||
}
|
||||
for (j = 0, len1 = supportedWebViewEvents.length; j < len1; j++) {
|
||||
event = supportedWebViewEvents[j];
|
||||
fn(event);
|
||||
event = supportedWebViewEvents[j]
|
||||
fn(event)
|
||||
}
|
||||
|
||||
// Dispatch guest's IPC messages to embedder.
|
||||
guest.on('ipc-message-host', function (_, [channel, ...args]) {
|
||||
return embedder.send.apply(embedder, ["ATOM_SHELL_GUEST_VIEW_INTERNAL_IPC_MESSAGE-" + guest.viewInstanceId, channel].concat(args));
|
||||
});
|
||||
return embedder.send.apply(embedder, ['ATOM_SHELL_GUEST_VIEW_INTERNAL_IPC_MESSAGE-' + guest.viewInstanceId, channel].concat(args))
|
||||
})
|
||||
|
||||
// Autosize.
|
||||
guest.on('size-changed', function (_, ...args) {
|
||||
return embedder.send.apply(embedder, ["ATOM_SHELL_GUEST_VIEW_INTERNAL_SIZE_CHANGED-" + guest.viewInstanceId].concat(args));
|
||||
});
|
||||
return id;
|
||||
};
|
||||
return embedder.send.apply(embedder, ['ATOM_SHELL_GUEST_VIEW_INTERNAL_SIZE_CHANGED-' + guest.viewInstanceId].concat(args))
|
||||
})
|
||||
return id
|
||||
}
|
||||
|
||||
// Attach the guest to an element of embedder.
|
||||
var attachGuest = function (embedder, elementInstanceId, guestInstanceId, params) {
|
||||
var guest, key, oldGuestInstanceId, ref1, webPreferences;
|
||||
guest = guestInstances[guestInstanceId].guest;
|
||||
var guest, key, oldGuestInstanceId, ref1, webPreferences
|
||||
guest = guestInstances[guestInstanceId].guest
|
||||
|
||||
// Destroy the old guest when attaching.
|
||||
key = (embedder.getId()) + "-" + elementInstanceId;
|
||||
oldGuestInstanceId = embedderElementsMap[key];
|
||||
key = (embedder.getId()) + '-' + elementInstanceId
|
||||
oldGuestInstanceId = embedderElementsMap[key]
|
||||
if (oldGuestInstanceId != null) {
|
||||
|
||||
// Reattachment to the same guest is not currently supported.
|
||||
if (oldGuestInstanceId === guestInstanceId) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
if (guestInstances[oldGuestInstanceId] == null) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
destroyGuest(embedder, oldGuestInstanceId);
|
||||
destroyGuest(embedder, oldGuestInstanceId)
|
||||
}
|
||||
webPreferences = {
|
||||
guestInstanceId: guestInstanceId,
|
||||
|
@ -182,54 +181,54 @@ var attachGuest = function(embedder, elementInstanceId, guestInstanceId, params)
|
|||
plugins: params.plugins,
|
||||
webSecurity: !params.disablewebsecurity,
|
||||
blinkFeatures: params.blinkfeatures
|
||||
};
|
||||
if (params.preload) {
|
||||
webPreferences.preloadURL = params.preload;
|
||||
}
|
||||
webViewManager.addGuest(guestInstanceId, elementInstanceId, embedder, guest, webPreferences);
|
||||
guest.attachParams = params;
|
||||
embedderElementsMap[key] = guestInstanceId;
|
||||
return reverseEmbedderElementsMap[guestInstanceId] = key;
|
||||
};
|
||||
if (params.preload) {
|
||||
webPreferences.preloadURL = params.preload
|
||||
}
|
||||
webViewManager.addGuest(guestInstanceId, elementInstanceId, embedder, guest, webPreferences)
|
||||
guest.attachParams = params
|
||||
embedderElementsMap[key] = guestInstanceId
|
||||
reverseEmbedderElementsMap[guestInstanceId] = key
|
||||
}
|
||||
|
||||
// Destroy an existing guest instance.
|
||||
var destroyGuest = function (embedder, id) {
|
||||
var key;
|
||||
webViewManager.removeGuest(embedder, id);
|
||||
guestInstances[id].guest.destroy();
|
||||
delete guestInstances[id];
|
||||
key = reverseEmbedderElementsMap[id];
|
||||
var key
|
||||
webViewManager.removeGuest(embedder, id)
|
||||
guestInstances[id].guest.destroy()
|
||||
delete guestInstances[id]
|
||||
key = reverseEmbedderElementsMap[id]
|
||||
if (key != null) {
|
||||
delete reverseEmbedderElementsMap[id];
|
||||
return delete embedderElementsMap[key];
|
||||
delete reverseEmbedderElementsMap[id]
|
||||
return delete embedderElementsMap[key]
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
ipcMain.on('ATOM_SHELL_GUEST_VIEW_MANAGER_CREATE_GUEST', function (event, params, requestId) {
|
||||
return event.sender.send("ATOM_SHELL_RESPONSE_" + requestId, createGuest(event.sender, params));
|
||||
});
|
||||
return event.sender.send('ATOM_SHELL_RESPONSE_' + requestId, createGuest(event.sender, params))
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_SHELL_GUEST_VIEW_MANAGER_ATTACH_GUEST', function (event, elementInstanceId, guestInstanceId, params) {
|
||||
return attachGuest(event.sender, elementInstanceId, guestInstanceId, params);
|
||||
});
|
||||
return attachGuest(event.sender, elementInstanceId, guestInstanceId, params)
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_SHELL_GUEST_VIEW_MANAGER_DESTROY_GUEST', function (event, id) {
|
||||
return destroyGuest(event.sender, id);
|
||||
});
|
||||
return destroyGuest(event.sender, id)
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_SHELL_GUEST_VIEW_MANAGER_SET_SIZE', function (event, id, params) {
|
||||
var ref1;
|
||||
return (ref1 = guestInstances[id]) != null ? ref1.guest.setSize(params) : void 0;
|
||||
});
|
||||
var ref1
|
||||
return (ref1 = guestInstances[id]) != null ? ref1.guest.setSize(params) : void 0
|
||||
})
|
||||
|
||||
// Returns WebContents from its guest id.
|
||||
exports.getGuest = function (id) {
|
||||
var ref1;
|
||||
return (ref1 = guestInstances[id]) != null ? ref1.guest : void 0;
|
||||
};
|
||||
var ref1
|
||||
return (ref1 = guestInstances[id]) != null ? ref1.guest : void 0
|
||||
}
|
||||
|
||||
// Returns the embedder of the guest.
|
||||
exports.getEmbedder = function (id) {
|
||||
var ref1;
|
||||
return (ref1 = guestInstances[id]) != null ? ref1.embedder : void 0;
|
||||
};
|
||||
var ref1
|
||||
return (ref1 = guestInstances[id]) != null ? ref1.embedder : void 0
|
||||
}
|
||||
|
|
|
@ -1,120 +1,118 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const ipcMain = require('electron').ipcMain;
|
||||
const BrowserWindow = require('electron').BrowserWindow;
|
||||
const ipcMain = require('electron').ipcMain
|
||||
const BrowserWindow = require('electron').BrowserWindow
|
||||
|
||||
var hasProp = {}.hasOwnProperty;
|
||||
var frameToGuest = {};
|
||||
var hasProp = {}.hasOwnProperty
|
||||
var frameToGuest = {}
|
||||
|
||||
// Copy attribute of |parent| to |child| if it is not defined in |child|.
|
||||
var mergeOptions = function (child, parent) {
|
||||
var key, value;
|
||||
var key, value
|
||||
for (key in parent) {
|
||||
if (!hasProp.call(parent, key)) continue;
|
||||
value = parent[key];
|
||||
if (!hasProp.call(parent, key)) continue
|
||||
value = parent[key]
|
||||
if (!(key in child)) {
|
||||
if (typeof value === 'object') {
|
||||
child[key] = mergeOptions({}, value);
|
||||
child[key] = mergeOptions({}, value)
|
||||
} else {
|
||||
child[key] = value;
|
||||
child[key] = value
|
||||
}
|
||||
}
|
||||
}
|
||||
return child;
|
||||
};
|
||||
return child
|
||||
}
|
||||
|
||||
// Merge |options| with the |embedder|'s window's options.
|
||||
var mergeBrowserWindowOptions = function (embedder, options) {
|
||||
if (embedder.browserWindowOptions != null) {
|
||||
|
||||
// Inherit the original options if it is a BrowserWindow.
|
||||
mergeOptions(options, embedder.browserWindowOptions);
|
||||
mergeOptions(options, embedder.browserWindowOptions)
|
||||
} else {
|
||||
|
||||
// Or only inherit web-preferences if it is a webview.
|
||||
if (options.webPreferences == null) {
|
||||
options.webPreferences = {};
|
||||
options.webPreferences = {}
|
||||
}
|
||||
mergeOptions(options.webPreferences, embedder.getWebPreferences());
|
||||
mergeOptions(options.webPreferences, embedder.getWebPreferences())
|
||||
}
|
||||
return options
|
||||
}
|
||||
return options;
|
||||
};
|
||||
|
||||
// Create a new guest created by |embedder| with |options|.
|
||||
var createGuest = function (embedder, url, frameName, options) {
|
||||
var closedByEmbedder, closedByUser, guest, guestId, ref1;
|
||||
guest = frameToGuest[frameName];
|
||||
var closedByEmbedder, closedByUser, guest, guestId, ref1
|
||||
guest = frameToGuest[frameName]
|
||||
if (frameName && (guest != null)) {
|
||||
guest.loadURL(url);
|
||||
return guest.id;
|
||||
guest.loadURL(url)
|
||||
return guest.id
|
||||
}
|
||||
|
||||
// Remember the embedder window's id.
|
||||
if (options.webPreferences == null) {
|
||||
options.webPreferences = {};
|
||||
options.webPreferences = {}
|
||||
}
|
||||
options.webPreferences.openerId = (ref1 = BrowserWindow.fromWebContents(embedder)) != null ? ref1.id : void 0;
|
||||
guest = new BrowserWindow(options);
|
||||
guest.loadURL(url);
|
||||
options.webPreferences.openerId = (ref1 = BrowserWindow.fromWebContents(embedder)) != null ? ref1.id : void 0
|
||||
guest = new BrowserWindow(options)
|
||||
guest.loadURL(url)
|
||||
|
||||
// When |embedder| is destroyed we should also destroy attached guest, and if
|
||||
// guest is closed by user then we should prevent |embedder| from double
|
||||
// closing guest.
|
||||
guestId = guest.id;
|
||||
guestId = guest.id
|
||||
closedByEmbedder = function () {
|
||||
guest.removeListener('closed', closedByUser);
|
||||
return guest.destroy();
|
||||
};
|
||||
closedByUser = function() {
|
||||
embedder.send("ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_CLOSED_" + guestId);
|
||||
return embedder.removeListener('render-view-deleted', closedByEmbedder);
|
||||
};
|
||||
embedder.once('render-view-deleted', closedByEmbedder);
|
||||
guest.once('closed', closedByUser);
|
||||
if (frameName) {
|
||||
frameToGuest[frameName] = guest;
|
||||
guest.frameName = frameName;
|
||||
guest.once('closed', function() {
|
||||
return delete frameToGuest[frameName];
|
||||
});
|
||||
guest.removeListener('closed', closedByUser)
|
||||
return guest.destroy()
|
||||
}
|
||||
closedByUser = function () {
|
||||
embedder.send('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_CLOSED_' + guestId)
|
||||
return embedder.removeListener('render-view-deleted', closedByEmbedder)
|
||||
}
|
||||
embedder.once('render-view-deleted', closedByEmbedder)
|
||||
guest.once('closed', closedByUser)
|
||||
if (frameName) {
|
||||
frameToGuest[frameName] = guest
|
||||
guest.frameName = frameName
|
||||
guest.once('closed', function () {
|
||||
return delete frameToGuest[frameName]
|
||||
})
|
||||
}
|
||||
return guest.id
|
||||
}
|
||||
return guest.id;
|
||||
};
|
||||
|
||||
// Routed window.open messages.
|
||||
ipcMain.on('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_OPEN', function (event, url, frameName, options) {
|
||||
options = mergeBrowserWindowOptions(event.sender, options);
|
||||
event.sender.emit('new-window', event, url, frameName, 'new-window', options);
|
||||
options = mergeBrowserWindowOptions(event.sender, options)
|
||||
event.sender.emit('new-window', event, url, frameName, 'new-window', options)
|
||||
if ((event.sender.isGuest() && !event.sender.allowPopups) || event.defaultPrevented) {
|
||||
return event.returnValue = null;
|
||||
event.returnValue = null
|
||||
} else {
|
||||
return event.returnValue = createGuest(event.sender, url, frameName, options);
|
||||
event.returnValue = createGuest(event.sender, url, frameName, options)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_CLOSE', function (event, guestId) {
|
||||
var ref1;
|
||||
return (ref1 = BrowserWindow.fromId(guestId)) != null ? ref1.destroy() : void 0;
|
||||
});
|
||||
var ref1
|
||||
return (ref1 = BrowserWindow.fromId(guestId)) != null ? ref1.destroy() : void 0
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_METHOD', function (event, guestId, method, ...args) {
|
||||
var ref1;
|
||||
return event.returnValue = (ref1 = BrowserWindow.fromId(guestId)) != null ? ref1[method].apply(ref1, args) : void 0;
|
||||
});
|
||||
var ref1
|
||||
event.returnValue = (ref1 = BrowserWindow.fromId(guestId)) != null ? ref1[method].apply(ref1, args) : void 0
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_POSTMESSAGE', function (event, guestId, message, targetOrigin, sourceOrigin) {
|
||||
var guestContents, ref1, ref2, sourceId;
|
||||
sourceId = (ref1 = BrowserWindow.fromWebContents(event.sender)) != null ? ref1.id : void 0;
|
||||
var guestContents, ref1, ref2, sourceId
|
||||
sourceId = (ref1 = BrowserWindow.fromWebContents(event.sender)) != null ? ref1.id : void 0
|
||||
if (sourceId == null) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
guestContents = (ref2 = BrowserWindow.fromId(guestId)) != null ? ref2.webContents : void 0;
|
||||
guestContents = (ref2 = BrowserWindow.fromId(guestId)) != null ? ref2.webContents : void 0
|
||||
if ((guestContents != null ? guestContents.getURL().indexOf(targetOrigin) : void 0) === 0 || targetOrigin === '*') {
|
||||
return guestContents != null ? guestContents.send('ATOM_SHELL_GUEST_WINDOW_POSTMESSAGE', sourceId, message, sourceOrigin) : void 0;
|
||||
return guestContents != null ? guestContents.send('ATOM_SHELL_GUEST_WINDOW_POSTMESSAGE', sourceId, message, sourceOrigin) : void 0
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_SHELL_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD', function (event, guestId, method, ...args) {
|
||||
var ref1, ref2;
|
||||
return (ref1 = BrowserWindow.fromId(guestId)) != null ? (ref2 = ref1.webContents) != null ? ref2[method].apply(ref2, args) : void 0 : void 0;
|
||||
});
|
||||
var ref1, ref2
|
||||
return (ref1 = BrowserWindow.fromId(guestId)) != null ? (ref2 = ref1.webContents) != null ? ref2[method].apply(ref2, args) : void 0 : void 0
|
||||
})
|
||||
|
|
|
@ -1,80 +1,79 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const util = require('util');
|
||||
const Module = require('module');
|
||||
const v8 = require('v8');
|
||||
const fs = require('fs')
|
||||
const path = require('path')
|
||||
const util = require('util')
|
||||
const Module = require('module')
|
||||
const v8 = require('v8')
|
||||
|
||||
// We modified the original process.argv to let node.js load the atom.js,
|
||||
// we need to restore it here.
|
||||
process.argv.splice(1, 1);
|
||||
process.argv.splice(1, 1)
|
||||
|
||||
// Clear search paths.
|
||||
require('../common/reset-search-paths');
|
||||
require('../common/reset-search-paths')
|
||||
|
||||
// Import common settings.
|
||||
require('../common/init');
|
||||
require('../common/init')
|
||||
|
||||
var globalPaths = Module.globalPaths;
|
||||
var globalPaths = Module.globalPaths
|
||||
|
||||
if (!process.env.ELECTRON_HIDE_INTERNAL_MODULES) {
|
||||
globalPaths.push(path.join(__dirname, 'api'));
|
||||
globalPaths.push(path.join(__dirname, 'api'))
|
||||
}
|
||||
|
||||
// Expose public APIs.
|
||||
globalPaths.push(path.join(__dirname, 'api', 'exports'));
|
||||
globalPaths.push(path.join(__dirname, 'api', 'exports'))
|
||||
|
||||
if (process.platform === 'win32') {
|
||||
// Redirect node's console to use our own implementations, since node can not
|
||||
// handle console output when running as GUI program.
|
||||
var consoleLog = function (...args) {
|
||||
return process.log(util.format.apply(util, args) + "\n");
|
||||
};
|
||||
return process.log(util.format.apply(util, args) + '\n')
|
||||
}
|
||||
var streamWrite = function (chunk, encoding, callback) {
|
||||
if (Buffer.isBuffer(chunk)) {
|
||||
chunk = chunk.toString(encoding);
|
||||
chunk = chunk.toString(encoding)
|
||||
}
|
||||
process.log(chunk);
|
||||
process.log(chunk)
|
||||
if (callback) {
|
||||
callback();
|
||||
callback()
|
||||
}
|
||||
return true;
|
||||
};
|
||||
console.log = console.error = console.warn = consoleLog;
|
||||
process.stdout.write = process.stderr.write = streamWrite;
|
||||
return true
|
||||
}
|
||||
console.log = console.error = console.warn = consoleLog
|
||||
process.stdout.write = process.stderr.write = streamWrite
|
||||
|
||||
// Always returns EOF for stdin stream.
|
||||
var Readable = require('stream').Readable;
|
||||
var stdin = new Readable;
|
||||
stdin.push(null);
|
||||
var Readable = require('stream').Readable
|
||||
var stdin = new Readable()
|
||||
stdin.push(null)
|
||||
process.__defineGetter__('stdin', function () {
|
||||
return stdin;
|
||||
});
|
||||
return stdin
|
||||
})
|
||||
}
|
||||
|
||||
// Don't quit on fatal error.
|
||||
process.on('uncaughtException', function (error) {
|
||||
|
||||
// Do nothing if the user has a custom uncaught exception handler.
|
||||
var dialog, message, ref, stack;
|
||||
var dialog, message, ref, stack
|
||||
if (process.listeners('uncaughtException').length > 1) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
|
||||
// Show error in GUI.
|
||||
dialog = require('electron').dialog;
|
||||
stack = (ref = error.stack) != null ? ref : error.name + ": " + error.message;
|
||||
message = "Uncaught Exception:\n" + stack;
|
||||
return dialog.showErrorBox('A JavaScript error occurred in the main process', message);
|
||||
});
|
||||
dialog = require('electron').dialog
|
||||
stack = (ref = error.stack) != null ? ref : error.name + ': ' + error.message
|
||||
message = 'Uncaught Exception:\n' + stack
|
||||
return dialog.showErrorBox('A JavaScript error occurred in the main process', message)
|
||||
})
|
||||
|
||||
// Emit 'exit' event on quit.
|
||||
var app = require('electron').app;
|
||||
var app = require('electron').app
|
||||
|
||||
app.on('quit', function (event, exitCode) {
|
||||
return process.emit('exit', exitCode);
|
||||
});
|
||||
return process.emit('exit', exitCode)
|
||||
})
|
||||
|
||||
if (process.platform === 'win32') {
|
||||
// If we are a Squirrel.Windows-installed app, set app user model ID
|
||||
|
@ -94,92 +93,92 @@ if (process.platform === 'win32') {
|
|||
var updateDotExe = path.join(
|
||||
path.dirname(process.execPath),
|
||||
'..',
|
||||
'update.exe');
|
||||
'update.exe')
|
||||
|
||||
if (fs.statSyncNoException(updateDotExe)) {
|
||||
var packageDir = path.dirname(path.resolve(updateDotExe));
|
||||
var packageName = path.basename(packageDir);
|
||||
var exeName = path.basename(process.execPath).replace(/\.exe$/i, '');
|
||||
var packageDir = path.dirname(path.resolve(updateDotExe))
|
||||
var packageName = path.basename(packageDir)
|
||||
var exeName = path.basename(process.execPath).replace(/\.exe$/i, '')
|
||||
|
||||
app.setAppUserModelId(`com.squirrel.${packageName}.${exeName}`);
|
||||
app.setAppUserModelId(`com.squirrel.${packageName}.${exeName}`)
|
||||
}
|
||||
}
|
||||
|
||||
// Map process.exit to app.exit, which quits gracefully.
|
||||
process.exit = app.exit;
|
||||
process.exit = app.exit
|
||||
|
||||
// Load the RPC server.
|
||||
require('./rpc-server');
|
||||
require('./rpc-server')
|
||||
|
||||
// Load the guest view manager.
|
||||
require('./guest-view-manager');
|
||||
require('./guest-view-manager')
|
||||
|
||||
require('./guest-window-manager');
|
||||
require('./guest-window-manager')
|
||||
|
||||
// Now we try to load app's package.json.
|
||||
var packageJson = null;
|
||||
var searchPaths = ['app', 'app.asar', 'default_app'];
|
||||
var i, len, packagePath;
|
||||
var packageJson = null
|
||||
var searchPaths = ['app', 'app.asar', 'default_app']
|
||||
var i, len, packagePath
|
||||
for (i = 0, len = searchPaths.length; i < len; i++) {
|
||||
packagePath = searchPaths[i];
|
||||
packagePath = searchPaths[i]
|
||||
try {
|
||||
packagePath = path.join(process.resourcesPath, packagePath);
|
||||
packageJson = JSON.parse(fs.readFileSync(path.join(packagePath, 'package.json')));
|
||||
break;
|
||||
packagePath = path.join(process.resourcesPath, packagePath)
|
||||
packageJson = JSON.parse(fs.readFileSync(path.join(packagePath, 'package.json')))
|
||||
break
|
||||
} catch (error) {
|
||||
continue;
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
||||
if (packageJson == null) {
|
||||
process.nextTick(function () {
|
||||
return process.exit(1);
|
||||
});
|
||||
throw new Error("Unable to find a valid app");
|
||||
return process.exit(1)
|
||||
})
|
||||
throw new Error('Unable to find a valid app')
|
||||
}
|
||||
|
||||
// Set application's version.
|
||||
if (packageJson.version != null) {
|
||||
app.setVersion(packageJson.version);
|
||||
app.setVersion(packageJson.version)
|
||||
}
|
||||
|
||||
// Set application's name.
|
||||
if (packageJson.productName != null) {
|
||||
app.setName(packageJson.productName);
|
||||
app.setName(packageJson.productName)
|
||||
} else if (packageJson.name != null) {
|
||||
app.setName(packageJson.name);
|
||||
app.setName(packageJson.name)
|
||||
}
|
||||
|
||||
// Set application's desktop name.
|
||||
if (packageJson.desktopName != null) {
|
||||
app.setDesktopName(packageJson.desktopName);
|
||||
app.setDesktopName(packageJson.desktopName)
|
||||
} else {
|
||||
app.setDesktopName((app.getName()) + ".desktop");
|
||||
app.setDesktopName((app.getName()) + '.desktop')
|
||||
}
|
||||
|
||||
// Set v8 flags
|
||||
if (packageJson.v8Flags != null) {
|
||||
v8.setFlagsFromString(packageJson.v8Flags);
|
||||
v8.setFlagsFromString(packageJson.v8Flags)
|
||||
}
|
||||
|
||||
// Chrome 42 disables NPAPI plugins by default, reenable them here
|
||||
app.commandLine.appendSwitch('enable-npapi');
|
||||
app.commandLine.appendSwitch('enable-npapi')
|
||||
|
||||
// Set the user path according to application's name.
|
||||
app.setPath('userData', path.join(app.getPath('appData'), app.getName()));
|
||||
app.setPath('userData', path.join(app.getPath('appData'), app.getName()))
|
||||
|
||||
app.setPath('userCache', path.join(app.getPath('cache'), app.getName()));
|
||||
app.setPath('userCache', path.join(app.getPath('cache'), app.getName()))
|
||||
|
||||
app.setAppPath(packagePath);
|
||||
app.setAppPath(packagePath)
|
||||
|
||||
// Load the chrome extension support.
|
||||
require('./chrome-extension');
|
||||
require('./chrome-extension')
|
||||
|
||||
// Load internal desktop-capturer module.
|
||||
require('./desktop-capturer');
|
||||
require('./desktop-capturer')
|
||||
|
||||
// Set main startup script of the app.
|
||||
var mainStartupScript = packageJson.main || 'index.js';
|
||||
var mainStartupScript = packageJson.main || 'index.js'
|
||||
|
||||
// Finally load app's main.js and transfer control to C++.
|
||||
Module._load(path.join(packagePath, mainStartupScript), Module, true);
|
||||
Module._load(path.join(packagePath, mainStartupScript), Module, true)
|
||||
|
|
|
@ -1,94 +1,94 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const v8Util = process.atomBinding('v8_util');
|
||||
const v8Util = process.atomBinding('v8_util')
|
||||
|
||||
class ObjectsRegistry {
|
||||
constructor () {
|
||||
this.nextId = 0;
|
||||
this.nextId = 0
|
||||
|
||||
// Stores all objects by ref-counting.
|
||||
// (id) => {object, count}
|
||||
this.storage = {};
|
||||
this.storage = {}
|
||||
|
||||
// Stores the IDs of objects referenced by WebContents.
|
||||
// (webContentsId) => [id]
|
||||
this.owners = {};
|
||||
this.owners = {}
|
||||
}
|
||||
|
||||
// Register a new object and return its assigned ID. If the object is already
|
||||
// registered then the already assigned ID would be returned.
|
||||
add (webContents, obj) {
|
||||
// Get or assign an ID to the object.
|
||||
let id = this.saveToStorage(obj);
|
||||
let id = this.saveToStorage(obj)
|
||||
|
||||
// Add object to the set of referenced objects.
|
||||
let webContentsId = webContents.getId();
|
||||
let owner = this.owners[webContentsId];
|
||||
let webContentsId = webContents.getId()
|
||||
let owner = this.owners[webContentsId]
|
||||
if (!owner) {
|
||||
owner = this.owners[webContentsId] = new Set();
|
||||
owner = this.owners[webContentsId] = new Set()
|
||||
// Clear the storage when webContents is reloaded/navigated.
|
||||
webContents.once('render-view-deleted', (event, id) => {
|
||||
this.clear(id);
|
||||
});
|
||||
this.clear(id)
|
||||
})
|
||||
}
|
||||
if (!owner.has(id)) {
|
||||
owner.add(id);
|
||||
owner.add(id)
|
||||
// Increase reference count if not referenced before.
|
||||
this.storage[id].count++;
|
||||
this.storage[id].count++
|
||||
}
|
||||
return id;
|
||||
return id
|
||||
}
|
||||
|
||||
// Get an object according to its ID.
|
||||
get (id) {
|
||||
return this.storage[id].object;
|
||||
return this.storage[id].object
|
||||
}
|
||||
|
||||
// Dereference an object according to its ID.
|
||||
remove (webContentsId, id) {
|
||||
// Dereference from the storage.
|
||||
this.dereference(id);
|
||||
this.dereference(id)
|
||||
|
||||
// Also remove the reference in owner.
|
||||
this.owners[webContentsId].delete(id);
|
||||
this.owners[webContentsId].delete(id)
|
||||
}
|
||||
|
||||
// Clear all references to objects refrenced by the WebContents.
|
||||
clear (webContentsId) {
|
||||
let owner = this.owners[webContentsId];
|
||||
if (!owner)
|
||||
return;
|
||||
for (let id of owner)
|
||||
this.dereference(id);
|
||||
delete this.owners[webContentsId];
|
||||
let owner = this.owners[webContentsId]
|
||||
if (!owner) return
|
||||
|
||||
for (let id of owner) this.dereference(id)
|
||||
|
||||
delete this.owners[webContentsId]
|
||||
}
|
||||
|
||||
// Private: Saves the object into storage and assigns an ID for it.
|
||||
saveToStorage (object) {
|
||||
let id = v8Util.getHiddenValue(object, 'atomId');
|
||||
let id = v8Util.getHiddenValue(object, 'atomId')
|
||||
if (!id) {
|
||||
id = ++this.nextId;
|
||||
id = ++this.nextId
|
||||
this.storage[id] = {
|
||||
count: 0,
|
||||
object: object
|
||||
};
|
||||
v8Util.setHiddenValue(object, 'atomId', id);
|
||||
}
|
||||
return id;
|
||||
v8Util.setHiddenValue(object, 'atomId', id)
|
||||
}
|
||||
return id
|
||||
}
|
||||
|
||||
// Private: Dereference the object from store.
|
||||
dereference (id) {
|
||||
let pointer = this.storage[id];
|
||||
let pointer = this.storage[id]
|
||||
if (pointer == null) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
pointer.count -= 1;
|
||||
pointer.count -= 1
|
||||
if (pointer.count === 0) {
|
||||
v8Util.deleteHiddenValue(pointer.object, 'atomId');
|
||||
return delete this.storage[id];
|
||||
v8Util.deleteHiddenValue(pointer.object, 'atomId')
|
||||
return delete this.storage[id]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = new ObjectsRegistry;
|
||||
module.exports = new ObjectsRegistry()
|
||||
|
|
|
@ -1,128 +1,126 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const electron = require('electron');
|
||||
const ipcMain = electron.ipcMain;
|
||||
const objectsRegistry = require('./objects-registry');
|
||||
const v8Util = process.atomBinding('v8_util');
|
||||
const IDWeakMap = process.atomBinding('id_weak_map').IDWeakMap;
|
||||
const electron = require('electron')
|
||||
const ipcMain = electron.ipcMain
|
||||
const objectsRegistry = require('./objects-registry')
|
||||
const v8Util = process.atomBinding('v8_util')
|
||||
const IDWeakMap = process.atomBinding('id_weak_map').IDWeakMap
|
||||
|
||||
// The internal properties of Function.
|
||||
const FUNCTION_PROPERTIES = [
|
||||
'length', 'name', 'arguments', 'caller', 'prototype',
|
||||
];
|
||||
'length', 'name', 'arguments', 'caller', 'prototype'
|
||||
]
|
||||
|
||||
// The remote functions in renderer processes.
|
||||
// (webContentsId) => {id: Function}
|
||||
let rendererFunctions = {};
|
||||
let rendererFunctions = {}
|
||||
|
||||
// Return the description of object's members:
|
||||
let getObjectMembers = function (object) {
|
||||
let names = Object.getOwnPropertyNames(object);
|
||||
let names = Object.getOwnPropertyNames(object)
|
||||
// For Function, we should not override following properties even though they
|
||||
// are "own" properties.
|
||||
if (typeof object === 'function') {
|
||||
names = names.filter((name) => {
|
||||
return !FUNCTION_PROPERTIES.includes(name);
|
||||
});
|
||||
return !FUNCTION_PROPERTIES.includes(name)
|
||||
})
|
||||
}
|
||||
// Map properties to descriptors.
|
||||
return names.map((name) => {
|
||||
let descriptor = Object.getOwnPropertyDescriptor(object, name);
|
||||
let member = {name, enumerable: descriptor.enumerable, writable: false};
|
||||
let descriptor = Object.getOwnPropertyDescriptor(object, name)
|
||||
let member = {name, enumerable: descriptor.enumerable, writable: false}
|
||||
if (descriptor.get === undefined && typeof object[name] === 'function') {
|
||||
member.type = 'method';
|
||||
member.type = 'method'
|
||||
} else {
|
||||
if (descriptor.set || descriptor.writable)
|
||||
member.writable = true;
|
||||
member.type = 'get';
|
||||
if (descriptor.set || descriptor.writable) member.writable = true
|
||||
member.type = 'get'
|
||||
}
|
||||
return member
|
||||
})
|
||||
}
|
||||
return member;
|
||||
});
|
||||
};
|
||||
|
||||
// Return the description of object's prototype.
|
||||
let getObjectPrototype = function (object) {
|
||||
let proto = Object.getPrototypeOf(object);
|
||||
if (proto === null || proto === Object.prototype)
|
||||
return null;
|
||||
let proto = Object.getPrototypeOf(object)
|
||||
if (proto === null || proto === Object.prototype) return null
|
||||
return {
|
||||
members: getObjectMembers(proto),
|
||||
proto: getObjectPrototype(proto),
|
||||
};
|
||||
};
|
||||
proto: getObjectPrototype(proto)
|
||||
}
|
||||
}
|
||||
|
||||
// Convert a real value into meta data.
|
||||
var valueToMeta = function (sender, value, optimizeSimpleObject) {
|
||||
var el, i, len, meta;
|
||||
var el, i, len, meta
|
||||
if (optimizeSimpleObject == null) {
|
||||
optimizeSimpleObject = false;
|
||||
optimizeSimpleObject = false
|
||||
}
|
||||
meta = {
|
||||
type: typeof value
|
||||
};
|
||||
}
|
||||
if (Buffer.isBuffer(value)) {
|
||||
meta.type = 'buffer';
|
||||
meta.type = 'buffer'
|
||||
}
|
||||
if (value === null) {
|
||||
meta.type = 'value';
|
||||
meta.type = 'value'
|
||||
}
|
||||
if (Array.isArray(value)) {
|
||||
meta.type = 'array';
|
||||
meta.type = 'array'
|
||||
}
|
||||
if (value instanceof Error) {
|
||||
meta.type = 'error';
|
||||
meta.type = 'error'
|
||||
}
|
||||
if (value instanceof Date) {
|
||||
meta.type = 'date';
|
||||
meta.type = 'date'
|
||||
}
|
||||
if ((value != null ? value.constructor.name : void 0) === 'Promise') {
|
||||
meta.type = 'promise';
|
||||
meta.type = 'promise'
|
||||
}
|
||||
|
||||
// Treat simple objects as value.
|
||||
if (optimizeSimpleObject && meta.type === 'object' && v8Util.getHiddenValue(value, 'simple')) {
|
||||
meta.type = 'value';
|
||||
meta.type = 'value'
|
||||
}
|
||||
|
||||
// Treat the arguments object as array.
|
||||
if (meta.type === 'object' && (value.hasOwnProperty('callee')) && (value.length != null)) {
|
||||
meta.type = 'array';
|
||||
meta.type = 'array'
|
||||
}
|
||||
if (meta.type === 'array') {
|
||||
meta.members = [];
|
||||
meta.members = []
|
||||
for (i = 0, len = value.length; i < len; i++) {
|
||||
el = value[i];
|
||||
meta.members.push(valueToMeta(sender, el));
|
||||
el = value[i]
|
||||
meta.members.push(valueToMeta(sender, el))
|
||||
}
|
||||
} else if (meta.type === 'object' || meta.type === 'function') {
|
||||
meta.name = value.constructor.name;
|
||||
meta.name = value.constructor.name
|
||||
|
||||
// Reference the original value if it's an object, because when it's
|
||||
// passed to renderer we would assume the renderer keeps a reference of
|
||||
// it.
|
||||
meta.id = objectsRegistry.add(sender, value);
|
||||
meta.members = getObjectMembers(value);
|
||||
meta.proto = getObjectPrototype(value);
|
||||
meta.id = objectsRegistry.add(sender, value)
|
||||
meta.members = getObjectMembers(value)
|
||||
meta.proto = getObjectPrototype(value)
|
||||
} else if (meta.type === 'buffer') {
|
||||
meta.value = Array.prototype.slice.call(value, 0);
|
||||
meta.value = Array.prototype.slice.call(value, 0)
|
||||
} else if (meta.type === 'promise') {
|
||||
meta.then = valueToMeta(sender, function(v) { value.then(v); });
|
||||
meta.then = valueToMeta(sender, function (v) { value.then(v) })
|
||||
} else if (meta.type === 'error') {
|
||||
meta.members = plainObjectToMeta(value);
|
||||
meta.members = plainObjectToMeta(value)
|
||||
|
||||
// Error.name is not part of own properties.
|
||||
meta.members.push({
|
||||
name: 'name',
|
||||
value: value.name
|
||||
});
|
||||
})
|
||||
} else if (meta.type === 'date') {
|
||||
meta.value = value.getTime();
|
||||
meta.value = value.getTime()
|
||||
} else {
|
||||
meta.type = 'value';
|
||||
meta.value = value;
|
||||
meta.type = 'value'
|
||||
meta.value = value
|
||||
}
|
||||
return meta
|
||||
}
|
||||
return meta;
|
||||
};
|
||||
|
||||
// Convert object to meta by value.
|
||||
var plainObjectToMeta = function (obj) {
|
||||
|
@ -130,9 +128,9 @@ var plainObjectToMeta = function(obj) {
|
|||
return {
|
||||
name: name,
|
||||
value: obj[name]
|
||||
};
|
||||
});
|
||||
};
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// Convert Error into meta data.
|
||||
var exceptionToMeta = function (error) {
|
||||
|
@ -140,232 +138,233 @@ var exceptionToMeta = function(error) {
|
|||
type: 'exception',
|
||||
message: error.message,
|
||||
stack: error.stack || error
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
// Convert array of meta data from renderer into array of real values.
|
||||
var unwrapArgs = function (sender, args) {
|
||||
var metaToValue;
|
||||
var metaToValue
|
||||
metaToValue = function (meta) {
|
||||
var i, len, member, ref, returnValue;
|
||||
var i, len, member, ref, returnValue
|
||||
switch (meta.type) {
|
||||
case 'value':
|
||||
return meta.value;
|
||||
return meta.value
|
||||
case 'remote-object':
|
||||
return objectsRegistry.get(meta.id);
|
||||
return objectsRegistry.get(meta.id)
|
||||
case 'array':
|
||||
return unwrapArgs(sender, meta.value);
|
||||
return unwrapArgs(sender, meta.value)
|
||||
case 'buffer':
|
||||
return new Buffer(meta.value);
|
||||
return new Buffer(meta.value)
|
||||
case 'date':
|
||||
return new Date(meta.value);
|
||||
return new Date(meta.value)
|
||||
case 'promise':
|
||||
return Promise.resolve({
|
||||
then: metaToValue(meta.then)
|
||||
});
|
||||
})
|
||||
case 'object': {
|
||||
let ret = {};
|
||||
Object.defineProperty(ret.constructor, 'name', { value: meta.name });
|
||||
let ret = {}
|
||||
Object.defineProperty(ret.constructor, 'name', { value: meta.name })
|
||||
|
||||
ref = meta.members;
|
||||
ref = meta.members
|
||||
for (i = 0, len = ref.length; i < len; i++) {
|
||||
member = ref[i];
|
||||
ret[member.name] = metaToValue(member.value);
|
||||
member = ref[i]
|
||||
ret[member.name] = metaToValue(member.value)
|
||||
}
|
||||
return ret;
|
||||
return ret
|
||||
}
|
||||
case 'function-with-return-value':
|
||||
returnValue = metaToValue(meta.value);
|
||||
returnValue = metaToValue(meta.value)
|
||||
return function () {
|
||||
return returnValue;
|
||||
};
|
||||
return returnValue
|
||||
}
|
||||
case 'function': {
|
||||
// Cache the callbacks in renderer.
|
||||
let webContentsId = sender.getId();
|
||||
let callbacks = rendererFunctions[webContentsId];
|
||||
let webContentsId = sender.getId()
|
||||
let callbacks = rendererFunctions[webContentsId]
|
||||
if (!callbacks) {
|
||||
callbacks = rendererFunctions[webContentsId] = new IDWeakMap;
|
||||
callbacks = rendererFunctions[webContentsId] = new IDWeakMap()
|
||||
sender.once('render-view-deleted', function (event, id) {
|
||||
callbacks.clear();
|
||||
delete rendererFunctions[id];
|
||||
});
|
||||
callbacks.clear()
|
||||
delete rendererFunctions[id]
|
||||
})
|
||||
}
|
||||
|
||||
if (callbacks.has(meta.id))
|
||||
return callbacks.get(meta.id);
|
||||
if (callbacks.has(meta.id)) return callbacks.get(meta.id)
|
||||
|
||||
let callIntoRenderer = function (...args) {
|
||||
if ((webContentsId in rendererFunctions) && !sender.isDestroyed())
|
||||
sender.send('ATOM_RENDERER_CALLBACK', meta.id, valueToMeta(sender, args));
|
||||
else
|
||||
throw new Error(`Attempting to call a function in a renderer window that has been closed or released. Function provided here: ${meta.location}.`);
|
||||
};
|
||||
if ((webContentsId in rendererFunctions) && !sender.isDestroyed()) {
|
||||
sender.send('ATOM_RENDERER_CALLBACK', meta.id, valueToMeta(sender, args))
|
||||
} else {
|
||||
throw new Error(`Attempting to call a function in a renderer window that has been closed or released. Function provided here: ${meta.location}.`)
|
||||
}
|
||||
}
|
||||
v8Util.setDestructor(callIntoRenderer, function () {
|
||||
if ((webContentsId in rendererFunctions) && !sender.isDestroyed())
|
||||
sender.send('ATOM_RENDERER_RELEASE_CALLBACK', meta.id);
|
||||
});
|
||||
callbacks.set(meta.id, callIntoRenderer);
|
||||
return callIntoRenderer;
|
||||
if ((webContentsId in rendererFunctions) && !sender.isDestroyed()) {
|
||||
sender.send('ATOM_RENDERER_RELEASE_CALLBACK', meta.id)
|
||||
}
|
||||
})
|
||||
callbacks.set(meta.id, callIntoRenderer)
|
||||
return callIntoRenderer
|
||||
}
|
||||
default:
|
||||
throw new TypeError("Unknown type: " + meta.type);
|
||||
throw new TypeError(`Unknown type: ${meta.type}`)
|
||||
}
|
||||
}
|
||||
return args.map(metaToValue)
|
||||
}
|
||||
};
|
||||
return args.map(metaToValue);
|
||||
};
|
||||
|
||||
// Call a function and send reply asynchronously if it's a an asynchronous
|
||||
// style function and the caller didn't pass a callback.
|
||||
var callFunction = function (event, func, caller, args) {
|
||||
var funcMarkedAsync, funcName, funcPassedCallback, ref, ret;
|
||||
funcMarkedAsync = v8Util.getHiddenValue(func, 'asynchronous');
|
||||
funcPassedCallback = typeof args[args.length - 1] === 'function';
|
||||
var funcMarkedAsync, funcName, funcPassedCallback, ref, ret
|
||||
funcMarkedAsync = v8Util.getHiddenValue(func, 'asynchronous')
|
||||
funcPassedCallback = typeof args[args.length - 1] === 'function'
|
||||
try {
|
||||
if (funcMarkedAsync && !funcPassedCallback) {
|
||||
args.push(function (ret) {
|
||||
return event.returnValue = valueToMeta(event.sender, ret, true);
|
||||
});
|
||||
return func.apply(caller, args);
|
||||
event.returnValue = valueToMeta(event.sender, ret, true)
|
||||
})
|
||||
return func.apply(caller, args)
|
||||
} else {
|
||||
ret = func.apply(caller, args);
|
||||
return event.returnValue = valueToMeta(event.sender, ret, true);
|
||||
ret = func.apply(caller, args)
|
||||
event.returnValue = valueToMeta(event.sender, ret, true)
|
||||
}
|
||||
} catch (error) {
|
||||
// Catch functions thrown further down in function invocation and wrap
|
||||
// them with the function name so it's easier to trace things like
|
||||
// `Error processing argument -1.`
|
||||
funcName = (ref = func.name) != null ? ref : "anonymous";
|
||||
throw new Error("Could not call remote function `" + funcName + "`. Check that the function signature is correct. Underlying error: " + error.message);
|
||||
funcName = ((ref = func.name) != null) ? ref : 'anonymous'
|
||||
throw new Error(`Could not call remote function '${funcName}'. Check that the function signature is correct. Underlying error: ${error.message}`)
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
ipcMain.on('ATOM_BROWSER_REQUIRE', function (event, module) {
|
||||
try {
|
||||
return event.returnValue = valueToMeta(event.sender, process.mainModule.require(module));
|
||||
event.returnValue = valueToMeta(event.sender, process.mainModule.require(module))
|
||||
} catch (error) {
|
||||
return event.returnValue = exceptionToMeta(error);
|
||||
event.returnValue = exceptionToMeta(error)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_BROWSER_GET_BUILTIN', function (event, module) {
|
||||
try {
|
||||
return event.returnValue = valueToMeta(event.sender, electron[module]);
|
||||
event.returnValue = valueToMeta(event.sender, electron[module])
|
||||
} catch (error) {
|
||||
return event.returnValue = exceptionToMeta(error);
|
||||
event.returnValue = exceptionToMeta(error)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_BROWSER_GLOBAL', function (event, name) {
|
||||
try {
|
||||
return event.returnValue = valueToMeta(event.sender, global[name]);
|
||||
event.returnValue = valueToMeta(event.sender, global[name])
|
||||
} catch (error) {
|
||||
return event.returnValue = exceptionToMeta(error);
|
||||
event.returnValue = exceptionToMeta(error)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_BROWSER_CURRENT_WINDOW', function (event) {
|
||||
try {
|
||||
return event.returnValue = valueToMeta(event.sender, event.sender.getOwnerBrowserWindow());
|
||||
event.returnValue = valueToMeta(event.sender, event.sender.getOwnerBrowserWindow())
|
||||
} catch (error) {
|
||||
return event.returnValue = exceptionToMeta(error);
|
||||
event.returnValue = exceptionToMeta(error)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_BROWSER_CURRENT_WEB_CONTENTS', function (event) {
|
||||
return event.returnValue = valueToMeta(event.sender, event.sender);
|
||||
});
|
||||
event.returnValue = valueToMeta(event.sender, event.sender)
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_BROWSER_CONSTRUCTOR', function (event, id, args) {
|
||||
try {
|
||||
args = unwrapArgs(event.sender, args);
|
||||
let constructor = objectsRegistry.get(id);
|
||||
args = unwrapArgs(event.sender, args)
|
||||
let constructor = objectsRegistry.get(id)
|
||||
|
||||
// Call new with array of arguments.
|
||||
// http://stackoverflow.com/questions/1606797/use-of-apply-with-new-operator-is-this-possible
|
||||
let obj = new (Function.prototype.bind.apply(constructor, [null].concat(args)));
|
||||
return event.returnValue = valueToMeta(event.sender, obj);
|
||||
let obj = new (Function.prototype.bind.apply(constructor, [null].concat(args)))
|
||||
event.returnValue = valueToMeta(event.sender, obj)
|
||||
} catch (error) {
|
||||
return event.returnValue = exceptionToMeta(error);
|
||||
event.returnValue = exceptionToMeta(error)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_BROWSER_FUNCTION_CALL', function (event, id, args) {
|
||||
try {
|
||||
args = unwrapArgs(event.sender, args);
|
||||
let func = objectsRegistry.get(id);
|
||||
return callFunction(event, func, global, args);
|
||||
args = unwrapArgs(event.sender, args)
|
||||
let func = objectsRegistry.get(id)
|
||||
return callFunction(event, func, global, args)
|
||||
} catch (error) {
|
||||
return event.returnValue = exceptionToMeta(error);
|
||||
event.returnValue = exceptionToMeta(error)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_BROWSER_MEMBER_CONSTRUCTOR', function (event, id, method, args) {
|
||||
try {
|
||||
args = unwrapArgs(event.sender, args);
|
||||
let constructor = objectsRegistry.get(id)[method];
|
||||
args = unwrapArgs(event.sender, args)
|
||||
let constructor = objectsRegistry.get(id)[method]
|
||||
|
||||
// Call new with array of arguments.
|
||||
let obj = new (Function.prototype.bind.apply(constructor, [null].concat(args)));
|
||||
return event.returnValue = valueToMeta(event.sender, obj);
|
||||
let obj = new (Function.prototype.bind.apply(constructor, [null].concat(args)))
|
||||
event.returnValue = valueToMeta(event.sender, obj)
|
||||
} catch (error) {
|
||||
return event.returnValue = exceptionToMeta(error);
|
||||
event.returnValue = exceptionToMeta(error)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_BROWSER_MEMBER_CALL', function (event, id, method, args) {
|
||||
try {
|
||||
args = unwrapArgs(event.sender, args);
|
||||
let obj = objectsRegistry.get(id);
|
||||
return callFunction(event, obj[method], obj, args);
|
||||
args = unwrapArgs(event.sender, args)
|
||||
let obj = objectsRegistry.get(id)
|
||||
return callFunction(event, obj[method], obj, args)
|
||||
} catch (error) {
|
||||
return event.returnValue = exceptionToMeta(error);
|
||||
event.returnValue = exceptionToMeta(error)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_BROWSER_MEMBER_SET', function (event, id, name, value) {
|
||||
try {
|
||||
let obj = objectsRegistry.get(id);
|
||||
obj[name] = value;
|
||||
return event.returnValue = null;
|
||||
let obj = objectsRegistry.get(id)
|
||||
obj[name] = value
|
||||
event.returnValue = null
|
||||
} catch (error) {
|
||||
return event.returnValue = exceptionToMeta(error);
|
||||
event.returnValue = exceptionToMeta(error)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_BROWSER_MEMBER_GET', function (event, id, name) {
|
||||
try {
|
||||
let obj = objectsRegistry.get(id);
|
||||
return event.returnValue = valueToMeta(event.sender, obj[name]);
|
||||
let obj = objectsRegistry.get(id)
|
||||
event.returnValue = valueToMeta(event.sender, obj[name])
|
||||
} catch (error) {
|
||||
return event.returnValue = exceptionToMeta(error);
|
||||
event.returnValue = exceptionToMeta(error)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_BROWSER_DEREFERENCE', function (event, id) {
|
||||
return objectsRegistry.remove(event.sender.getId(), id);
|
||||
});
|
||||
return objectsRegistry.remove(event.sender.getId(), id)
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_BROWSER_GUEST_WEB_CONTENTS', function (event, guestInstanceId) {
|
||||
try {
|
||||
let guestViewManager = require('./guest-view-manager');
|
||||
return event.returnValue = valueToMeta(event.sender, guestViewManager.getGuest(guestInstanceId));
|
||||
let guestViewManager = require('./guest-view-manager')
|
||||
event.returnValue = valueToMeta(event.sender, guestViewManager.getGuest(guestInstanceId))
|
||||
} catch (error) {
|
||||
return event.returnValue = exceptionToMeta(error);
|
||||
event.returnValue = exceptionToMeta(error)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_BROWSER_ASYNC_CALL_TO_GUEST_VIEW', function (event, requestId, guestInstanceId, method, ...args) {
|
||||
try {
|
||||
let guestViewManager = require('./guest-view-manager');
|
||||
let guest = guestViewManager.getGuest(guestInstanceId);
|
||||
let guestViewManager = require('./guest-view-manager')
|
||||
let guest = guestViewManager.getGuest(guestInstanceId)
|
||||
if (requestId) {
|
||||
const responseCallback = function (result) {
|
||||
event.sender.send(`ATOM_RENDERER_ASYNC_CALL_TO_GUEST_VIEW_RESPONSE_${requestId}`, result);
|
||||
};
|
||||
args.push(responseCallback);
|
||||
event.sender.send(`ATOM_RENDERER_ASYNC_CALL_TO_GUEST_VIEW_RESPONSE_${requestId}`, result)
|
||||
}
|
||||
guest[method].apply(guest, args);
|
||||
args.push(responseCallback)
|
||||
}
|
||||
guest[method].apply(guest, args)
|
||||
} catch (error) {
|
||||
return event.returnValue = exceptionToMeta(error);
|
||||
event.returnValue = exceptionToMeta(error)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
|
|
@ -1,62 +1,62 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const v8Util = process.atomBinding('v8_util');
|
||||
const v8Util = process.atomBinding('v8_util')
|
||||
|
||||
class CallbacksRegistry {
|
||||
constructor () {
|
||||
this.nextId = 0;
|
||||
this.callbacks = {};
|
||||
this.nextId = 0
|
||||
this.callbacks = {}
|
||||
}
|
||||
|
||||
add (callback) {
|
||||
// The callback is already added.
|
||||
var filenameAndLine, id, location, match, ref, regexp, stackString;
|
||||
id = v8Util.getHiddenValue(callback, 'callbackId');
|
||||
var filenameAndLine, id, location, match, ref, regexp, stackString
|
||||
id = v8Util.getHiddenValue(callback, 'callbackId')
|
||||
if (id != null) {
|
||||
return id;
|
||||
return id
|
||||
}
|
||||
id = ++this.nextId;
|
||||
id = ++this.nextId
|
||||
|
||||
// Capture the location of the function and put it in the ID string,
|
||||
// so that release errors can be tracked down easily.
|
||||
regexp = /at (.*)/gi;
|
||||
stackString = (new Error).stack;
|
||||
regexp = /at (.*)/gi
|
||||
stackString = (new Error()).stack
|
||||
while ((match = regexp.exec(stackString)) !== null) {
|
||||
location = match[1];
|
||||
location = match[1]
|
||||
if (location.indexOf('(native)') !== -1) {
|
||||
continue;
|
||||
continue
|
||||
}
|
||||
if (location.indexOf('atom.asar') !== -1) {
|
||||
continue;
|
||||
continue
|
||||
}
|
||||
ref = /([^\/^\)]*)\)?$/gi.exec(location);
|
||||
filenameAndLine = ref[1];
|
||||
break;
|
||||
ref = /([^\/^\)]*)\)?$/gi.exec(location)
|
||||
filenameAndLine = ref[1]
|
||||
break
|
||||
}
|
||||
this.callbacks[id] = callback;
|
||||
v8Util.setHiddenValue(callback, 'callbackId', id);
|
||||
v8Util.setHiddenValue(callback, 'location', filenameAndLine);
|
||||
return id;
|
||||
this.callbacks[id] = callback
|
||||
v8Util.setHiddenValue(callback, 'callbackId', id)
|
||||
v8Util.setHiddenValue(callback, 'location', filenameAndLine)
|
||||
return id
|
||||
}
|
||||
|
||||
get (id) {
|
||||
var ref;
|
||||
return (ref = this.callbacks[id]) != null ? ref : function() {};
|
||||
var ref
|
||||
return (ref = this.callbacks[id]) != null ? ref : function () {}
|
||||
}
|
||||
|
||||
call (id, ...args) {
|
||||
var ref;
|
||||
return (ref = this.get(id)).call.apply(ref, [global].concat(args));
|
||||
var ref
|
||||
return (ref = this.get(id)).call.apply(ref, [global].concat(args))
|
||||
}
|
||||
|
||||
apply (id, ...args) {
|
||||
var ref;
|
||||
return (ref = this.get(id)).apply.apply(ref, [global].concat(args));
|
||||
var ref
|
||||
return (ref = this.get(id)).apply.apply(ref, [global].concat(args))
|
||||
}
|
||||
|
||||
remove (id) {
|
||||
return delete this.callbacks[id];
|
||||
return delete this.callbacks[id]
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = CallbacksRegistry;
|
||||
module.exports = CallbacksRegistry
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
if (process.platform === 'linux' && process.type === 'renderer') {
|
||||
// On Linux we could not access clipboard in renderer process.
|
||||
module.exports = require('electron').remote.clipboard;
|
||||
module.exports = require('electron').remote.clipboard
|
||||
} else {
|
||||
module.exports = process.atomBinding('clipboard');
|
||||
module.exports = process.atomBinding('clipboard')
|
||||
}
|
||||
|
|
|
@ -1,94 +1,98 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const os = require('os');
|
||||
const path = require('path');
|
||||
const spawn = require('child_process').spawn;
|
||||
const electron = require('electron');
|
||||
const binding = process.atomBinding('crash_reporter');
|
||||
const os = require('os')
|
||||
const path = require('path')
|
||||
const spawn = require('child_process').spawn
|
||||
const electron = require('electron')
|
||||
const binding = process.atomBinding('crash_reporter')
|
||||
|
||||
var CrashReporter = (function () {
|
||||
function CrashReporter () {}
|
||||
|
||||
CrashReporter.prototype.start = function (options) {
|
||||
var app, args, autoSubmit, companyName, deprecate, env, extra, ignoreSystemCrashHandler, start, submitURL;
|
||||
var app, args, autoSubmit, companyName, deprecate, env, extra, ignoreSystemCrashHandler, start, submitURL
|
||||
if (options == null) {
|
||||
options = {};
|
||||
options = {}
|
||||
}
|
||||
this.productName = options.productName, companyName = options.companyName, submitURL = options.submitURL, autoSubmit = options.autoSubmit, ignoreSystemCrashHandler = options.ignoreSystemCrashHandler, extra = options.extra;
|
||||
this.productName = options.productName
|
||||
companyName = options.companyName
|
||||
submitURL = options.submitURL
|
||||
autoSubmit = options.autoSubmit
|
||||
ignoreSystemCrashHandler = options.ignoreSystemCrashHandler
|
||||
extra = options.extra
|
||||
|
||||
// Deprecated.
|
||||
deprecate = electron.deprecate;
|
||||
deprecate = electron.deprecate
|
||||
if (options.submitUrl) {
|
||||
if (submitURL == null) {
|
||||
submitURL = options.submitUrl;
|
||||
submitURL = options.submitUrl
|
||||
}
|
||||
deprecate.warn('submitUrl', 'submitURL');
|
||||
deprecate.warn('submitUrl', 'submitURL')
|
||||
}
|
||||
app = (process.type === 'browser' ? electron : electron.remote).app;
|
||||
app = (process.type === 'browser' ? electron : electron.remote).app
|
||||
if (this.productName == null) {
|
||||
this.productName = app.getName();
|
||||
this.productName = app.getName()
|
||||
}
|
||||
if (autoSubmit == null) {
|
||||
autoSubmit = true;
|
||||
autoSubmit = true
|
||||
}
|
||||
if (ignoreSystemCrashHandler == null) {
|
||||
ignoreSystemCrashHandler = false;
|
||||
ignoreSystemCrashHandler = false
|
||||
}
|
||||
if (extra == null) {
|
||||
extra = {};
|
||||
extra = {}
|
||||
}
|
||||
if (extra._productName == null) {
|
||||
extra._productName = this.productName;
|
||||
extra._productName = this.productName
|
||||
}
|
||||
if (extra._companyName == null) {
|
||||
extra._companyName = companyName;
|
||||
extra._companyName = companyName
|
||||
}
|
||||
if (extra._version == null) {
|
||||
extra._version = app.getVersion();
|
||||
extra._version = app.getVersion()
|
||||
}
|
||||
if (companyName == null) {
|
||||
deprecate.log('companyName is now a required option to crashReporter.start');
|
||||
return;
|
||||
deprecate.log('companyName is now a required option to crashReporter.start')
|
||||
return
|
||||
}
|
||||
if (submitURL == null) {
|
||||
deprecate.log('submitURL is now a required option to crashReporter.start');
|
||||
return;
|
||||
deprecate.log('submitURL is now a required option to crashReporter.start')
|
||||
return
|
||||
}
|
||||
start = () => {
|
||||
binding.start(this.productName, companyName, submitURL, autoSubmit, ignoreSystemCrashHandler, extra);
|
||||
};
|
||||
binding.start(this.productName, companyName, submitURL, autoSubmit, ignoreSystemCrashHandler, extra)
|
||||
}
|
||||
if (process.platform === 'win32') {
|
||||
args = ["--reporter-url=" + submitURL, "--application-name=" + this.productName, "--v=1"];
|
||||
args = ['--reporter-url=' + submitURL, '--application-name=' + this.productName, '--v=1']
|
||||
env = {
|
||||
ATOM_SHELL_INTERNAL_CRASH_SERVICE: 1
|
||||
};
|
||||
}
|
||||
spawn(process.execPath, args, {
|
||||
env: env,
|
||||
detached: true
|
||||
});
|
||||
})
|
||||
}
|
||||
return start()
|
||||
}
|
||||
return start();
|
||||
};
|
||||
|
||||
CrashReporter.prototype.getLastCrashReport = function () {
|
||||
var reports;
|
||||
reports = this.getUploadedReports();
|
||||
var reports
|
||||
reports = this.getUploadedReports()
|
||||
if (reports.length > 0) {
|
||||
return reports[0];
|
||||
return reports[0]
|
||||
} else {
|
||||
return null;
|
||||
return null
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
CrashReporter.prototype.getUploadedReports = function () {
|
||||
var log, tmpdir;
|
||||
tmpdir = process.platform === 'win32' ? os.tmpdir() : '/tmp';
|
||||
log = process.platform === 'darwin' ? path.join(tmpdir, this.productName + " Crashes") : path.join(tmpdir, this.productName + " Crashes", 'uploads.log');
|
||||
return binding._getUploadedReports(log);
|
||||
};
|
||||
var log, tmpdir
|
||||
tmpdir = process.platform === 'win32' ? os.tmpdir() : '/tmp'
|
||||
log = process.platform === 'darwin' ? path.join(tmpdir, this.productName + ' Crashes') : path.join(tmpdir, this.productName + ' Crashes', 'uploads.log')
|
||||
return binding._getUploadedReports(log)
|
||||
}
|
||||
|
||||
return CrashReporter;
|
||||
return CrashReporter
|
||||
})()
|
||||
|
||||
})();
|
||||
|
||||
module.exports = new CrashReporter;
|
||||
module.exports = new CrashReporter()
|
||||
|
|
|
@ -1,108 +1,108 @@
|
|||
// Deprecate a method.
|
||||
const deprecate = function (oldName, newName, fn) {
|
||||
var warned;
|
||||
warned = false;
|
||||
var warned
|
||||
warned = false
|
||||
return function () {
|
||||
if (!(warned || process.noDeprecation)) {
|
||||
warned = true;
|
||||
deprecate.warn(oldName, newName);
|
||||
warned = true
|
||||
deprecate.warn(oldName, newName)
|
||||
}
|
||||
return fn.apply(this, arguments)
|
||||
}
|
||||
}
|
||||
return fn.apply(this, arguments);
|
||||
};
|
||||
};
|
||||
|
||||
// The method is renamed.
|
||||
deprecate.rename = function (object, oldName, newName) {
|
||||
var newMethod, warned;
|
||||
warned = false;
|
||||
var newMethod, warned
|
||||
warned = false
|
||||
newMethod = function () {
|
||||
if (!(warned || process.noDeprecation)) {
|
||||
warned = true;
|
||||
deprecate.warn(oldName, newName);
|
||||
warned = true
|
||||
deprecate.warn(oldName, newName)
|
||||
}
|
||||
return this[newName].apply(this, arguments)
|
||||
}
|
||||
return this[newName].apply(this, arguments);
|
||||
};
|
||||
if (typeof object === 'function') {
|
||||
return object.prototype[oldName] = newMethod;
|
||||
object.prototype[oldName] = newMethod
|
||||
} else {
|
||||
return object[oldName] = newMethod;
|
||||
object[oldName] = newMethod
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// Forward the method to member.
|
||||
deprecate.member = function (object, method, member) {
|
||||
var warned;
|
||||
warned = false;
|
||||
return object.prototype[method] = function() {
|
||||
var warned
|
||||
warned = false
|
||||
object.prototype[method] = function () {
|
||||
if (!(warned || process.noDeprecation)) {
|
||||
warned = true;
|
||||
deprecate.warn(method, member + "." + method);
|
||||
warned = true
|
||||
deprecate.warn(method, member + '.' + method)
|
||||
}
|
||||
return this[member][method].apply(this[member], arguments)
|
||||
}
|
||||
}
|
||||
return this[member][method].apply(this[member], arguments);
|
||||
};
|
||||
};
|
||||
|
||||
// Deprecate a property.
|
||||
deprecate.property = function (object, property, method) {
|
||||
return Object.defineProperty(object, property, {
|
||||
get: function () {
|
||||
var warned;
|
||||
warned = false;
|
||||
var warned
|
||||
warned = false
|
||||
if (!(warned || process.noDeprecation)) {
|
||||
warned = true;
|
||||
deprecate.warn(property + " property", method + " method");
|
||||
warned = true
|
||||
deprecate.warn(property + ' property', method + ' method')
|
||||
}
|
||||
return this[method]();
|
||||
return this[method]()
|
||||
}
|
||||
})
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
// Deprecate an event.
|
||||
deprecate.event = function (emitter, oldName, newName, fn) {
|
||||
var warned;
|
||||
warned = false;
|
||||
var warned
|
||||
warned = false
|
||||
return emitter.on(newName, function (...args) {
|
||||
// there is listeners for old API.
|
||||
if (this.listenerCount(oldName) > 0) {
|
||||
if (!(warned || process.noDeprecation)) {
|
||||
warned = true;
|
||||
deprecate.warn("'" + oldName + "' event", "'" + newName + "' event");
|
||||
warned = true
|
||||
deprecate.warn("'" + oldName + "' event", "'" + newName + "' event")
|
||||
}
|
||||
if (fn != null) {
|
||||
return fn.apply(this, arguments);
|
||||
return fn.apply(this, arguments)
|
||||
} else {
|
||||
return this.emit.apply(this, [oldName].concat(args));
|
||||
return this.emit.apply(this, [oldName].concat(args))
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
// Print deprecation warning.
|
||||
deprecate.warn = function (oldName, newName) {
|
||||
return deprecate.log(oldName + " is deprecated. Use " + newName + " instead.");
|
||||
};
|
||||
return deprecate.log(oldName + ' is deprecated. Use ' + newName + ' instead.')
|
||||
}
|
||||
|
||||
var deprecationHandler = null;
|
||||
var deprecationHandler = null
|
||||
|
||||
// Print deprecation message.
|
||||
deprecate.log = function (message) {
|
||||
if (typeof deprecationHandler === 'function') {
|
||||
deprecationHandler(message);
|
||||
deprecationHandler(message)
|
||||
} else if (process.throwDeprecation) {
|
||||
throw new Error(message);
|
||||
throw new Error(message)
|
||||
} else if (process.traceDeprecation) {
|
||||
return console.trace(message);
|
||||
return console.trace(message)
|
||||
} else {
|
||||
return console.warn("(electron) " + message);
|
||||
return console.warn('(electron) ' + message)
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
deprecate.setHandler = function (handler) {
|
||||
deprecationHandler = handler;
|
||||
};
|
||||
deprecationHandler = handler
|
||||
}
|
||||
|
||||
deprecate.getHandler = function () {
|
||||
return deprecationHandler;
|
||||
};
|
||||
return deprecationHandler
|
||||
}
|
||||
|
||||
module.exports = deprecate;
|
||||
module.exports = deprecate
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const deprecate = require('electron').deprecate;
|
||||
const deprecate = require('electron').deprecate
|
||||
|
||||
exports.setHandler = function (deprecationHandler) {
|
||||
deprecate.setHandler(deprecationHandler);
|
||||
};
|
||||
deprecate.setHandler(deprecationHandler)
|
||||
}
|
||||
|
||||
exports.getHandler = function () {
|
||||
return deprecate.getHandler();
|
||||
};
|
||||
return deprecate.getHandler()
|
||||
}
|
||||
|
|
|
@ -1,12 +1,11 @@
|
|||
// Do not expose the internal modules to `require`.
|
||||
const hideInternalModules = function () {
|
||||
var globalPaths = require('module').globalPaths;
|
||||
var globalPaths = require('module').globalPaths
|
||||
if (globalPaths.length === 3) {
|
||||
|
||||
// Remove the "common/api/lib" and "browser-or-renderer/api/lib".
|
||||
return globalPaths.splice(0, 2);
|
||||
return globalPaths.splice(0, 2)
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// Attaches properties to |exports|.
|
||||
exports.defineProperties = function (exports) {
|
||||
|
@ -18,48 +17,47 @@ exports.defineProperties = function(exports) {
|
|||
|
||||
// Common modules, please sort with alphabet order.
|
||||
clipboard: {
|
||||
|
||||
// Must be enumerable, otherwise it woulde be invisible to remote module.
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../clipboard');
|
||||
return require('../clipboard')
|
||||
}
|
||||
},
|
||||
crashReporter: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../crash-reporter');
|
||||
return require('../crash-reporter')
|
||||
}
|
||||
},
|
||||
deprecations: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../deprecations');
|
||||
return require('../deprecations')
|
||||
}
|
||||
},
|
||||
nativeImage: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../native-image');
|
||||
return require('../native-image')
|
||||
}
|
||||
},
|
||||
shell: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../shell');
|
||||
return require('../shell')
|
||||
}
|
||||
},
|
||||
|
||||
// The internal modules, invisible unless you know their names.
|
||||
CallbacksRegistry: {
|
||||
get: function () {
|
||||
return require('../callbacks-registry');
|
||||
return require('../callbacks-registry')
|
||||
}
|
||||
},
|
||||
deprecate: {
|
||||
get: function () {
|
||||
return require('../deprecate');
|
||||
return require('../deprecate')
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
})
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
const deprecate = require('electron').deprecate;
|
||||
const nativeImage = process.atomBinding('native_image');
|
||||
const deprecate = require('electron').deprecate
|
||||
const nativeImage = process.atomBinding('native_image')
|
||||
|
||||
// Deprecated.
|
||||
deprecate.rename(nativeImage, 'createFromDataUrl', 'createFromDataURL');
|
||||
deprecate.rename(nativeImage, 'createFromDataUrl', 'createFromDataURL')
|
||||
|
||||
module.exports = nativeImage;
|
||||
module.exports = nativeImage
|
||||
|
|
|
@ -1 +1 @@
|
|||
module.exports = process.atomBinding('shell');
|
||||
module.exports = process.atomBinding('shell')
|
||||
|
|
|
@ -1,68 +1,69 @@
|
|||
(function () {
|
||||
const asar = process.binding('atom_common_asar');
|
||||
const child_process = require('child_process');
|
||||
const path = require('path');
|
||||
const util = require('util');
|
||||
const asar = process.binding('atom_common_asar')
|
||||
const child_process = require('child_process')
|
||||
const path = require('path')
|
||||
const util = require('util')
|
||||
|
||||
var hasProp = {}.hasOwnProperty;
|
||||
var hasProp = {}.hasOwnProperty
|
||||
|
||||
// Cache asar archive objects.
|
||||
var cachedArchives = {};
|
||||
var cachedArchives = {}
|
||||
|
||||
var getOrCreateArchive = function (p) {
|
||||
var archive;
|
||||
archive = cachedArchives[p];
|
||||
var archive
|
||||
archive = cachedArchives[p]
|
||||
if (archive != null) {
|
||||
return archive;
|
||||
return archive
|
||||
}
|
||||
archive = asar.createArchive(p);
|
||||
archive = asar.createArchive(p)
|
||||
if (!archive) {
|
||||
return false;
|
||||
return false
|
||||
}
|
||||
cachedArchives[p] = archive
|
||||
return archive
|
||||
}
|
||||
return cachedArchives[p] = archive;
|
||||
};
|
||||
|
||||
// Clean cache on quit.
|
||||
process.on('exit', function () {
|
||||
var archive, p;
|
||||
var archive, p
|
||||
for (p in cachedArchives) {
|
||||
if (!hasProp.call(cachedArchives, p)) continue;
|
||||
archive = cachedArchives[p];
|
||||
archive.destroy();
|
||||
if (!hasProp.call(cachedArchives, p)) continue
|
||||
archive = cachedArchives[p]
|
||||
archive.destroy()
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
// Separate asar package's path from full path.
|
||||
var splitPath = function (p) {
|
||||
var index;
|
||||
var index
|
||||
|
||||
// shortcut to disable asar.
|
||||
if (process.noAsar) {
|
||||
return [false];
|
||||
return [false]
|
||||
}
|
||||
|
||||
if (typeof p !== 'string') {
|
||||
return [false];
|
||||
return [false]
|
||||
}
|
||||
if (p.substr(-5) === '.asar') {
|
||||
return [true, p, ''];
|
||||
return [true, p, '']
|
||||
}
|
||||
p = path.normalize(p);
|
||||
index = p.lastIndexOf(".asar" + path.sep);
|
||||
p = path.normalize(p)
|
||||
index = p.lastIndexOf('.asar' + path.sep)
|
||||
if (index === -1) {
|
||||
return [false];
|
||||
return [false]
|
||||
}
|
||||
return [true, p.substr(0, index + 5), p.substr(index + 6)]
|
||||
}
|
||||
return [true, p.substr(0, index + 5), p.substr(index + 6)];
|
||||
};
|
||||
|
||||
// Convert asar archive's Stats object to fs's Stats object.
|
||||
var nextInode = 0;
|
||||
var nextInode = 0
|
||||
|
||||
var uid = process.getuid != null ? process.getuid() : 0;
|
||||
var uid = process.getuid != null ? process.getuid() : 0
|
||||
|
||||
var gid = process.getgid != null ? process.getgid() : 0;
|
||||
var gid = process.getgid != null ? process.getgid() : 0
|
||||
|
||||
var fakeTime = new Date();
|
||||
var fakeTime = new Date()
|
||||
|
||||
var asarStatsToFsStats = function (stats) {
|
||||
return {
|
||||
|
@ -79,520 +80,520 @@
|
|||
ctime: stats.ctime || fakeTime,
|
||||
size: stats.size,
|
||||
isFile: function () {
|
||||
return stats.isFile;
|
||||
return stats.isFile
|
||||
},
|
||||
isDirectory: function () {
|
||||
return stats.isDirectory;
|
||||
return stats.isDirectory
|
||||
},
|
||||
isSymbolicLink: function () {
|
||||
return stats.isLink;
|
||||
return stats.isLink
|
||||
},
|
||||
isBlockDevice: function () {
|
||||
return false;
|
||||
return false
|
||||
},
|
||||
isCharacterDevice: function () {
|
||||
return false;
|
||||
return false
|
||||
},
|
||||
isFIFO: function () {
|
||||
return false;
|
||||
return false
|
||||
},
|
||||
isSocket: function () {
|
||||
return false;
|
||||
return false
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
// Create a ENOENT error.
|
||||
var notFoundError = function (asarPath, filePath, callback) {
|
||||
var error;
|
||||
error = new Error("ENOENT, " + filePath + " not found in " + asarPath);
|
||||
error.code = "ENOENT";
|
||||
error.errno = -2;
|
||||
var error
|
||||
error = new Error(`ENOENT, ${filePath} not found in ${asarPath}`)
|
||||
error.code = 'ENOENT'
|
||||
error.errno = -2
|
||||
if (typeof callback !== 'function') {
|
||||
throw error;
|
||||
throw error
|
||||
}
|
||||
return process.nextTick(function () {
|
||||
return callback(error);
|
||||
});
|
||||
};
|
||||
return callback(error)
|
||||
})
|
||||
}
|
||||
|
||||
// Create a ENOTDIR error.
|
||||
var notDirError = function (callback) {
|
||||
var error;
|
||||
error = new Error('ENOTDIR, not a directory');
|
||||
error.code = 'ENOTDIR';
|
||||
error.errno = -20;
|
||||
var error
|
||||
error = new Error('ENOTDIR, not a directory')
|
||||
error.code = 'ENOTDIR'
|
||||
error.errno = -20
|
||||
if (typeof callback !== 'function') {
|
||||
throw error;
|
||||
throw error
|
||||
}
|
||||
return process.nextTick(function () {
|
||||
return callback(error);
|
||||
});
|
||||
};
|
||||
return callback(error)
|
||||
})
|
||||
}
|
||||
|
||||
// Create invalid archive error.
|
||||
var invalidArchiveError = function (asarPath, callback) {
|
||||
var error;
|
||||
error = new Error("Invalid package " + asarPath);
|
||||
var error
|
||||
error = new Error(`Invalid package ${asarPath}`)
|
||||
if (typeof callback !== 'function') {
|
||||
throw error;
|
||||
throw error
|
||||
}
|
||||
return process.nextTick(function () {
|
||||
return callback(error);
|
||||
});
|
||||
};
|
||||
return callback(error)
|
||||
})
|
||||
}
|
||||
|
||||
// Override APIs that rely on passing file path instead of content to C++.
|
||||
var overrideAPISync = function (module, name, arg) {
|
||||
var old;
|
||||
var old
|
||||
if (arg == null) {
|
||||
arg = 0;
|
||||
arg = 0
|
||||
}
|
||||
old = module[name];
|
||||
return module[name] = function() {
|
||||
var archive, newPath, p;
|
||||
p = arguments[arg];
|
||||
const [isAsar, asarPath, filePath] = splitPath(p);
|
||||
old = module[name]
|
||||
module[name] = function () {
|
||||
var archive, newPath, p
|
||||
p = arguments[arg]
|
||||
const [isAsar, asarPath, filePath] = splitPath(p)
|
||||
if (!isAsar) {
|
||||
return old.apply(this, arguments);
|
||||
return old.apply(this, arguments)
|
||||
}
|
||||
archive = getOrCreateArchive(asarPath);
|
||||
archive = getOrCreateArchive(asarPath)
|
||||
if (!archive) {
|
||||
invalidArchiveError(asarPath);
|
||||
invalidArchiveError(asarPath)
|
||||
}
|
||||
newPath = archive.copyFileOut(filePath);
|
||||
newPath = archive.copyFileOut(filePath)
|
||||
if (!newPath) {
|
||||
notFoundError(asarPath, filePath);
|
||||
notFoundError(asarPath, filePath)
|
||||
}
|
||||
arguments[arg] = newPath
|
||||
return old.apply(this, arguments)
|
||||
}
|
||||
}
|
||||
arguments[arg] = newPath;
|
||||
return old.apply(this, arguments);
|
||||
};
|
||||
};
|
||||
|
||||
var overrideAPI = function (module, name, arg) {
|
||||
var old;
|
||||
var old
|
||||
if (arg == null) {
|
||||
arg = 0;
|
||||
arg = 0
|
||||
}
|
||||
old = module[name];
|
||||
return module[name] = function() {
|
||||
var archive, callback, newPath, p;
|
||||
p = arguments[arg];
|
||||
const [isAsar, asarPath, filePath] = splitPath(p);
|
||||
old = module[name]
|
||||
module[name] = function () {
|
||||
var archive, callback, newPath, p
|
||||
p = arguments[arg]
|
||||
const [isAsar, asarPath, filePath] = splitPath(p)
|
||||
if (!isAsar) {
|
||||
return old.apply(this, arguments);
|
||||
return old.apply(this, arguments)
|
||||
}
|
||||
callback = arguments[arguments.length - 1];
|
||||
callback = arguments[arguments.length - 1]
|
||||
if (typeof callback !== 'function') {
|
||||
return overrideAPISync(module, name, arg);
|
||||
return overrideAPISync(module, name, arg)
|
||||
}
|
||||
archive = getOrCreateArchive(asarPath);
|
||||
archive = getOrCreateArchive(asarPath)
|
||||
if (!archive) {
|
||||
return invalidArchiveError(asarPath, callback);
|
||||
return invalidArchiveError(asarPath, callback)
|
||||
}
|
||||
newPath = archive.copyFileOut(filePath);
|
||||
newPath = archive.copyFileOut(filePath)
|
||||
if (!newPath) {
|
||||
return notFoundError(asarPath, filePath, callback);
|
||||
return notFoundError(asarPath, filePath, callback)
|
||||
}
|
||||
arguments[arg] = newPath
|
||||
return old.apply(this, arguments)
|
||||
}
|
||||
}
|
||||
arguments[arg] = newPath;
|
||||
return old.apply(this, arguments);
|
||||
};
|
||||
};
|
||||
|
||||
// Override fs APIs.
|
||||
exports.wrapFsWithAsar = function (fs) {
|
||||
var exists, existsSync, internalModuleReadFile, internalModuleStat, lstat, lstatSync, mkdir, mkdirSync, readFile, readFileSync, readdir, readdirSync, realpath, realpathSync, stat, statSync, statSyncNoException, logFDs, logASARAccess;
|
||||
var exists, existsSync, internalModuleReadFile, internalModuleStat, lstat, lstatSync, mkdir, mkdirSync, readFile, readFileSync, readdir, readdirSync, realpath, realpathSync, stat, statSync, statSyncNoException, logFDs, logASARAccess
|
||||
|
||||
logFDs = {};
|
||||
logFDs = {}
|
||||
logASARAccess = function (asarPath, filePath, offset) {
|
||||
if (!process.env.ELECTRON_LOG_ASAR_READS) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
if (!logFDs[asarPath]) {
|
||||
var logFilename, logPath;
|
||||
const path = require('path');
|
||||
logFilename = path.basename(asarPath, '.asar') + '-access-log.txt';
|
||||
logPath = path.join(require('os').tmpdir(), logFilename);
|
||||
logFDs[asarPath] = fs.openSync(logPath, 'a');
|
||||
console.log('Logging ' + asarPath + ' access to ' + logPath);
|
||||
var logFilename, logPath
|
||||
const path = require('path')
|
||||
logFilename = path.basename(asarPath, '.asar') + '-access-log.txt'
|
||||
logPath = path.join(require('os').tmpdir(), logFilename)
|
||||
logFDs[asarPath] = fs.openSync(logPath, 'a')
|
||||
console.log('Logging ' + asarPath + ' access to ' + logPath)
|
||||
}
|
||||
fs.writeSync(logFDs[asarPath], offset + ': ' + filePath + '\n')
|
||||
}
|
||||
fs.writeSync(logFDs[asarPath], offset + ': ' + filePath + '\n');
|
||||
};
|
||||
|
||||
lstatSync = fs.lstatSync;
|
||||
lstatSync = fs.lstatSync
|
||||
fs.lstatSync = function (p) {
|
||||
var archive, stats;
|
||||
const [isAsar, asarPath, filePath] = splitPath(p);
|
||||
var archive, stats
|
||||
const [isAsar, asarPath, filePath] = splitPath(p)
|
||||
if (!isAsar) {
|
||||
return lstatSync(p);
|
||||
return lstatSync(p)
|
||||
}
|
||||
archive = getOrCreateArchive(asarPath);
|
||||
archive = getOrCreateArchive(asarPath)
|
||||
if (!archive) {
|
||||
invalidArchiveError(asarPath);
|
||||
invalidArchiveError(asarPath)
|
||||
}
|
||||
stats = archive.stat(filePath);
|
||||
stats = archive.stat(filePath)
|
||||
if (!stats) {
|
||||
notFoundError(asarPath, filePath);
|
||||
notFoundError(asarPath, filePath)
|
||||
}
|
||||
return asarStatsToFsStats(stats);
|
||||
};
|
||||
lstat = fs.lstat;
|
||||
return asarStatsToFsStats(stats)
|
||||
}
|
||||
lstat = fs.lstat
|
||||
fs.lstat = function (p, callback) {
|
||||
var archive, stats;
|
||||
const [isAsar, asarPath, filePath] = splitPath(p);
|
||||
var archive, stats
|
||||
const [isAsar, asarPath, filePath] = splitPath(p)
|
||||
if (!isAsar) {
|
||||
return lstat(p, callback);
|
||||
return lstat(p, callback)
|
||||
}
|
||||
archive = getOrCreateArchive(asarPath);
|
||||
archive = getOrCreateArchive(asarPath)
|
||||
if (!archive) {
|
||||
return invalidArchiveError(asarPath, callback);
|
||||
return invalidArchiveError(asarPath, callback)
|
||||
}
|
||||
stats = getOrCreateArchive(asarPath).stat(filePath);
|
||||
stats = getOrCreateArchive(asarPath).stat(filePath)
|
||||
if (!stats) {
|
||||
return notFoundError(asarPath, filePath, callback);
|
||||
return notFoundError(asarPath, filePath, callback)
|
||||
}
|
||||
return process.nextTick(function () {
|
||||
return callback(null, asarStatsToFsStats(stats));
|
||||
});
|
||||
};
|
||||
statSync = fs.statSync;
|
||||
return callback(null, asarStatsToFsStats(stats))
|
||||
})
|
||||
}
|
||||
statSync = fs.statSync
|
||||
fs.statSync = function (p) {
|
||||
const [isAsar] = splitPath(p);
|
||||
const [isAsar] = splitPath(p)
|
||||
if (!isAsar) {
|
||||
return statSync(p);
|
||||
return statSync(p)
|
||||
}
|
||||
|
||||
// Do not distinguish links for now.
|
||||
return fs.lstatSync(p);
|
||||
};
|
||||
stat = fs.stat;
|
||||
return fs.lstatSync(p)
|
||||
}
|
||||
stat = fs.stat
|
||||
fs.stat = function (p, callback) {
|
||||
const [isAsar] = splitPath(p);
|
||||
const [isAsar] = splitPath(p)
|
||||
if (!isAsar) {
|
||||
return stat(p, callback);
|
||||
return stat(p, callback)
|
||||
}
|
||||
|
||||
// Do not distinguish links for now.
|
||||
return process.nextTick(function () {
|
||||
return fs.lstat(p, callback);
|
||||
});
|
||||
};
|
||||
statSyncNoException = fs.statSyncNoException;
|
||||
return fs.lstat(p, callback)
|
||||
})
|
||||
}
|
||||
statSyncNoException = fs.statSyncNoException
|
||||
fs.statSyncNoException = function (p) {
|
||||
var archive, stats;
|
||||
const [isAsar, asarPath, filePath] = splitPath(p);
|
||||
var archive, stats
|
||||
const [isAsar, asarPath, filePath] = splitPath(p)
|
||||
if (!isAsar) {
|
||||
return statSyncNoException(p);
|
||||
return statSyncNoException(p)
|
||||
}
|
||||
archive = getOrCreateArchive(asarPath);
|
||||
archive = getOrCreateArchive(asarPath)
|
||||
if (!archive) {
|
||||
return false;
|
||||
return false
|
||||
}
|
||||
stats = archive.stat(filePath);
|
||||
stats = archive.stat(filePath)
|
||||
if (!stats) {
|
||||
return false;
|
||||
return false
|
||||
}
|
||||
return asarStatsToFsStats(stats);
|
||||
};
|
||||
realpathSync = fs.realpathSync;
|
||||
return asarStatsToFsStats(stats)
|
||||
}
|
||||
realpathSync = fs.realpathSync
|
||||
fs.realpathSync = function (p) {
|
||||
var archive, real;
|
||||
const [isAsar, asarPath, filePath] = splitPath(p);
|
||||
var archive, real
|
||||
const [isAsar, asarPath, filePath] = splitPath(p)
|
||||
if (!isAsar) {
|
||||
return realpathSync.apply(this, arguments);
|
||||
return realpathSync.apply(this, arguments)
|
||||
}
|
||||
archive = getOrCreateArchive(asarPath);
|
||||
archive = getOrCreateArchive(asarPath)
|
||||
if (!archive) {
|
||||
invalidArchiveError(asarPath);
|
||||
invalidArchiveError(asarPath)
|
||||
}
|
||||
real = archive.realpath(filePath);
|
||||
real = archive.realpath(filePath)
|
||||
if (real === false) {
|
||||
notFoundError(asarPath, filePath);
|
||||
notFoundError(asarPath, filePath)
|
||||
}
|
||||
return path.join(realpathSync(asarPath), real);
|
||||
};
|
||||
realpath = fs.realpath;
|
||||
return path.join(realpathSync(asarPath), real)
|
||||
}
|
||||
realpath = fs.realpath
|
||||
fs.realpath = function (p, cache, callback) {
|
||||
var archive, real;
|
||||
const [isAsar, asarPath, filePath] = splitPath(p);
|
||||
var archive, real
|
||||
const [isAsar, asarPath, filePath] = splitPath(p)
|
||||
if (!isAsar) {
|
||||
return realpath.apply(this, arguments);
|
||||
return realpath.apply(this, arguments)
|
||||
}
|
||||
if (typeof cache === 'function') {
|
||||
callback = cache;
|
||||
cache = void 0;
|
||||
callback = cache
|
||||
cache = void 0
|
||||
}
|
||||
archive = getOrCreateArchive(asarPath);
|
||||
archive = getOrCreateArchive(asarPath)
|
||||
if (!archive) {
|
||||
return invalidArchiveError(asarPath, callback);
|
||||
return invalidArchiveError(asarPath, callback)
|
||||
}
|
||||
real = archive.realpath(filePath);
|
||||
real = archive.realpath(filePath)
|
||||
if (real === false) {
|
||||
return notFoundError(asarPath, filePath, callback);
|
||||
return notFoundError(asarPath, filePath, callback)
|
||||
}
|
||||
return realpath(asarPath, function (err, p) {
|
||||
if (err) {
|
||||
return callback(err);
|
||||
return callback(err)
|
||||
}
|
||||
return callback(null, path.join(p, real));
|
||||
});
|
||||
};
|
||||
exists = fs.exists;
|
||||
return callback(null, path.join(p, real))
|
||||
})
|
||||
}
|
||||
exists = fs.exists
|
||||
fs.exists = function (p, callback) {
|
||||
var archive;
|
||||
const [isAsar, asarPath, filePath] = splitPath(p);
|
||||
var archive
|
||||
const [isAsar, asarPath, filePath] = splitPath(p)
|
||||
if (!isAsar) {
|
||||
return exists(p, callback);
|
||||
return exists(p, callback)
|
||||
}
|
||||
archive = getOrCreateArchive(asarPath);
|
||||
archive = getOrCreateArchive(asarPath)
|
||||
if (!archive) {
|
||||
return invalidArchiveError(asarPath, callback);
|
||||
return invalidArchiveError(asarPath, callback)
|
||||
}
|
||||
return process.nextTick(function () {
|
||||
return callback(archive.stat(filePath) !== false);
|
||||
});
|
||||
};
|
||||
existsSync = fs.existsSync;
|
||||
return callback(archive.stat(filePath) !== false)
|
||||
})
|
||||
}
|
||||
existsSync = fs.existsSync
|
||||
fs.existsSync = function (p) {
|
||||
var archive;
|
||||
const [isAsar, asarPath, filePath] = splitPath(p);
|
||||
var archive
|
||||
const [isAsar, asarPath, filePath] = splitPath(p)
|
||||
if (!isAsar) {
|
||||
return existsSync(p);
|
||||
return existsSync(p)
|
||||
}
|
||||
archive = getOrCreateArchive(asarPath);
|
||||
archive = getOrCreateArchive(asarPath)
|
||||
if (!archive) {
|
||||
return false;
|
||||
return false
|
||||
}
|
||||
return archive.stat(filePath) !== false;
|
||||
};
|
||||
readFile = fs.readFile;
|
||||
return archive.stat(filePath) !== false
|
||||
}
|
||||
readFile = fs.readFile
|
||||
fs.readFile = function (p, options, callback) {
|
||||
var archive, buffer, encoding, fd, info, realPath;
|
||||
const [isAsar, asarPath, filePath] = splitPath(p);
|
||||
var archive, buffer, encoding, fd, info, realPath
|
||||
const [isAsar, asarPath, filePath] = splitPath(p)
|
||||
if (!isAsar) {
|
||||
return readFile.apply(this, arguments);
|
||||
return readFile.apply(this, arguments)
|
||||
}
|
||||
if (typeof options === 'function') {
|
||||
callback = options;
|
||||
options = void 0;
|
||||
callback = options
|
||||
options = void 0
|
||||
}
|
||||
archive = getOrCreateArchive(asarPath);
|
||||
archive = getOrCreateArchive(asarPath)
|
||||
if (!archive) {
|
||||
return invalidArchiveError(asarPath, callback);
|
||||
return invalidArchiveError(asarPath, callback)
|
||||
}
|
||||
info = archive.getFileInfo(filePath);
|
||||
info = archive.getFileInfo(filePath)
|
||||
if (!info) {
|
||||
return notFoundError(asarPath, filePath, callback);
|
||||
return notFoundError(asarPath, filePath, callback)
|
||||
}
|
||||
if (info.size === 0) {
|
||||
return process.nextTick(function () {
|
||||
return callback(null, new Buffer(0));
|
||||
});
|
||||
return callback(null, new Buffer(0))
|
||||
})
|
||||
}
|
||||
if (info.unpacked) {
|
||||
realPath = archive.copyFileOut(filePath);
|
||||
return fs.readFile(realPath, options, callback);
|
||||
realPath = archive.copyFileOut(filePath)
|
||||
return fs.readFile(realPath, options, callback)
|
||||
}
|
||||
if (!options) {
|
||||
options = {
|
||||
encoding: null
|
||||
};
|
||||
}
|
||||
} else if (util.isString(options)) {
|
||||
options = {
|
||||
encoding: options
|
||||
};
|
||||
}
|
||||
} else if (!util.isObject(options)) {
|
||||
throw new TypeError('Bad arguments');
|
||||
throw new TypeError('Bad arguments')
|
||||
}
|
||||
encoding = options.encoding;
|
||||
buffer = new Buffer(info.size);
|
||||
fd = archive.getFd();
|
||||
encoding = options.encoding
|
||||
buffer = new Buffer(info.size)
|
||||
fd = archive.getFd()
|
||||
if (!(fd >= 0)) {
|
||||
return notFoundError(asarPath, filePath, callback);
|
||||
return notFoundError(asarPath, filePath, callback)
|
||||
}
|
||||
logASARAccess(asarPath, filePath, info.offset);
|
||||
logASARAccess(asarPath, filePath, info.offset)
|
||||
return fs.read(fd, buffer, 0, info.size, info.offset, function (error) {
|
||||
return callback(error, encoding ? buffer.toString(encoding) : buffer);
|
||||
});
|
||||
};
|
||||
readFileSync = fs.readFileSync;
|
||||
return callback(error, encoding ? buffer.toString(encoding) : buffer)
|
||||
})
|
||||
}
|
||||
readFileSync = fs.readFileSync
|
||||
fs.readFileSync = function (p, opts) {
|
||||
// this allows v8 to optimize this function
|
||||
var archive, buffer, encoding, fd, info, options, realPath;
|
||||
options = opts;
|
||||
const [isAsar, asarPath, filePath] = splitPath(p);
|
||||
var archive, buffer, encoding, fd, info, options, realPath
|
||||
options = opts
|
||||
const [isAsar, asarPath, filePath] = splitPath(p)
|
||||
if (!isAsar) {
|
||||
return readFileSync.apply(this, arguments);
|
||||
return readFileSync.apply(this, arguments)
|
||||
}
|
||||
archive = getOrCreateArchive(asarPath);
|
||||
archive = getOrCreateArchive(asarPath)
|
||||
if (!archive) {
|
||||
invalidArchiveError(asarPath);
|
||||
invalidArchiveError(asarPath)
|
||||
}
|
||||
info = archive.getFileInfo(filePath);
|
||||
info = archive.getFileInfo(filePath)
|
||||
if (!info) {
|
||||
notFoundError(asarPath, filePath);
|
||||
notFoundError(asarPath, filePath)
|
||||
}
|
||||
if (info.size === 0) {
|
||||
if (options) {
|
||||
return '';
|
||||
return ''
|
||||
} else {
|
||||
return new Buffer(0);
|
||||
return new Buffer(0)
|
||||
}
|
||||
}
|
||||
if (info.unpacked) {
|
||||
realPath = archive.copyFileOut(filePath);
|
||||
return fs.readFileSync(realPath, options);
|
||||
realPath = archive.copyFileOut(filePath)
|
||||
return fs.readFileSync(realPath, options)
|
||||
}
|
||||
if (!options) {
|
||||
options = {
|
||||
encoding: null
|
||||
};
|
||||
}
|
||||
} else if (util.isString(options)) {
|
||||
options = {
|
||||
encoding: options
|
||||
};
|
||||
}
|
||||
} else if (!util.isObject(options)) {
|
||||
throw new TypeError('Bad arguments');
|
||||
throw new TypeError('Bad arguments')
|
||||
}
|
||||
encoding = options.encoding;
|
||||
buffer = new Buffer(info.size);
|
||||
fd = archive.getFd();
|
||||
encoding = options.encoding
|
||||
buffer = new Buffer(info.size)
|
||||
fd = archive.getFd()
|
||||
if (!(fd >= 0)) {
|
||||
notFoundError(asarPath, filePath);
|
||||
notFoundError(asarPath, filePath)
|
||||
}
|
||||
logASARAccess(asarPath, filePath, info.offset);
|
||||
fs.readSync(fd, buffer, 0, info.size, info.offset);
|
||||
logASARAccess(asarPath, filePath, info.offset)
|
||||
fs.readSync(fd, buffer, 0, info.size, info.offset)
|
||||
if (encoding) {
|
||||
return buffer.toString(encoding);
|
||||
return buffer.toString(encoding)
|
||||
} else {
|
||||
return buffer;
|
||||
return buffer
|
||||
}
|
||||
};
|
||||
readdir = fs.readdir;
|
||||
}
|
||||
readdir = fs.readdir
|
||||
fs.readdir = function (p, callback) {
|
||||
var archive, files;
|
||||
const [isAsar, asarPath, filePath] = splitPath(p);
|
||||
var archive, files
|
||||
const [isAsar, asarPath, filePath] = splitPath(p)
|
||||
if (!isAsar) {
|
||||
return readdir.apply(this, arguments);
|
||||
return readdir.apply(this, arguments)
|
||||
}
|
||||
archive = getOrCreateArchive(asarPath);
|
||||
archive = getOrCreateArchive(asarPath)
|
||||
if (!archive) {
|
||||
return invalidArchiveError(asarPath, callback);
|
||||
return invalidArchiveError(asarPath, callback)
|
||||
}
|
||||
files = archive.readdir(filePath);
|
||||
files = archive.readdir(filePath)
|
||||
if (!files) {
|
||||
return notFoundError(asarPath, filePath, callback);
|
||||
return notFoundError(asarPath, filePath, callback)
|
||||
}
|
||||
return process.nextTick(function () {
|
||||
return callback(null, files);
|
||||
});
|
||||
};
|
||||
readdirSync = fs.readdirSync;
|
||||
return callback(null, files)
|
||||
})
|
||||
}
|
||||
readdirSync = fs.readdirSync
|
||||
fs.readdirSync = function (p) {
|
||||
var archive, files;
|
||||
const [isAsar, asarPath, filePath] = splitPath(p);
|
||||
var archive, files
|
||||
const [isAsar, asarPath, filePath] = splitPath(p)
|
||||
if (!isAsar) {
|
||||
return readdirSync.apply(this, arguments);
|
||||
return readdirSync.apply(this, arguments)
|
||||
}
|
||||
archive = getOrCreateArchive(asarPath);
|
||||
archive = getOrCreateArchive(asarPath)
|
||||
if (!archive) {
|
||||
invalidArchiveError(asarPath);
|
||||
invalidArchiveError(asarPath)
|
||||
}
|
||||
files = archive.readdir(filePath);
|
||||
files = archive.readdir(filePath)
|
||||
if (!files) {
|
||||
notFoundError(asarPath, filePath);
|
||||
notFoundError(asarPath, filePath)
|
||||
}
|
||||
return files;
|
||||
};
|
||||
internalModuleReadFile = process.binding('fs').internalModuleReadFile;
|
||||
return files
|
||||
}
|
||||
internalModuleReadFile = process.binding('fs').internalModuleReadFile
|
||||
process.binding('fs').internalModuleReadFile = function (p) {
|
||||
var archive, buffer, fd, info, realPath;
|
||||
const [isAsar, asarPath, filePath] = splitPath(p);
|
||||
var archive, buffer, fd, info, realPath
|
||||
const [isAsar, asarPath, filePath] = splitPath(p)
|
||||
if (!isAsar) {
|
||||
return internalModuleReadFile(p);
|
||||
return internalModuleReadFile(p)
|
||||
}
|
||||
archive = getOrCreateArchive(asarPath);
|
||||
archive = getOrCreateArchive(asarPath)
|
||||
if (!archive) {
|
||||
return void 0;
|
||||
return void 0
|
||||
}
|
||||
info = archive.getFileInfo(filePath);
|
||||
info = archive.getFileInfo(filePath)
|
||||
if (!info) {
|
||||
return void 0;
|
||||
return void 0
|
||||
}
|
||||
if (info.size === 0) {
|
||||
return '';
|
||||
return ''
|
||||
}
|
||||
if (info.unpacked) {
|
||||
realPath = archive.copyFileOut(filePath);
|
||||
realPath = archive.copyFileOut(filePath)
|
||||
return fs.readFileSync(realPath, {
|
||||
encoding: 'utf8'
|
||||
});
|
||||
})
|
||||
}
|
||||
buffer = new Buffer(info.size);
|
||||
fd = archive.getFd();
|
||||
buffer = new Buffer(info.size)
|
||||
fd = archive.getFd()
|
||||
if (!(fd >= 0)) {
|
||||
return void 0;
|
||||
return void 0
|
||||
}
|
||||
logASARAccess(asarPath, filePath, info.offset);
|
||||
fs.readSync(fd, buffer, 0, info.size, info.offset);
|
||||
return buffer.toString('utf8');
|
||||
};
|
||||
internalModuleStat = process.binding('fs').internalModuleStat;
|
||||
logASARAccess(asarPath, filePath, info.offset)
|
||||
fs.readSync(fd, buffer, 0, info.size, info.offset)
|
||||
return buffer.toString('utf8')
|
||||
}
|
||||
internalModuleStat = process.binding('fs').internalModuleStat
|
||||
process.binding('fs').internalModuleStat = function (p) {
|
||||
var archive, stats;
|
||||
const [isAsar, asarPath, filePath] = splitPath(p);
|
||||
var archive, stats
|
||||
const [isAsar, asarPath, filePath] = splitPath(p)
|
||||
if (!isAsar) {
|
||||
return internalModuleStat(p);
|
||||
return internalModuleStat(p)
|
||||
}
|
||||
archive = getOrCreateArchive(asarPath);
|
||||
archive = getOrCreateArchive(asarPath)
|
||||
|
||||
// -ENOENT
|
||||
if (!archive) {
|
||||
return -34;
|
||||
return -34
|
||||
}
|
||||
stats = archive.stat(filePath);
|
||||
stats = archive.stat(filePath)
|
||||
|
||||
// -ENOENT
|
||||
if (!stats) {
|
||||
return -34;
|
||||
return -34
|
||||
}
|
||||
if (stats.isDirectory) {
|
||||
return 1;
|
||||
return 1
|
||||
} else {
|
||||
return 0;
|
||||
return 0
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// Calling mkdir for directory inside asar archive should throw ENOTDIR
|
||||
// error, but on Windows it throws ENOENT.
|
||||
// This is to work around the recursive looping bug of mkdirp since it is
|
||||
// widely used.
|
||||
if (process.platform === 'win32') {
|
||||
mkdir = fs.mkdir;
|
||||
mkdir = fs.mkdir
|
||||
fs.mkdir = function (p, mode, callback) {
|
||||
if (typeof mode === 'function') {
|
||||
callback = mode;
|
||||
callback = mode
|
||||
}
|
||||
const [isAsar, , filePath] = splitPath(p);
|
||||
const [isAsar, , filePath] = splitPath(p)
|
||||
if (isAsar && filePath.length) {
|
||||
return notDirError(callback);
|
||||
return notDirError(callback)
|
||||
}
|
||||
return mkdir(p, mode, callback);
|
||||
};
|
||||
mkdirSync = fs.mkdirSync;
|
||||
return mkdir(p, mode, callback)
|
||||
}
|
||||
mkdirSync = fs.mkdirSync
|
||||
fs.mkdirSync = function (p, mode) {
|
||||
const [isAsar, , filePath] = splitPath(p);
|
||||
const [isAsar, , filePath] = splitPath(p)
|
||||
if (isAsar && filePath.length) {
|
||||
notDirError();
|
||||
notDirError()
|
||||
}
|
||||
return mkdirSync(p, mode);
|
||||
};
|
||||
return mkdirSync(p, mode)
|
||||
}
|
||||
overrideAPI(fs, 'open');
|
||||
overrideAPI(child_process, 'execFile');
|
||||
overrideAPISync(process, 'dlopen', 1);
|
||||
overrideAPISync(require('module')._extensions, '.node', 1);
|
||||
overrideAPISync(fs, 'openSync');
|
||||
return overrideAPISync(child_process, 'execFileSync');
|
||||
};
|
||||
})();
|
||||
}
|
||||
overrideAPI(fs, 'open')
|
||||
overrideAPI(child_process, 'execFile')
|
||||
overrideAPISync(process, 'dlopen', 1)
|
||||
overrideAPISync(require('module')._extensions, '.node', 1)
|
||||
overrideAPISync(fs, 'openSync')
|
||||
return overrideAPISync(child_process, 'execFileSync')
|
||||
}
|
||||
})()
|
||||
|
|
|
@ -1,20 +1,20 @@
|
|||
(function () {
|
||||
;(function () {
|
||||
return function (process, require, asarSource) {
|
||||
// Make asar.coffee accessible via "require".
|
||||
process.binding('natives').ATOM_SHELL_ASAR = asarSource;
|
||||
process.binding('natives').ATOM_SHELL_ASAR = asarSource
|
||||
|
||||
// Monkey-patch the fs module.
|
||||
require('ATOM_SHELL_ASAR').wrapFsWithAsar(require('fs'));
|
||||
require('ATOM_SHELL_ASAR').wrapFsWithAsar(require('fs'))
|
||||
|
||||
// Make graceful-fs work with asar.
|
||||
var source = process.binding('natives');
|
||||
source['original-fs'] = source.fs;
|
||||
return source['fs'] = `
|
||||
var nativeModule = new process.NativeModule('original-fs');
|
||||
nativeModule.cache();
|
||||
nativeModule.compile();
|
||||
var asar = require('ATOM_SHELL_ASAR');
|
||||
asar.wrapFsWithAsar(nativeModule.exports);
|
||||
module.exports = nativeModule.exports`;
|
||||
};
|
||||
})();
|
||||
var source = process.binding('natives')
|
||||
source['original-fs'] = source.fs
|
||||
source['fs'] = `
|
||||
var nativeModule = new process.NativeModule('original-fs')
|
||||
nativeModule.cache()
|
||||
nativeModule.compile()
|
||||
var asar = require('ATOM_SHELL_ASAR')
|
||||
asar.wrapFsWithAsar(nativeModule.exports)
|
||||
module.exports = nativeModule.exports`
|
||||
}
|
||||
})()
|
||||
|
|
|
@ -1,23 +1,22 @@
|
|||
const path = require('path');
|
||||
const timers = require('timers');
|
||||
const Module = require('module');
|
||||
const path = require('path')
|
||||
const timers = require('timers')
|
||||
const Module = require('module')
|
||||
|
||||
process.atomBinding = function (name) {
|
||||
try {
|
||||
return process.binding("atom_" + process.type + "_" + name);
|
||||
return process.binding('atom_' + process.type + '_' + name)
|
||||
} catch (error) {
|
||||
if (/No such module/.test(error.message)) {
|
||||
return process.binding("atom_common_" + name);
|
||||
return process.binding('atom_common_' + name)
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
if (!process.env.ELECTRON_HIDE_INTERNAL_MODULES) {
|
||||
// Add common/api/lib to module search paths.
|
||||
Module.globalPaths.push(path.join(__dirname, 'api'));
|
||||
Module.globalPaths.push(path.join(__dirname, 'api'))
|
||||
}
|
||||
|
||||
|
||||
// setImmediate and process.nextTick makes use of uv_check and uv_prepare to
|
||||
// run the callbacks, however since we only run uv loop on requests, the
|
||||
// callbacks wouldn't be called until something else activated the uv loop,
|
||||
|
@ -26,22 +25,22 @@ if (!process.env.ELECTRON_HIDE_INTERNAL_MODULES) {
|
|||
// called.
|
||||
var wrapWithActivateUvLoop = function (func) {
|
||||
return function () {
|
||||
process.activateUvLoop();
|
||||
return func.apply(this, arguments);
|
||||
};
|
||||
};
|
||||
process.activateUvLoop()
|
||||
return func.apply(this, arguments)
|
||||
}
|
||||
}
|
||||
|
||||
process.nextTick = wrapWithActivateUvLoop(process.nextTick);
|
||||
process.nextTick = wrapWithActivateUvLoop(process.nextTick)
|
||||
|
||||
global.setImmediate = wrapWithActivateUvLoop(timers.setImmediate);
|
||||
global.setImmediate = wrapWithActivateUvLoop(timers.setImmediate)
|
||||
|
||||
global.clearImmediate = timers.clearImmediate;
|
||||
global.clearImmediate = timers.clearImmediate
|
||||
|
||||
if (process.type === 'browser') {
|
||||
// setTimeout needs to update the polling timeout of the event loop, when
|
||||
// called under Chromium's event loop the node's event loop won't get a chance
|
||||
// to update the timeout, so we have to force the node's event loop to
|
||||
// recalculate the timeout in browser process.
|
||||
global.setTimeout = wrapWithActivateUvLoop(timers.setTimeout);
|
||||
global.setInterval = wrapWithActivateUvLoop(timers.setInterval);
|
||||
global.setTimeout = wrapWithActivateUvLoop(timers.setTimeout)
|
||||
global.setInterval = wrapWithActivateUvLoop(timers.setInterval)
|
||||
}
|
||||
|
|
|
@ -1,36 +1,36 @@
|
|||
const path = require('path');
|
||||
const Module = require('module');
|
||||
const path = require('path')
|
||||
const Module = require('module')
|
||||
|
||||
// Clear Node's global search paths.
|
||||
Module.globalPaths.length = 0;
|
||||
Module.globalPaths.length = 0
|
||||
|
||||
// Clear current and parent(init.coffee)'s search paths.
|
||||
module.paths = [];
|
||||
module.paths = []
|
||||
|
||||
module.parent.paths = [];
|
||||
module.parent.paths = []
|
||||
|
||||
// Prevent Node from adding paths outside this app to search paths.
|
||||
Module._nodeModulePaths = function (from) {
|
||||
var dir, i, part, parts, paths, skipOutsidePaths, splitRe, tip;
|
||||
from = path.resolve(from);
|
||||
var dir, i, part, parts, paths, skipOutsidePaths, splitRe, tip
|
||||
from = path.resolve(from)
|
||||
|
||||
// If "from" is outside the app then we do nothing.
|
||||
skipOutsidePaths = from.startsWith(process.resourcesPath);
|
||||
skipOutsidePaths = from.startsWith(process.resourcesPath)
|
||||
|
||||
// Following logoic is copied from module.js.
|
||||
splitRe = process.platform === 'win32' ? /[\/\\]/ : /\//;
|
||||
paths = [];
|
||||
parts = from.split(splitRe);
|
||||
splitRe = process.platform === 'win32' ? /[\/\\]/ : /\//
|
||||
paths = []
|
||||
parts = from.split(splitRe)
|
||||
for (tip = i = parts.length - 1; i >= 0; tip = i += -1) {
|
||||
part = parts[tip];
|
||||
part = parts[tip]
|
||||
if (part === 'node_modules') {
|
||||
continue;
|
||||
continue
|
||||
}
|
||||
dir = parts.slice(0, tip + 1).join(path.sep);
|
||||
dir = parts.slice(0, tip + 1).join(path.sep)
|
||||
if (skipOutsidePaths && !dir.startsWith(process.resourcesPath)) {
|
||||
break;
|
||||
break
|
||||
}
|
||||
paths.push(path.join(dir, 'node_modules'));
|
||||
paths.push(path.join(dir, 'node_modules'))
|
||||
}
|
||||
return paths
|
||||
}
|
||||
return paths;
|
||||
};
|
||||
|
|
|
@ -1,47 +1,47 @@
|
|||
const ipcRenderer = require('electron').ipcRenderer;
|
||||
const nativeImage = require('electron').nativeImage;
|
||||
const ipcRenderer = require('electron').ipcRenderer
|
||||
const nativeImage = require('electron').nativeImage
|
||||
|
||||
var nextId = 0;
|
||||
var includes = [].includes;
|
||||
var nextId = 0
|
||||
var includes = [].includes
|
||||
|
||||
var getNextId = function () {
|
||||
return ++nextId;
|
||||
};
|
||||
return ++nextId
|
||||
}
|
||||
|
||||
// |options.type| can not be empty and has to include 'window' or 'screen'.
|
||||
var isValid = function (options) {
|
||||
return ((options != null ? options.types : void 0) != null) && Array.isArray(options.types);
|
||||
};
|
||||
return ((options != null ? options.types : void 0) != null) && Array.isArray(options.types)
|
||||
}
|
||||
|
||||
exports.getSources = function (options, callback) {
|
||||
var captureScreen, captureWindow, id;
|
||||
var captureScreen, captureWindow, id
|
||||
if (!isValid(options)) {
|
||||
return callback(new Error('Invalid options'));
|
||||
return callback(new Error('Invalid options'))
|
||||
}
|
||||
captureWindow = includes.call(options.types, 'window');
|
||||
captureScreen = includes.call(options.types, 'screen');
|
||||
captureWindow = includes.call(options.types, 'window')
|
||||
captureScreen = includes.call(options.types, 'screen')
|
||||
if (options.thumbnailSize == null) {
|
||||
options.thumbnailSize = {
|
||||
width: 150,
|
||||
height: 150
|
||||
};
|
||||
}
|
||||
id = getNextId();
|
||||
ipcRenderer.send('ATOM_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', captureWindow, captureScreen, options.thumbnailSize, id);
|
||||
return ipcRenderer.once("ATOM_RENDERER_DESKTOP_CAPTURER_RESULT_" + id, function(event, sources) {
|
||||
var source;
|
||||
}
|
||||
id = getNextId()
|
||||
ipcRenderer.send('ATOM_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', captureWindow, captureScreen, options.thumbnailSize, id)
|
||||
return ipcRenderer.once('ATOM_RENDERER_DESKTOP_CAPTURER_RESULT_' + id, function (event, sources) {
|
||||
var source
|
||||
return callback(null, (function () {
|
||||
var i, len, results;
|
||||
results = [];
|
||||
var i, len, results
|
||||
results = []
|
||||
for (i = 0, len = sources.length; i < len; i++) {
|
||||
source = sources[i];
|
||||
source = sources[i]
|
||||
results.push({
|
||||
id: source.id,
|
||||
name: source.name,
|
||||
thumbnail: nativeImage.createFromDataURL(source.thumbnail)
|
||||
});
|
||||
})
|
||||
}
|
||||
return results
|
||||
})())
|
||||
})
|
||||
}
|
||||
return results;
|
||||
})());
|
||||
});
|
||||
};
|
||||
|
|
|
@ -1,38 +1,38 @@
|
|||
const common = require('../../../common/api/exports/electron');
|
||||
const common = require('../../../common/api/exports/electron')
|
||||
|
||||
// Import common modules.
|
||||
common.defineProperties(exports);
|
||||
common.defineProperties(exports)
|
||||
|
||||
Object.defineProperties(exports, {
|
||||
// Renderer side modules, please sort with alphabet order.
|
||||
desktopCapturer: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../desktop-capturer');
|
||||
return require('../desktop-capturer')
|
||||
}
|
||||
},
|
||||
ipcRenderer: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../ipc-renderer');
|
||||
return require('../ipc-renderer')
|
||||
}
|
||||
},
|
||||
remote: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../remote');
|
||||
return require('../remote')
|
||||
}
|
||||
},
|
||||
screen: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../screen');
|
||||
return require('../screen')
|
||||
}
|
||||
},
|
||||
webFrame: {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return require('../web-frame');
|
||||
return require('../web-frame')
|
||||
}
|
||||
}
|
||||
});
|
||||
})
|
||||
|
|
|
@ -1,21 +1,21 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const binding = process.atomBinding('ipc');
|
||||
const v8Util = process.atomBinding('v8_util');
|
||||
const binding = process.atomBinding('ipc')
|
||||
const v8Util = process.atomBinding('v8_util')
|
||||
|
||||
// Created by init.js.
|
||||
const ipcRenderer = v8Util.getHiddenValue(global, 'ipc');
|
||||
const ipcRenderer = v8Util.getHiddenValue(global, 'ipc')
|
||||
|
||||
ipcRenderer.send = function (...args) {
|
||||
return binding.send('ipc-message', args);
|
||||
};
|
||||
return binding.send('ipc-message', args)
|
||||
}
|
||||
|
||||
ipcRenderer.sendSync = function (...args) {
|
||||
return JSON.parse(binding.sendSync('ipc-message-sync', args));
|
||||
};
|
||||
return JSON.parse(binding.sendSync('ipc-message-sync', args))
|
||||
}
|
||||
|
||||
ipcRenderer.sendToHost = function (...args) {
|
||||
return binding.send('ipc-message-host', args);
|
||||
};
|
||||
return binding.send('ipc-message-host', args)
|
||||
}
|
||||
|
||||
module.exports = ipcRenderer;
|
||||
module.exports = ipcRenderer
|
||||
|
|
|
@ -1,27 +1,27 @@
|
|||
const ipcRenderer = require('electron').ipcRenderer;
|
||||
const deprecate = require('electron').deprecate;
|
||||
const EventEmitter = require('events').EventEmitter;
|
||||
const ipcRenderer = require('electron').ipcRenderer
|
||||
const deprecate = require('electron').deprecate
|
||||
const EventEmitter = require('events').EventEmitter
|
||||
|
||||
// This module is deprecated, we mirror everything from ipcRenderer.
|
||||
deprecate.warn('ipc module', 'require("electron").ipcRenderer');
|
||||
deprecate.warn('ipc module', 'require("electron").ipcRenderer')
|
||||
|
||||
// Routes events of ipcRenderer.
|
||||
var ipc = new EventEmitter;
|
||||
var ipc = new EventEmitter()
|
||||
|
||||
ipcRenderer.emit = function (channel, event, ...args) {
|
||||
ipc.emit.apply(ipc, [channel].concat(args));
|
||||
return EventEmitter.prototype.emit.apply(ipcRenderer, arguments);
|
||||
};
|
||||
ipc.emit.apply(ipc, [channel].concat(args))
|
||||
return EventEmitter.prototype.emit.apply(ipcRenderer, arguments)
|
||||
}
|
||||
|
||||
// Deprecated.
|
||||
for (var method in ipcRenderer) {
|
||||
if (method.startsWith('send')) {
|
||||
ipc[method] = ipcRenderer[method];
|
||||
ipc[method] = ipcRenderer[method]
|
||||
}
|
||||
}
|
||||
|
||||
deprecate.rename(ipc, 'sendChannel', 'send');
|
||||
deprecate.rename(ipc, 'sendChannel', 'send')
|
||||
|
||||
deprecate.rename(ipc, 'sendChannelSync', 'sendSync');
|
||||
deprecate.rename(ipc, 'sendChannelSync', 'sendSync')
|
||||
|
||||
module.exports = ipc;
|
||||
module.exports = ipc
|
||||
|
|
|
@ -1,306 +1,303 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const ipcRenderer = require('electron').ipcRenderer;
|
||||
const CallbacksRegistry = require('electron').CallbacksRegistry;
|
||||
const v8Util = process.atomBinding('v8_util');
|
||||
const IDWeakMap = process.atomBinding('id_weak_map').IDWeakMap;
|
||||
const ipcRenderer = require('electron').ipcRenderer
|
||||
const CallbacksRegistry = require('electron').CallbacksRegistry
|
||||
const v8Util = process.atomBinding('v8_util')
|
||||
const IDWeakMap = process.atomBinding('id_weak_map').IDWeakMap
|
||||
|
||||
const callbacksRegistry = new CallbacksRegistry;
|
||||
const callbacksRegistry = new CallbacksRegistry()
|
||||
|
||||
var includes = [].includes;
|
||||
var includes = [].includes
|
||||
|
||||
var remoteObjectCache = new IDWeakMap;
|
||||
var remoteObjectCache = new IDWeakMap()
|
||||
|
||||
// Check for circular reference.
|
||||
var isCircular = function (field, visited) {
|
||||
if (typeof field === 'object') {
|
||||
if (includes.call(visited, field)) {
|
||||
return true;
|
||||
return true
|
||||
}
|
||||
visited.push(field);
|
||||
visited.push(field)
|
||||
}
|
||||
return false
|
||||
}
|
||||
return false;
|
||||
};
|
||||
|
||||
// Convert the arguments object into an array of meta data.
|
||||
var wrapArgs = function (args, visited) {
|
||||
var valueToMeta;
|
||||
var valueToMeta
|
||||
if (visited == null) {
|
||||
visited = [];
|
||||
visited = []
|
||||
}
|
||||
valueToMeta = function (value) {
|
||||
var field, prop, ret;
|
||||
var field, prop, ret
|
||||
if (Array.isArray(value)) {
|
||||
return {
|
||||
type: 'array',
|
||||
value: wrapArgs(value, visited)
|
||||
};
|
||||
}
|
||||
} else if (Buffer.isBuffer(value)) {
|
||||
return {
|
||||
type: 'buffer',
|
||||
value: Array.prototype.slice.call(value, 0)
|
||||
};
|
||||
}
|
||||
} else if (value instanceof Date) {
|
||||
return {
|
||||
type: 'date',
|
||||
value: value.getTime()
|
||||
};
|
||||
}
|
||||
} else if ((value != null ? value.constructor.name : void 0) === 'Promise') {
|
||||
return {
|
||||
type: 'promise',
|
||||
then: valueToMeta(function(v) { value.then(v); })
|
||||
};
|
||||
then: valueToMeta(function (v) { value.then(v) })
|
||||
}
|
||||
} else if ((value != null) && typeof value === 'object' && v8Util.getHiddenValue(value, 'atomId')) {
|
||||
return {
|
||||
type: 'remote-object',
|
||||
id: v8Util.getHiddenValue(value, 'atomId')
|
||||
};
|
||||
}
|
||||
} else if ((value != null) && typeof value === 'object') {
|
||||
ret = {
|
||||
type: 'object',
|
||||
name: value.constructor.name,
|
||||
members: []
|
||||
};
|
||||
}
|
||||
for (prop in value) {
|
||||
field = value[prop];
|
||||
field = value[prop]
|
||||
ret.members.push({
|
||||
name: prop,
|
||||
value: valueToMeta(isCircular(field, visited) ? null : field)
|
||||
});
|
||||
})
|
||||
}
|
||||
return ret;
|
||||
return ret
|
||||
} else if (typeof value === 'function' && v8Util.getHiddenValue(value, 'returnValue')) {
|
||||
return {
|
||||
type: 'function-with-return-value',
|
||||
value: valueToMeta(value())
|
||||
};
|
||||
}
|
||||
} else if (typeof value === 'function') {
|
||||
return {
|
||||
type: 'function',
|
||||
id: callbacksRegistry.add(value),
|
||||
location: v8Util.getHiddenValue(value, 'location')
|
||||
};
|
||||
}
|
||||
} else {
|
||||
return {
|
||||
type: 'value',
|
||||
value: value
|
||||
};
|
||||
}
|
||||
};
|
||||
return Array.prototype.slice.call(args).map(valueToMeta);
|
||||
};
|
||||
}
|
||||
}
|
||||
return Array.prototype.slice.call(args).map(valueToMeta)
|
||||
}
|
||||
|
||||
// Populate object's members from descriptors.
|
||||
// This matches |getObjectMemebers| in rpc-server.
|
||||
let setObjectMembers = function (object, metaId, members) {
|
||||
for (let member of members) {
|
||||
if (object.hasOwnProperty(member.name))
|
||||
continue;
|
||||
if (object.hasOwnProperty(member.name)) continue
|
||||
|
||||
let descriptor = { enumerable: member.enumerable };
|
||||
let descriptor = { enumerable: member.enumerable }
|
||||
if (member.type === 'method') {
|
||||
let remoteMemberFunction = function () {
|
||||
if (this && this.constructor === remoteMemberFunction) {
|
||||
// Constructor call.
|
||||
let ret = ipcRenderer.sendSync('ATOM_BROWSER_MEMBER_CONSTRUCTOR', metaId, member.name, wrapArgs(arguments));
|
||||
return metaToValue(ret);
|
||||
let ret = ipcRenderer.sendSync('ATOM_BROWSER_MEMBER_CONSTRUCTOR', metaId, member.name, wrapArgs(arguments))
|
||||
return metaToValue(ret)
|
||||
} else {
|
||||
// Call member function.
|
||||
let ret = ipcRenderer.sendSync('ATOM_BROWSER_MEMBER_CALL', metaId, member.name, wrapArgs(arguments));
|
||||
return metaToValue(ret);
|
||||
let ret = ipcRenderer.sendSync('ATOM_BROWSER_MEMBER_CALL', metaId, member.name, wrapArgs(arguments))
|
||||
return metaToValue(ret)
|
||||
}
|
||||
};
|
||||
descriptor.writable = true;
|
||||
descriptor.configurable = true;
|
||||
descriptor.value = remoteMemberFunction;
|
||||
}
|
||||
descriptor.writable = true
|
||||
descriptor.configurable = true
|
||||
descriptor.value = remoteMemberFunction
|
||||
} else if (member.type === 'get') {
|
||||
descriptor.get = function () {
|
||||
return metaToValue(ipcRenderer.sendSync('ATOM_BROWSER_MEMBER_GET', metaId, member.name));
|
||||
};
|
||||
return metaToValue(ipcRenderer.sendSync('ATOM_BROWSER_MEMBER_GET', metaId, member.name))
|
||||
}
|
||||
|
||||
// Only set setter when it is writable.
|
||||
if (member.writable) {
|
||||
descriptor.set = function (value) {
|
||||
ipcRenderer.sendSync('ATOM_BROWSER_MEMBER_SET', metaId, member.name, value);
|
||||
return value;
|
||||
};
|
||||
ipcRenderer.sendSync('ATOM_BROWSER_MEMBER_SET', metaId, member.name, value)
|
||||
return value
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Object.defineProperty(object, member.name, descriptor);
|
||||
Object.defineProperty(object, member.name, descriptor)
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// Populate object's prototype from descriptor.
|
||||
// This matches |getObjectPrototype| in rpc-server.
|
||||
let setObjectPrototype = function (object, metaId, descriptor) {
|
||||
if (descriptor === null)
|
||||
return;
|
||||
let proto = {};
|
||||
setObjectMembers(proto, metaId, descriptor.members);
|
||||
setObjectPrototype(proto, metaId, descriptor.proto);
|
||||
Object.setPrototypeOf(object, proto);
|
||||
};
|
||||
if (descriptor === null) return
|
||||
let proto = {}
|
||||
setObjectMembers(proto, metaId, descriptor.members)
|
||||
setObjectPrototype(proto, metaId, descriptor.proto)
|
||||
Object.setPrototypeOf(object, proto)
|
||||
}
|
||||
|
||||
// Convert meta data from browser into real value.
|
||||
let metaToValue = function (meta) {
|
||||
var el, i, len, ref1, results, ret;
|
||||
var el, i, len, ref1, results, ret
|
||||
switch (meta.type) {
|
||||
case 'value':
|
||||
return meta.value;
|
||||
return meta.value
|
||||
case 'array':
|
||||
ref1 = meta.members;
|
||||
results = [];
|
||||
ref1 = meta.members
|
||||
results = []
|
||||
for (i = 0, len = ref1.length; i < len; i++) {
|
||||
el = ref1[i];
|
||||
results.push(metaToValue(el));
|
||||
el = ref1[i]
|
||||
results.push(metaToValue(el))
|
||||
}
|
||||
return results;
|
||||
return results
|
||||
case 'buffer':
|
||||
return new Buffer(meta.value);
|
||||
return new Buffer(meta.value)
|
||||
case 'promise':
|
||||
return Promise.resolve({
|
||||
then: metaToValue(meta.then)
|
||||
});
|
||||
})
|
||||
case 'error':
|
||||
return metaToPlainObject(meta);
|
||||
return metaToPlainObject(meta)
|
||||
case 'date':
|
||||
return new Date(meta.value);
|
||||
return new Date(meta.value)
|
||||
case 'exception':
|
||||
throw new Error(meta.message + "\n" + meta.stack);
|
||||
throw new Error(meta.message + '\n' + meta.stack)
|
||||
default:
|
||||
if (remoteObjectCache.has(meta.id))
|
||||
return remoteObjectCache.get(meta.id);
|
||||
if (remoteObjectCache.has(meta.id)) return remoteObjectCache.get(meta.id)
|
||||
|
||||
if (meta.type === 'function') {
|
||||
// A shadow class to represent the remote function object.
|
||||
let remoteFunction = function () {
|
||||
if (this && this.constructor === remoteFunction) {
|
||||
// Constructor call.
|
||||
let obj = ipcRenderer.sendSync('ATOM_BROWSER_CONSTRUCTOR', meta.id, wrapArgs(arguments));
|
||||
let obj = ipcRenderer.sendSync('ATOM_BROWSER_CONSTRUCTOR', meta.id, wrapArgs(arguments))
|
||||
// Returning object in constructor will replace constructed object
|
||||
// with the returned object.
|
||||
// http://stackoverflow.com/questions/1978049/what-values-can-a-constructor-return-to-avoid-returning-this
|
||||
return metaToValue(obj);
|
||||
return metaToValue(obj)
|
||||
} else {
|
||||
// Function call.
|
||||
let obj = ipcRenderer.sendSync('ATOM_BROWSER_FUNCTION_CALL', meta.id, wrapArgs(arguments));
|
||||
return metaToValue(obj);
|
||||
let obj = ipcRenderer.sendSync('ATOM_BROWSER_FUNCTION_CALL', meta.id, wrapArgs(arguments))
|
||||
return metaToValue(obj)
|
||||
}
|
||||
};
|
||||
ret = remoteFunction;
|
||||
}
|
||||
ret = remoteFunction
|
||||
} else {
|
||||
ret = {};
|
||||
ret = {}
|
||||
}
|
||||
|
||||
// Populate delegate members.
|
||||
setObjectMembers(ret, meta.id, meta.members);
|
||||
setObjectMembers(ret, meta.id, meta.members)
|
||||
// Populate delegate prototype.
|
||||
setObjectPrototype(ret, meta.id, meta.proto);
|
||||
setObjectPrototype(ret, meta.id, meta.proto)
|
||||
|
||||
// Set constructor.name to object's name.
|
||||
Object.defineProperty(ret.constructor, 'name', { value: meta.name });
|
||||
Object.defineProperty(ret.constructor, 'name', { value: meta.name })
|
||||
|
||||
// Track delegate object's life time, and tell the browser to clean up
|
||||
// when the object is GCed.
|
||||
v8Util.setDestructor(ret, function () {
|
||||
ipcRenderer.send('ATOM_BROWSER_DEREFERENCE', meta.id);
|
||||
});
|
||||
ipcRenderer.send('ATOM_BROWSER_DEREFERENCE', meta.id)
|
||||
})
|
||||
|
||||
// Remember object's id.
|
||||
v8Util.setHiddenValue(ret, 'atomId', meta.id);
|
||||
remoteObjectCache.set(meta.id, ret);
|
||||
return ret;
|
||||
v8Util.setHiddenValue(ret, 'atomId', meta.id)
|
||||
remoteObjectCache.set(meta.id, ret)
|
||||
return ret
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// Construct a plain object from the meta.
|
||||
var metaToPlainObject = function (meta) {
|
||||
var i, len, obj, ref1;
|
||||
var i, len, obj, ref1
|
||||
obj = (function () {
|
||||
switch (meta.type) {
|
||||
case 'error':
|
||||
return new Error;
|
||||
return new Error()
|
||||
default:
|
||||
return {};
|
||||
return {}
|
||||
}
|
||||
})();
|
||||
ref1 = meta.members;
|
||||
})()
|
||||
ref1 = meta.members
|
||||
for (i = 0, len = ref1.length; i < len; i++) {
|
||||
let {name, value} = ref1[i];
|
||||
obj[name] = value;
|
||||
let {name, value} = ref1[i]
|
||||
obj[name] = value
|
||||
}
|
||||
return obj
|
||||
}
|
||||
return obj;
|
||||
};
|
||||
|
||||
// Browser calls a callback in renderer.
|
||||
ipcRenderer.on('ATOM_RENDERER_CALLBACK', function (event, id, args) {
|
||||
return callbacksRegistry.apply(id, metaToValue(args));
|
||||
});
|
||||
return callbacksRegistry.apply(id, metaToValue(args))
|
||||
})
|
||||
|
||||
// A callback in browser is released.
|
||||
ipcRenderer.on('ATOM_RENDERER_RELEASE_CALLBACK', function (event, id) {
|
||||
return callbacksRegistry.remove(id);
|
||||
});
|
||||
return callbacksRegistry.remove(id)
|
||||
})
|
||||
|
||||
// List all built-in modules in browser process.
|
||||
const browserModules = require('../../browser/api/exports/electron');
|
||||
const browserModules = require('../../browser/api/exports/electron')
|
||||
|
||||
// And add a helper receiver for each one.
|
||||
var fn = function (name) {
|
||||
return Object.defineProperty(exports, name, {
|
||||
get: function () {
|
||||
return exports.getBuiltin(name);
|
||||
return exports.getBuiltin(name)
|
||||
}
|
||||
})
|
||||
}
|
||||
});
|
||||
};
|
||||
for (var name in browserModules) {
|
||||
fn(name);
|
||||
fn(name)
|
||||
}
|
||||
|
||||
// Get remote module.
|
||||
exports.require = function (module) {
|
||||
return metaToValue(ipcRenderer.sendSync('ATOM_BROWSER_REQUIRE', module));
|
||||
};
|
||||
return metaToValue(ipcRenderer.sendSync('ATOM_BROWSER_REQUIRE', module))
|
||||
}
|
||||
|
||||
// Alias to remote.require('electron').xxx.
|
||||
exports.getBuiltin = function (module) {
|
||||
return metaToValue(ipcRenderer.sendSync('ATOM_BROWSER_GET_BUILTIN', module));
|
||||
};
|
||||
return metaToValue(ipcRenderer.sendSync('ATOM_BROWSER_GET_BUILTIN', module))
|
||||
}
|
||||
|
||||
// Get current BrowserWindow.
|
||||
exports.getCurrentWindow = function () {
|
||||
return metaToValue(ipcRenderer.sendSync('ATOM_BROWSER_CURRENT_WINDOW'));
|
||||
};
|
||||
return metaToValue(ipcRenderer.sendSync('ATOM_BROWSER_CURRENT_WINDOW'))
|
||||
}
|
||||
|
||||
// Get current WebContents object.
|
||||
exports.getCurrentWebContents = function () {
|
||||
return metaToValue(ipcRenderer.sendSync('ATOM_BROWSER_CURRENT_WEB_CONTENTS'));
|
||||
};
|
||||
return metaToValue(ipcRenderer.sendSync('ATOM_BROWSER_CURRENT_WEB_CONTENTS'))
|
||||
}
|
||||
|
||||
// Get a global object in browser.
|
||||
exports.getGlobal = function (name) {
|
||||
return metaToValue(ipcRenderer.sendSync('ATOM_BROWSER_GLOBAL', name));
|
||||
};
|
||||
return metaToValue(ipcRenderer.sendSync('ATOM_BROWSER_GLOBAL', name))
|
||||
}
|
||||
|
||||
// Get the process object in browser.
|
||||
exports.__defineGetter__('process', function () {
|
||||
return exports.getGlobal('process');
|
||||
});
|
||||
return exports.getGlobal('process')
|
||||
})
|
||||
|
||||
// Create a funtion that will return the specifed value when called in browser.
|
||||
exports.createFunctionWithReturnValue = function (returnValue) {
|
||||
var func;
|
||||
var func
|
||||
func = function () {
|
||||
return returnValue;
|
||||
};
|
||||
v8Util.setHiddenValue(func, 'returnValue', true);
|
||||
return func;
|
||||
};
|
||||
return returnValue
|
||||
}
|
||||
v8Util.setHiddenValue(func, 'returnValue', true)
|
||||
return func
|
||||
}
|
||||
|
||||
// Get the guest WebContents from guestInstanceId.
|
||||
exports.getGuestWebContents = function (guestInstanceId) {
|
||||
var meta;
|
||||
meta = ipcRenderer.sendSync('ATOM_BROWSER_GUEST_WEB_CONTENTS', guestInstanceId);
|
||||
return metaToValue(meta);
|
||||
};
|
||||
var meta
|
||||
meta = ipcRenderer.sendSync('ATOM_BROWSER_GUEST_WEB_CONTENTS', guestInstanceId)
|
||||
return metaToValue(meta)
|
||||
}
|
||||
|
|
|
@ -1 +1 @@
|
|||
module.exports = require('electron').remote.screen;
|
||||
module.exports = require('electron').remote.screen
|
||||
|
|
|
@ -1,19 +1,19 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const deprecate = require('electron').deprecate;
|
||||
const EventEmitter = require('events').EventEmitter;
|
||||
const deprecate = require('electron').deprecate
|
||||
const EventEmitter = require('events').EventEmitter
|
||||
|
||||
const webFrame = process.atomBinding('web_frame').webFrame;
|
||||
const webFrame = process.atomBinding('web_frame').webFrame
|
||||
|
||||
// webFrame is an EventEmitter.
|
||||
webFrame.__proto__ = EventEmitter.prototype;
|
||||
Object.setPrototypeOf(webFrame, EventEmitter.prototype)
|
||||
|
||||
// Lots of webview would subscribe to webFrame's events.
|
||||
webFrame.setMaxListeners(0);
|
||||
webFrame.setMaxListeners(0)
|
||||
|
||||
// Deprecated.
|
||||
deprecate.rename(webFrame, 'registerUrlSchemeAsSecure', 'registerURLSchemeAsSecure');
|
||||
deprecate.rename(webFrame, 'registerUrlSchemeAsBypassingCSP', 'registerURLSchemeAsBypassingCSP');
|
||||
deprecate.rename(webFrame, 'registerUrlSchemeAsPrivileged', 'registerURLSchemeAsPrivileged');
|
||||
deprecate.rename(webFrame, 'registerUrlSchemeAsSecure', 'registerURLSchemeAsSecure')
|
||||
deprecate.rename(webFrame, 'registerUrlSchemeAsBypassingCSP', 'registerURLSchemeAsBypassingCSP')
|
||||
deprecate.rename(webFrame, 'registerUrlSchemeAsPrivileged', 'registerURLSchemeAsPrivileged')
|
||||
|
||||
module.exports = webFrame;
|
||||
module.exports = webFrame
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
const url = require('url');
|
||||
const chrome = window.chrome = window.chrome || {};
|
||||
const url = require('url')
|
||||
const chrome = window.chrome = window.chrome || {}
|
||||
|
||||
chrome.extension = {
|
||||
getURL: function (path) {
|
||||
return url.format({
|
||||
protocol: location.protocol,
|
||||
protocol: window.location.protocol,
|
||||
slashes: true,
|
||||
hostname: location.hostname,
|
||||
hostname: window.location.hostname,
|
||||
pathname: path
|
||||
});
|
||||
})
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
@ -1,139 +1,139 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const events = require('events');
|
||||
const path = require('path');
|
||||
const Module = require('module');
|
||||
const events = require('events')
|
||||
const path = require('path')
|
||||
const Module = require('module')
|
||||
|
||||
// We modified the original process.argv to let node.js load the
|
||||
// atom-renderer.js, we need to restore it here.
|
||||
process.argv.splice(1, 1);
|
||||
process.argv.splice(1, 1)
|
||||
|
||||
// Clear search paths.
|
||||
require('../common/reset-search-paths');
|
||||
require('../common/reset-search-paths')
|
||||
|
||||
// Import common settings.
|
||||
require('../common/init');
|
||||
require('../common/init')
|
||||
|
||||
var globalPaths = Module.globalPaths;
|
||||
var globalPaths = Module.globalPaths
|
||||
|
||||
if (!process.env.ELECTRON_HIDE_INTERNAL_MODULES) {
|
||||
globalPaths.push(path.join(__dirname, 'api'));
|
||||
globalPaths.push(path.join(__dirname, 'api'))
|
||||
}
|
||||
|
||||
// Expose public APIs.
|
||||
globalPaths.push(path.join(__dirname, 'api', 'exports'));
|
||||
globalPaths.push(path.join(__dirname, 'api', 'exports'))
|
||||
|
||||
// The global variable will be used by ipc for event dispatching
|
||||
var v8Util = process.atomBinding('v8_util');
|
||||
var v8Util = process.atomBinding('v8_util')
|
||||
|
||||
v8Util.setHiddenValue(global, 'ipc', new events.EventEmitter);
|
||||
v8Util.setHiddenValue(global, 'ipc', new events.EventEmitter())
|
||||
|
||||
// Use electron module after everything is ready.
|
||||
const electron = require('electron');
|
||||
const electron = require('electron')
|
||||
|
||||
// Call webFrame method.
|
||||
electron.ipcRenderer.on('ELECTRON_INTERNAL_RENDERER_WEB_FRAME_METHOD', (event, method, args) => {
|
||||
electron.webFrame[method].apply(electron.webFrame, args);
|
||||
});
|
||||
electron.webFrame[method].apply(electron.webFrame, args)
|
||||
})
|
||||
|
||||
electron.ipcRenderer.on('ELECTRON_INTERNAL_RENDERER_ASYNC_WEB_FRAME_METHOD', (event, requestId, method, args) => {
|
||||
const responseCallback = function (result) {
|
||||
event.sender.send(`ELECTRON_INTERNAL_BROWSER_ASYNC_WEB_FRAME_RESPONSE_${requestId}`, result);
|
||||
};
|
||||
args.push(responseCallback);
|
||||
electron.webFrame[method].apply(electron.webFrame, args);
|
||||
});
|
||||
event.sender.send(`ELECTRON_INTERNAL_BROWSER_ASYNC_WEB_FRAME_RESPONSE_${requestId}`, result)
|
||||
}
|
||||
args.push(responseCallback)
|
||||
electron.webFrame[method].apply(electron.webFrame, args)
|
||||
})
|
||||
|
||||
// Process command line arguments.
|
||||
var nodeIntegration = 'false';
|
||||
var preloadScript = null;
|
||||
var nodeIntegration = 'false'
|
||||
var preloadScript = null
|
||||
|
||||
var ref = process.argv;
|
||||
var i, len, arg;
|
||||
var ref = process.argv
|
||||
var i, len, arg
|
||||
for (i = 0, len = ref.length; i < len; i++) {
|
||||
arg = ref[i];
|
||||
arg = ref[i]
|
||||
if (arg.indexOf('--guest-instance-id=') === 0) {
|
||||
// This is a guest web view.
|
||||
process.guestInstanceId = parseInt(arg.substr(arg.indexOf('=') + 1));
|
||||
process.guestInstanceId = parseInt(arg.substr(arg.indexOf('=') + 1))
|
||||
} else if (arg.indexOf('--opener-id=') === 0) {
|
||||
// This is a guest BrowserWindow.
|
||||
process.openerId = parseInt(arg.substr(arg.indexOf('=') + 1));
|
||||
process.openerId = parseInt(arg.substr(arg.indexOf('=') + 1))
|
||||
} else if (arg.indexOf('--node-integration=') === 0) {
|
||||
nodeIntegration = arg.substr(arg.indexOf('=') + 1);
|
||||
nodeIntegration = arg.substr(arg.indexOf('=') + 1)
|
||||
} else if (arg.indexOf('--preload=') === 0) {
|
||||
preloadScript = arg.substr(arg.indexOf('=') + 1);
|
||||
preloadScript = arg.substr(arg.indexOf('=') + 1)
|
||||
}
|
||||
}
|
||||
|
||||
if (location.protocol === 'chrome-devtools:') {
|
||||
if (window.location.protocol === 'chrome-devtools:') {
|
||||
// Override some inspector APIs.
|
||||
require('./inspector');
|
||||
nodeIntegration = 'true';
|
||||
} else if (location.protocol === 'chrome-extension:') {
|
||||
require('./inspector')
|
||||
nodeIntegration = 'true'
|
||||
} else if (window.location.protocol === 'chrome-extension:') {
|
||||
// Add implementations of chrome API.
|
||||
require('./chrome-api');
|
||||
nodeIntegration = 'true';
|
||||
require('./chrome-api')
|
||||
nodeIntegration = 'true'
|
||||
} else {
|
||||
// Override default web functions.
|
||||
require('./override');
|
||||
require('./override')
|
||||
|
||||
// Load webview tag implementation.
|
||||
if (process.guestInstanceId == null) {
|
||||
require('./web-view/web-view');
|
||||
require('./web-view/web-view-attributes');
|
||||
require('./web-view/web-view')
|
||||
require('./web-view/web-view-attributes')
|
||||
}
|
||||
}
|
||||
|
||||
if (nodeIntegration === 'true' || nodeIntegration === 'all' || nodeIntegration === 'except-iframe' || nodeIntegration === 'manual-enable-iframe') {
|
||||
// Export node bindings to global.
|
||||
global.require = require;
|
||||
global.module = module;
|
||||
global.require = require
|
||||
global.module = module
|
||||
|
||||
// Set the __filename to the path of html file if it is file: protocol.
|
||||
if (window.location.protocol === 'file:') {
|
||||
var pathname = process.platform === 'win32' && window.location.pathname[0] === '/' ? window.location.pathname.substr(1) : window.location.pathname;
|
||||
global.__filename = path.normalize(decodeURIComponent(pathname));
|
||||
global.__dirname = path.dirname(global.__filename);
|
||||
var pathname = process.platform === 'win32' && window.location.pathname[0] === '/' ? window.location.pathname.substr(1) : window.location.pathname
|
||||
global.__filename = path.normalize(decodeURIComponent(pathname))
|
||||
global.__dirname = path.dirname(global.__filename)
|
||||
|
||||
// Set module's filename so relative require can work as expected.
|
||||
module.filename = global.__filename;
|
||||
module.filename = global.__filename
|
||||
|
||||
// Also search for module under the html file.
|
||||
module.paths = module.paths.concat(Module._nodeModulePaths(global.__dirname));
|
||||
module.paths = module.paths.concat(Module._nodeModulePaths(global.__dirname))
|
||||
} else {
|
||||
global.__filename = __filename;
|
||||
global.__dirname = __dirname;
|
||||
global.__filename = __filename
|
||||
global.__dirname = __dirname
|
||||
}
|
||||
|
||||
// Redirect window.onerror to uncaughtException.
|
||||
window.onerror = function (message, filename, lineno, colno, error) {
|
||||
if (global.process.listeners('uncaughtException').length > 0) {
|
||||
global.process.emit('uncaughtException', error);
|
||||
return true;
|
||||
global.process.emit('uncaughtException', error)
|
||||
return true
|
||||
} else {
|
||||
return false;
|
||||
return false
|
||||
}
|
||||
}
|
||||
};
|
||||
} else {
|
||||
// Delete Node's symbols after the Environment has been loaded.
|
||||
process.once('loaded', function () {
|
||||
delete global.process;
|
||||
delete global.setImmediate;
|
||||
delete global.clearImmediate;
|
||||
return delete global.global;
|
||||
});
|
||||
delete global.process
|
||||
delete global.setImmediate
|
||||
delete global.clearImmediate
|
||||
return delete global.global
|
||||
})
|
||||
}
|
||||
|
||||
// Load the script specfied by the "preload" attribute.
|
||||
if (preloadScript) {
|
||||
try {
|
||||
require(preloadScript);
|
||||
require(preloadScript)
|
||||
} catch (error) {
|
||||
if (error.code === 'MODULE_NOT_FOUND') {
|
||||
console.error("Unable to load preload script " + preloadScript);
|
||||
console.error('Unable to load preload script ' + preloadScript)
|
||||
} else {
|
||||
console.error(error);
|
||||
console.error(error.stack);
|
||||
console.error(error)
|
||||
console.error(error.stack)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,16 +1,16 @@
|
|||
window.onload = function () {
|
||||
// Use menu API to show context menu.
|
||||
InspectorFrontendHost.showContextMenuAtPoint = createMenu;
|
||||
window.InspectorFrontendHost.showContextMenuAtPoint = createMenu
|
||||
|
||||
// Use dialog API to override file chooser dialog.
|
||||
return (WebInspector.createFileSelectorElement = createFileSelectorElement);
|
||||
};
|
||||
return (window.WebInspector.createFileSelectorElement = createFileSelectorElement)
|
||||
}
|
||||
|
||||
var convertToMenuTemplate = function (items) {
|
||||
var fn, i, item, len, template;
|
||||
template = [];
|
||||
var fn, i, item, len, template
|
||||
template = []
|
||||
fn = function (item) {
|
||||
var transformed;
|
||||
var transformed
|
||||
transformed = item.type === 'subMenu' ? {
|
||||
type: 'submenu',
|
||||
label: item.label,
|
||||
|
@ -27,55 +27,55 @@ var convertToMenuTemplate = function(items) {
|
|||
type: 'normal',
|
||||
label: item.label,
|
||||
enabled: item.enabled
|
||||
};
|
||||
}
|
||||
if (item.id != null) {
|
||||
transformed.click = function () {
|
||||
DevToolsAPI.contextMenuItemSelected(item.id);
|
||||
return DevToolsAPI.contextMenuCleared();
|
||||
};
|
||||
window.DevToolsAPI.contextMenuItemSelected(item.id)
|
||||
return window.DevToolsAPI.contextMenuCleared()
|
||||
}
|
||||
}
|
||||
return template.push(transformed)
|
||||
}
|
||||
return template.push(transformed);
|
||||
};
|
||||
for (i = 0, len = items.length; i < len; i++) {
|
||||
item = items[i];
|
||||
fn(item);
|
||||
item = items[i]
|
||||
fn(item)
|
||||
}
|
||||
return template
|
||||
}
|
||||
return template;
|
||||
};
|
||||
|
||||
var createMenu = function (x, y, items) {
|
||||
const remote = require('electron').remote;
|
||||
const Menu = remote.Menu;
|
||||
const menu = Menu.buildFromTemplate(convertToMenuTemplate(items));
|
||||
const remote = require('electron').remote
|
||||
const Menu = remote.Menu
|
||||
const menu = Menu.buildFromTemplate(convertToMenuTemplate(items))
|
||||
|
||||
// The menu is expected to show asynchronously.
|
||||
return setTimeout(function () {
|
||||
return menu.popup(remote.getCurrentWindow());
|
||||
});
|
||||
};
|
||||
return menu.popup(remote.getCurrentWindow())
|
||||
})
|
||||
}
|
||||
|
||||
var showFileChooserDialog = function (callback) {
|
||||
var dialog, files, remote;
|
||||
remote = require('electron').remote;
|
||||
dialog = remote.dialog;
|
||||
files = dialog.showOpenDialog({});
|
||||
var dialog, files, remote
|
||||
remote = require('electron').remote
|
||||
dialog = remote.dialog
|
||||
files = dialog.showOpenDialog({})
|
||||
if (files != null) {
|
||||
return callback(pathToHtml5FileObject(files[0]));
|
||||
return callback(pathToHtml5FileObject(files[0]))
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
var pathToHtml5FileObject = function (path) {
|
||||
var blob, fs;
|
||||
fs = require('fs');
|
||||
blob = new Blob([fs.readFileSync(path)]);
|
||||
blob.name = path;
|
||||
return blob;
|
||||
};
|
||||
var blob, fs
|
||||
fs = require('fs')
|
||||
blob = new Blob([fs.readFileSync(path)])
|
||||
blob.name = path
|
||||
return blob
|
||||
}
|
||||
|
||||
var createFileSelectorElement = function (callback) {
|
||||
var fileSelectorElement;
|
||||
fileSelectorElement = document.createElement('span');
|
||||
fileSelectorElement.style.display = 'none';
|
||||
fileSelectorElement.click = showFileChooserDialog.bind(this, callback);
|
||||
return fileSelectorElement;
|
||||
};
|
||||
var fileSelectorElement
|
||||
fileSelectorElement = document.createElement('span')
|
||||
fileSelectorElement.style.display = 'none'
|
||||
fileSelectorElement.click = showFileChooserDialog.bind(this, callback)
|
||||
return fileSelectorElement
|
||||
}
|
||||
|
|
|
@ -1,266 +1,266 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const ipcRenderer = require('electron').ipcRenderer;
|
||||
const remote = require('electron').remote;
|
||||
const ipcRenderer = require('electron').ipcRenderer
|
||||
const remote = require('electron').remote
|
||||
|
||||
// Cache browser window visibility
|
||||
var _isVisible = true;
|
||||
var _isMinimized = false;
|
||||
(function() {
|
||||
var currentWindow;
|
||||
currentWindow = remote.getCurrentWindow();
|
||||
_isVisible = currentWindow.isVisible();
|
||||
_isMinimized = currentWindow.isMinimized();
|
||||
})();
|
||||
var _isVisible = true
|
||||
var _isMinimized = false
|
||||
var initWindow = function initWindow () {
|
||||
var currentWindow
|
||||
currentWindow = remote.getCurrentWindow()
|
||||
_isVisible = currentWindow.isVisible()
|
||||
_isMinimized = currentWindow.isMinimized()
|
||||
}
|
||||
initWindow()
|
||||
|
||||
// Helper function to resolve relative url.
|
||||
var a = window.top.document.createElement('a');
|
||||
var a = window.top.document.createElement('a')
|
||||
|
||||
var resolveURL = function (url) {
|
||||
a.href = url;
|
||||
return a.href;
|
||||
};
|
||||
a.href = url
|
||||
return a.href
|
||||
}
|
||||
|
||||
// Window object returned by "window.open".
|
||||
var BrowserWindowProxy = (function () {
|
||||
BrowserWindowProxy.proxies = {};
|
||||
BrowserWindowProxy.proxies = {}
|
||||
|
||||
BrowserWindowProxy.getOrCreate = function (guestId) {
|
||||
var base;
|
||||
return (base = this.proxies)[guestId] != null ? base[guestId] : base[guestId] = new BrowserWindowProxy(guestId);
|
||||
};
|
||||
var base
|
||||
return (base = this.proxies)[guestId] != null ? base[guestId] : base[guestId] = new BrowserWindowProxy(guestId)
|
||||
}
|
||||
|
||||
BrowserWindowProxy.remove = function (guestId) {
|
||||
return delete this.proxies[guestId];
|
||||
};
|
||||
return delete this.proxies[guestId]
|
||||
}
|
||||
|
||||
function BrowserWindowProxy (guestId1) {
|
||||
this.guestId = guestId1;
|
||||
this.closed = false;
|
||||
ipcRenderer.once("ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_CLOSED_" + this.guestId, () => {
|
||||
BrowserWindowProxy.remove(this.guestId);
|
||||
this.closed = true;
|
||||
});
|
||||
this.guestId = guestId1
|
||||
this.closed = false
|
||||
ipcRenderer.once('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_CLOSED_' + this.guestId, () => {
|
||||
BrowserWindowProxy.remove(this.guestId)
|
||||
this.closed = true
|
||||
})
|
||||
}
|
||||
|
||||
BrowserWindowProxy.prototype.close = function () {
|
||||
return ipcRenderer.send('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_CLOSE', this.guestId);
|
||||
};
|
||||
return ipcRenderer.send('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_CLOSE', this.guestId)
|
||||
}
|
||||
|
||||
BrowserWindowProxy.prototype.focus = function () {
|
||||
return ipcRenderer.send('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_METHOD', this.guestId, 'focus');
|
||||
};
|
||||
return ipcRenderer.send('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_METHOD', this.guestId, 'focus')
|
||||
}
|
||||
|
||||
BrowserWindowProxy.prototype.blur = function () {
|
||||
return ipcRenderer.send('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_METHOD', this.guestId, 'blur');
|
||||
};
|
||||
return ipcRenderer.send('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_METHOD', this.guestId, 'blur')
|
||||
}
|
||||
|
||||
Object.defineProperty(BrowserWindowProxy.prototype, 'location', {
|
||||
get: function () {
|
||||
return ipcRenderer.sendSync('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_METHOD', this.guestId, 'getURL');
|
||||
return ipcRenderer.sendSync('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_METHOD', this.guestId, 'getURL')
|
||||
},
|
||||
set: function (url) {
|
||||
return ipcRenderer.sendSync('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_METHOD', this.guestId, 'loadURL', url);
|
||||
return ipcRenderer.sendSync('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_METHOD', this.guestId, 'loadURL', url)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
BrowserWindowProxy.prototype.postMessage = function (message, targetOrigin) {
|
||||
if (targetOrigin == null) {
|
||||
targetOrigin = '*';
|
||||
targetOrigin = '*'
|
||||
}
|
||||
return ipcRenderer.send('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_POSTMESSAGE', this.guestId, message, targetOrigin, window.location.origin)
|
||||
}
|
||||
return ipcRenderer.send('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_POSTMESSAGE', this.guestId, message, targetOrigin, location.origin);
|
||||
};
|
||||
|
||||
BrowserWindowProxy.prototype["eval"] = function(...args) {
|
||||
return ipcRenderer.send.apply(ipcRenderer, ['ATOM_SHELL_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD', this.guestId, 'executeJavaScript'].concat(args));
|
||||
};
|
||||
BrowserWindowProxy.prototype['eval'] = function (...args) {
|
||||
return ipcRenderer.send.apply(ipcRenderer, ['ATOM_SHELL_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD', this.guestId, 'executeJavaScript'].concat(args))
|
||||
}
|
||||
|
||||
return BrowserWindowProxy;
|
||||
|
||||
})();
|
||||
return BrowserWindowProxy
|
||||
})()
|
||||
|
||||
if (process.guestInstanceId == null) {
|
||||
// Override default window.close.
|
||||
window.close = function () {
|
||||
return remote.getCurrentWindow().close();
|
||||
};
|
||||
return remote.getCurrentWindow().close()
|
||||
}
|
||||
}
|
||||
|
||||
// Make the browser window or guest view emit "new-window" event.
|
||||
window.open = function (url, frameName, features) {
|
||||
var feature, guestId, i, j, len, len1, name, options, ref1, ref2, value;
|
||||
var feature, guestId, i, j, len, len1, name, options, ref1, ref2, value
|
||||
if (frameName == null) {
|
||||
frameName = '';
|
||||
frameName = ''
|
||||
}
|
||||
if (features == null) {
|
||||
features = '';
|
||||
features = ''
|
||||
}
|
||||
options = {};
|
||||
options = {}
|
||||
|
||||
// TODO remove hyphenated options in both of the following arrays for 1.0
|
||||
const ints = ['x', 'y', 'width', 'height', 'min-width', 'minWidth', 'max-width', 'maxWidth', 'min-height', 'minHeight', 'max-height', 'maxHeight', 'zoom-factor', 'zoomFactor'];
|
||||
const webPreferences = ['zoom-factor', 'zoomFactor', 'node-integration', 'nodeIntegration', 'preload'];
|
||||
const ints = ['x', 'y', 'width', 'height', 'min-width', 'minWidth', 'max-width', 'maxWidth', 'min-height', 'minHeight', 'max-height', 'maxHeight', 'zoom-factor', 'zoomFactor']
|
||||
const webPreferences = ['zoom-factor', 'zoomFactor', 'node-integration', 'nodeIntegration', 'preload']
|
||||
|
||||
// Make sure to get rid of excessive whitespace in the property name
|
||||
ref1 = features.split(/,\s*/);
|
||||
ref1 = features.split(/,\s*/)
|
||||
for (i = 0, len = ref1.length; i < len; i++) {
|
||||
feature = ref1[i];
|
||||
ref2 = feature.split(/\s*=/);
|
||||
name = ref2[0];
|
||||
value = ref2[1];
|
||||
value = value === 'yes' || value === '1' ? true : value === 'no' || value === '0' ? false : value;
|
||||
feature = ref1[i]
|
||||
ref2 = feature.split(/\s*=/)
|
||||
name = ref2[0]
|
||||
value = ref2[1]
|
||||
value = value === 'yes' || value === '1' ? true : value === 'no' || value === '0' ? false : value
|
||||
if (webPreferences.includes(name)) {
|
||||
if (options.webPreferences == null) {
|
||||
options.webPreferences = {};
|
||||
options.webPreferences = {}
|
||||
}
|
||||
options.webPreferences[name] = value;
|
||||
options.webPreferences[name] = value
|
||||
} else {
|
||||
options[name] = value;
|
||||
options[name] = value
|
||||
}
|
||||
}
|
||||
if (options.left) {
|
||||
if (options.x == null) {
|
||||
options.x = options.left;
|
||||
options.x = options.left
|
||||
}
|
||||
}
|
||||
if (options.top) {
|
||||
if (options.y == null) {
|
||||
options.y = options.top;
|
||||
options.y = options.top
|
||||
}
|
||||
}
|
||||
if (options.title == null) {
|
||||
options.title = frameName;
|
||||
options.title = frameName
|
||||
}
|
||||
if (options.width == null) {
|
||||
options.width = 800;
|
||||
options.width = 800
|
||||
}
|
||||
if (options.height == null) {
|
||||
options.height = 600;
|
||||
options.height = 600
|
||||
}
|
||||
|
||||
// Resolve relative urls.
|
||||
url = resolveURL(url);
|
||||
url = resolveURL(url)
|
||||
for (j = 0, len1 = ints.length; j < len1; j++) {
|
||||
name = ints[j];
|
||||
name = ints[j]
|
||||
if (options[name] != null) {
|
||||
options[name] = parseInt(options[name], 10);
|
||||
options[name] = parseInt(options[name], 10)
|
||||
}
|
||||
}
|
||||
guestId = ipcRenderer.sendSync('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_OPEN', url, frameName, options);
|
||||
guestId = ipcRenderer.sendSync('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_OPEN', url, frameName, options)
|
||||
if (guestId) {
|
||||
return BrowserWindowProxy.getOrCreate(guestId);
|
||||
return BrowserWindowProxy.getOrCreate(guestId)
|
||||
} else {
|
||||
return null;
|
||||
return null
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// Use the dialog API to implement alert().
|
||||
window.alert = function (message, title) {
|
||||
var buttons;
|
||||
if (arguments.length == 0) {
|
||||
message = '';
|
||||
var buttons
|
||||
if (arguments.length === 0) {
|
||||
message = ''
|
||||
}
|
||||
if (title == null) {
|
||||
title = '';
|
||||
title = ''
|
||||
}
|
||||
buttons = ['OK'];
|
||||
message = String(message);
|
||||
buttons = ['OK']
|
||||
message = String(message)
|
||||
remote.dialog.showMessageBox(remote.getCurrentWindow(), {
|
||||
message: message,
|
||||
title: title,
|
||||
buttons: buttons
|
||||
});
|
||||
})
|
||||
|
||||
// Alert should always return undefined.
|
||||
};
|
||||
}
|
||||
|
||||
// And the confirm().
|
||||
window.confirm = function (message, title) {
|
||||
var buttons, cancelId;
|
||||
var buttons, cancelId
|
||||
if (title == null) {
|
||||
title = '';
|
||||
title = ''
|
||||
}
|
||||
buttons = ['OK', 'Cancel'];
|
||||
cancelId = 1;
|
||||
buttons = ['OK', 'Cancel']
|
||||
cancelId = 1
|
||||
return !remote.dialog.showMessageBox(remote.getCurrentWindow(), {
|
||||
message: message,
|
||||
title: title,
|
||||
buttons: buttons,
|
||||
cancelId: cancelId
|
||||
});
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
// But we do not support prompt().
|
||||
window.prompt = function () {
|
||||
throw new Error('prompt() is and will not be supported.');
|
||||
};
|
||||
throw new Error('prompt() is and will not be supported.')
|
||||
}
|
||||
|
||||
if (process.openerId != null) {
|
||||
window.opener = BrowserWindowProxy.getOrCreate(process.openerId);
|
||||
window.opener = BrowserWindowProxy.getOrCreate(process.openerId)
|
||||
}
|
||||
|
||||
ipcRenderer.on('ATOM_RENDERER_WINDOW_VISIBILITY_CHANGE', function (event, isVisible, isMinimized) {
|
||||
var hasChanged = _isVisible != isVisible || _isMinimized != isMinimized;
|
||||
var hasChanged = _isVisible !== isVisible || _isMinimized !== isMinimized
|
||||
|
||||
if (hasChanged) {
|
||||
_isVisible = isVisible;
|
||||
_isMinimized = isMinimized;
|
||||
_isVisible = isVisible
|
||||
_isMinimized = isMinimized
|
||||
|
||||
document.dispatchEvent(new Event('visibilitychange'));
|
||||
document.dispatchEvent(new Event('visibilitychange'))
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
ipcRenderer.on('ATOM_SHELL_GUEST_WINDOW_POSTMESSAGE', function (event, sourceId, message, sourceOrigin) {
|
||||
// Manually dispatch event instead of using postMessage because we also need to
|
||||
// set event.source.
|
||||
event = document.createEvent('Event');
|
||||
event.initEvent('message', false, false);
|
||||
event.data = message;
|
||||
event.origin = sourceOrigin;
|
||||
event.source = BrowserWindowProxy.getOrCreate(sourceId);
|
||||
return window.dispatchEvent(event);
|
||||
});
|
||||
event = document.createEvent('Event')
|
||||
event.initEvent('message', false, false)
|
||||
event.data = message
|
||||
event.origin = sourceOrigin
|
||||
event.source = BrowserWindowProxy.getOrCreate(sourceId)
|
||||
return window.dispatchEvent(event)
|
||||
})
|
||||
|
||||
// Forward history operations to browser.
|
||||
var sendHistoryOperation = function (...args) {
|
||||
return ipcRenderer.send.apply(ipcRenderer, ['ATOM_SHELL_NAVIGATION_CONTROLLER'].concat(args));
|
||||
};
|
||||
return ipcRenderer.send.apply(ipcRenderer, ['ATOM_SHELL_NAVIGATION_CONTROLLER'].concat(args))
|
||||
}
|
||||
|
||||
var getHistoryOperation = function (...args) {
|
||||
return ipcRenderer.sendSync.apply(ipcRenderer, ['ATOM_SHELL_SYNC_NAVIGATION_CONTROLLER'].concat(args));
|
||||
};
|
||||
return ipcRenderer.sendSync.apply(ipcRenderer, ['ATOM_SHELL_SYNC_NAVIGATION_CONTROLLER'].concat(args))
|
||||
}
|
||||
|
||||
window.history.back = function () {
|
||||
return sendHistoryOperation('goBack');
|
||||
};
|
||||
return sendHistoryOperation('goBack')
|
||||
}
|
||||
|
||||
window.history.forward = function () {
|
||||
return sendHistoryOperation('goForward');
|
||||
};
|
||||
return sendHistoryOperation('goForward')
|
||||
}
|
||||
|
||||
window.history.go = function (offset) {
|
||||
return sendHistoryOperation('goToOffset', offset);
|
||||
};
|
||||
return sendHistoryOperation('goToOffset', offset)
|
||||
}
|
||||
|
||||
Object.defineProperty(window.history, 'length', {
|
||||
get: function () {
|
||||
return getHistoryOperation('length');
|
||||
return getHistoryOperation('length')
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
// Make document.hidden and document.visibilityState return the correct value.
|
||||
Object.defineProperty(document, 'hidden', {
|
||||
get: function () {
|
||||
return _isMinimized || !_isVisible;
|
||||
return _isMinimized || !_isVisible
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
Object.defineProperty(document, 'visibilityState', {
|
||||
get: function () {
|
||||
if (_isVisible && !_isMinimized) {
|
||||
return "visible";
|
||||
return 'visible'
|
||||
} else {
|
||||
return "hidden";
|
||||
return 'hidden'
|
||||
}
|
||||
}
|
||||
});
|
||||
})
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const ipcRenderer = require('electron').ipcRenderer;
|
||||
const webFrame = require('electron').webFrame;
|
||||
const ipcRenderer = require('electron').ipcRenderer
|
||||
const webFrame = require('electron').webFrame
|
||||
|
||||
var requestId= 0;
|
||||
var requestId = 0
|
||||
|
||||
var WEB_VIEW_EVENTS = {
|
||||
'load-commit': ['url', 'isMainFrame'],
|
||||
|
@ -36,71 +36,71 @@ var WEB_VIEW_EVENTS = {
|
|||
'enter-html-full-screen': [],
|
||||
'leave-html-full-screen': [],
|
||||
'found-in-page': ['result']
|
||||
};
|
||||
}
|
||||
|
||||
var DEPRECATED_EVENTS = {
|
||||
'page-title-updated': 'page-title-set'
|
||||
};
|
||||
}
|
||||
|
||||
var dispatchEvent = function (webView, eventName, eventKey, ...args) {
|
||||
var domEvent, f, i, j, len, ref1;
|
||||
var domEvent, f, i, j, len, ref1
|
||||
if (DEPRECATED_EVENTS[eventName] != null) {
|
||||
dispatchEvent.apply(null, [webView, DEPRECATED_EVENTS[eventName], eventKey].concat(args));
|
||||
dispatchEvent.apply(null, [webView, DEPRECATED_EVENTS[eventName], eventKey].concat(args))
|
||||
}
|
||||
domEvent = new Event(eventName);
|
||||
ref1 = WEB_VIEW_EVENTS[eventKey];
|
||||
domEvent = new Event(eventName)
|
||||
ref1 = WEB_VIEW_EVENTS[eventKey]
|
||||
for (i = j = 0, len = ref1.length; j < len; i = ++j) {
|
||||
f = ref1[i];
|
||||
domEvent[f] = args[i];
|
||||
f = ref1[i]
|
||||
domEvent[f] = args[i]
|
||||
}
|
||||
webView.dispatchEvent(domEvent);
|
||||
webView.dispatchEvent(domEvent)
|
||||
if (eventName === 'load-commit') {
|
||||
return webView.onLoadCommit(domEvent);
|
||||
return webView.onLoadCommit(domEvent)
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
module.exports = {
|
||||
registerEvents: function (webView, viewInstanceId) {
|
||||
ipcRenderer.on("ATOM_SHELL_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-" + viewInstanceId, function(event, eventName, ...args) {
|
||||
return dispatchEvent.apply(null, [webView, eventName, eventName].concat(args));
|
||||
});
|
||||
ipcRenderer.on('ATOM_SHELL_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-' + viewInstanceId, function (event, eventName, ...args) {
|
||||
return dispatchEvent.apply(null, [webView, eventName, eventName].concat(args))
|
||||
})
|
||||
|
||||
ipcRenderer.on("ATOM_SHELL_GUEST_VIEW_INTERNAL_IPC_MESSAGE-" + viewInstanceId, function(event, channel, ...args) {
|
||||
var domEvent = new Event('ipc-message');
|
||||
domEvent.channel = channel;
|
||||
domEvent.args = args;
|
||||
return webView.dispatchEvent(domEvent);
|
||||
});
|
||||
ipcRenderer.on('ATOM_SHELL_GUEST_VIEW_INTERNAL_IPC_MESSAGE-' + viewInstanceId, function (event, channel, ...args) {
|
||||
var domEvent = new Event('ipc-message')
|
||||
domEvent.channel = channel
|
||||
domEvent.args = args
|
||||
return webView.dispatchEvent(domEvent)
|
||||
})
|
||||
|
||||
return ipcRenderer.on("ATOM_SHELL_GUEST_VIEW_INTERNAL_SIZE_CHANGED-" + viewInstanceId, function(event, ...args) {
|
||||
var domEvent, f, i, j, len, ref1;
|
||||
domEvent = new Event('size-changed');
|
||||
ref1 = ['oldWidth', 'oldHeight', 'newWidth', 'newHeight'];
|
||||
return ipcRenderer.on('ATOM_SHELL_GUEST_VIEW_INTERNAL_SIZE_CHANGED-' + viewInstanceId, function (event, ...args) {
|
||||
var domEvent, f, i, j, len, ref1
|
||||
domEvent = new Event('size-changed')
|
||||
ref1 = ['oldWidth', 'oldHeight', 'newWidth', 'newHeight']
|
||||
for (i = j = 0, len = ref1.length; j < len; i = ++j) {
|
||||
f = ref1[i];
|
||||
domEvent[f] = args[i];
|
||||
f = ref1[i]
|
||||
domEvent[f] = args[i]
|
||||
}
|
||||
return webView.onSizeChanged(domEvent);
|
||||
});
|
||||
return webView.onSizeChanged(domEvent)
|
||||
})
|
||||
},
|
||||
deregisterEvents: function (viewInstanceId) {
|
||||
ipcRenderer.removeAllListeners("ATOM_SHELL_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-" + viewInstanceId);
|
||||
ipcRenderer.removeAllListeners("ATOM_SHELL_GUEST_VIEW_INTERNAL_IPC_MESSAGE-" + viewInstanceId);
|
||||
return ipcRenderer.removeAllListeners("ATOM_SHELL_GUEST_VIEW_INTERNAL_SIZE_CHANGED-" + viewInstanceId);
|
||||
ipcRenderer.removeAllListeners('ATOM_SHELL_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-' + viewInstanceId)
|
||||
ipcRenderer.removeAllListeners('ATOM_SHELL_GUEST_VIEW_INTERNAL_IPC_MESSAGE-' + viewInstanceId)
|
||||
return ipcRenderer.removeAllListeners('ATOM_SHELL_GUEST_VIEW_INTERNAL_SIZE_CHANGED-' + viewInstanceId)
|
||||
},
|
||||
createGuest: function (params, callback) {
|
||||
requestId++;
|
||||
ipcRenderer.send('ATOM_SHELL_GUEST_VIEW_MANAGER_CREATE_GUEST', params, requestId);
|
||||
return ipcRenderer.once("ATOM_SHELL_RESPONSE_" + requestId, callback);
|
||||
requestId++
|
||||
ipcRenderer.send('ATOM_SHELL_GUEST_VIEW_MANAGER_CREATE_GUEST', params, requestId)
|
||||
return ipcRenderer.once('ATOM_SHELL_RESPONSE_' + requestId, callback)
|
||||
},
|
||||
attachGuest: function (elementInstanceId, guestInstanceId, params) {
|
||||
ipcRenderer.send('ATOM_SHELL_GUEST_VIEW_MANAGER_ATTACH_GUEST', elementInstanceId, guestInstanceId, params);
|
||||
return webFrame.attachGuest(elementInstanceId);
|
||||
ipcRenderer.send('ATOM_SHELL_GUEST_VIEW_MANAGER_ATTACH_GUEST', elementInstanceId, guestInstanceId, params)
|
||||
return webFrame.attachGuest(elementInstanceId)
|
||||
},
|
||||
destroyGuest: function (guestInstanceId) {
|
||||
return ipcRenderer.send('ATOM_SHELL_GUEST_VIEW_MANAGER_DESTROY_GUEST', guestInstanceId);
|
||||
return ipcRenderer.send('ATOM_SHELL_GUEST_VIEW_MANAGER_DESTROY_GUEST', guestInstanceId)
|
||||
},
|
||||
setSize: function (guestInstanceId, params) {
|
||||
return ipcRenderer.send('ATOM_SHELL_GUEST_VIEW_MANAGER_SET_SIZE', guestInstanceId, params);
|
||||
},
|
||||
};
|
||||
return ipcRenderer.send('ATOM_SHELL_GUEST_VIEW_MANAGER_SET_SIZE', guestInstanceId, params)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,57 +1,57 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const WebViewImpl = require('./web-view');
|
||||
const guestViewInternal = require('./guest-view-internal');
|
||||
const webViewConstants = require('./web-view-constants');
|
||||
const remote = require('electron').remote;
|
||||
const WebViewImpl = require('./web-view')
|
||||
const guestViewInternal = require('./guest-view-internal')
|
||||
const webViewConstants = require('./web-view-constants')
|
||||
const remote = require('electron').remote
|
||||
|
||||
// Helper function to resolve url set in attribute.
|
||||
var a = document.createElement('a');
|
||||
var a = document.createElement('a')
|
||||
|
||||
var resolveURL = function (url) {
|
||||
a.href = url;
|
||||
return a.href;
|
||||
};
|
||||
a.href = url
|
||||
return a.href
|
||||
}
|
||||
|
||||
// Attribute objects.
|
||||
// Default implementation of a WebView attribute.
|
||||
class WebViewAttribute {
|
||||
constructor (name, webViewImpl) {
|
||||
this.name = name;
|
||||
this.value = webViewImpl.webviewNode[name] || '';
|
||||
this.webViewImpl = webViewImpl;
|
||||
this.ignoreMutation = false;
|
||||
this.defineProperty();
|
||||
this.name = name
|
||||
this.value = webViewImpl.webviewNode[name] || ''
|
||||
this.webViewImpl = webViewImpl
|
||||
this.ignoreMutation = false
|
||||
this.defineProperty()
|
||||
}
|
||||
|
||||
// Retrieves and returns the attribute's value.
|
||||
getValue () {
|
||||
return this.webViewImpl.webviewNode.getAttribute(this.name) || this.value;
|
||||
return this.webViewImpl.webviewNode.getAttribute(this.name) || this.value
|
||||
}
|
||||
|
||||
// Sets the attribute's value.
|
||||
setValue (value) {
|
||||
return this.webViewImpl.webviewNode.setAttribute(this.name, value || '');
|
||||
return this.webViewImpl.webviewNode.setAttribute(this.name, value || '')
|
||||
}
|
||||
|
||||
// Changes the attribute's value without triggering its mutation handler.
|
||||
setValueIgnoreMutation (value) {
|
||||
this.ignoreMutation = true;
|
||||
this.setValue(value);
|
||||
return this.ignoreMutation = false;
|
||||
this.ignoreMutation = true
|
||||
this.setValue(value)
|
||||
this.ignoreMutation = false
|
||||
}
|
||||
|
||||
// Defines this attribute as a property on the webview node.
|
||||
defineProperty () {
|
||||
return Object.defineProperty(this.webViewImpl.webviewNode, this.name, {
|
||||
get: () => {
|
||||
return this.getValue();
|
||||
return this.getValue()
|
||||
},
|
||||
set: (value) => {
|
||||
return this.setValue(value);
|
||||
return this.setValue(value)
|
||||
},
|
||||
enumerable: true
|
||||
});
|
||||
})
|
||||
}
|
||||
|
||||
// Called when the attribute's value changes.
|
||||
|
@ -60,36 +60,28 @@ class WebViewAttribute {
|
|||
|
||||
// An attribute that is treated as a Boolean.
|
||||
class BooleanAttribute extends WebViewAttribute {
|
||||
constructor(name, webViewImpl) {
|
||||
super(name, webViewImpl);
|
||||
}
|
||||
|
||||
getValue () {
|
||||
return this.webViewImpl.webviewNode.hasAttribute(this.name);
|
||||
return this.webViewImpl.webviewNode.hasAttribute(this.name)
|
||||
}
|
||||
|
||||
setValue (value) {
|
||||
if (!value) {
|
||||
return this.webViewImpl.webviewNode.removeAttribute(this.name);
|
||||
return this.webViewImpl.webviewNode.removeAttribute(this.name)
|
||||
} else {
|
||||
return this.webViewImpl.webviewNode.setAttribute(this.name, '');
|
||||
return this.webViewImpl.webviewNode.setAttribute(this.name, '')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Attribute used to define the demension limits of autosizing.
|
||||
class AutosizeDimensionAttribute extends WebViewAttribute {
|
||||
constructor(name, webViewImpl) {
|
||||
super(name, webViewImpl);
|
||||
}
|
||||
|
||||
getValue () {
|
||||
return parseInt(this.webViewImpl.webviewNode.getAttribute(this.name)) || 0;
|
||||
return parseInt(this.webViewImpl.webviewNode.getAttribute(this.name)) || 0
|
||||
}
|
||||
|
||||
handleMutation () {
|
||||
if (!this.webViewImpl.guestInstanceId) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
return guestViewInternal.setSize(this.webViewImpl.guestInstanceId, {
|
||||
enableAutoSize: this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_AUTOSIZE].getValue(),
|
||||
|
@ -101,39 +93,38 @@ class AutosizeDimensionAttribute extends WebViewAttribute {
|
|||
width: parseInt(this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_MAXWIDTH].getValue() || 0),
|
||||
height: parseInt(this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_MAXHEIGHT].getValue() || 0)
|
||||
}
|
||||
});
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Attribute that specifies whether the webview should be autosized.
|
||||
class AutosizeAttribute extends BooleanAttribute {
|
||||
constructor (webViewImpl) {
|
||||
super(webViewConstants.ATTRIBUTE_AUTOSIZE, webViewImpl);
|
||||
super(webViewConstants.ATTRIBUTE_AUTOSIZE, webViewImpl)
|
||||
}
|
||||
}
|
||||
|
||||
AutosizeAttribute.prototype.handleMutation = AutosizeDimensionAttribute.prototype.handleMutation;
|
||||
AutosizeAttribute.prototype.handleMutation = AutosizeDimensionAttribute.prototype.handleMutation
|
||||
|
||||
// Attribute representing the state of the storage partition.
|
||||
class PartitionAttribute extends WebViewAttribute {
|
||||
constructor (webViewImpl) {
|
||||
super(webViewConstants.ATTRIBUTE_PARTITION, webViewImpl);
|
||||
this.validPartitionId = true;
|
||||
super(webViewConstants.ATTRIBUTE_PARTITION, webViewImpl)
|
||||
this.validPartitionId = true
|
||||
}
|
||||
|
||||
handleMutation (oldValue, newValue) {
|
||||
newValue = newValue || '';
|
||||
newValue = newValue || ''
|
||||
|
||||
// The partition cannot change if the webview has already navigated.
|
||||
if (!this.webViewImpl.beforeFirstNavigation) {
|
||||
window.console.error(webViewConstants.ERROR_MSG_ALREADY_NAVIGATED);
|
||||
this.setValueIgnoreMutation(oldValue);
|
||||
return;
|
||||
window.console.error(webViewConstants.ERROR_MSG_ALREADY_NAVIGATED)
|
||||
this.setValueIgnoreMutation(oldValue)
|
||||
return
|
||||
}
|
||||
if (newValue === 'persist:') {
|
||||
this.validPartitionId = false;
|
||||
return window.console.error(webViewConstants.ERROR_MSG_INVALID_PARTITION_ATTRIBUTE);
|
||||
this.validPartitionId = false
|
||||
return window.console.error(webViewConstants.ERROR_MSG_INVALID_PARTITION_ATTRIBUTE)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -141,42 +132,40 @@ class PartitionAttribute extends WebViewAttribute {
|
|||
// Attribute that handles the location and navigation of the webview.
|
||||
class SrcAttribute extends WebViewAttribute {
|
||||
constructor (webViewImpl) {
|
||||
super(webViewConstants.ATTRIBUTE_SRC, webViewImpl);
|
||||
this.setupMutationObserver();
|
||||
super(webViewConstants.ATTRIBUTE_SRC, webViewImpl)
|
||||
this.setupMutationObserver()
|
||||
}
|
||||
|
||||
getValue () {
|
||||
if (this.webViewImpl.webviewNode.hasAttribute(this.name)) {
|
||||
return resolveURL(this.webViewImpl.webviewNode.getAttribute(this.name));
|
||||
return resolveURL(this.webViewImpl.webviewNode.getAttribute(this.name))
|
||||
} else {
|
||||
return this.value;
|
||||
return this.value
|
||||
}
|
||||
}
|
||||
|
||||
setValueIgnoreMutation (value) {
|
||||
super.setValueIgnoreMutation(value);
|
||||
super.setValueIgnoreMutation(value)
|
||||
|
||||
// takeRecords() is needed to clear queued up src mutations. Without it, it
|
||||
// is possible for this change to get picked up asyncronously by src's
|
||||
// mutation observer |observer|, and then get handled even though we do not
|
||||
// want to handle this mutation.
|
||||
return this.observer.takeRecords();
|
||||
return this.observer.takeRecords()
|
||||
}
|
||||
|
||||
handleMutation (oldValue, newValue) {
|
||||
|
||||
// Once we have navigated, we don't allow clearing the src attribute.
|
||||
// Once <webview> enters a navigated state, it cannot return to a
|
||||
// placeholder state.
|
||||
if (!newValue && oldValue) {
|
||||
|
||||
// src attribute changes normally initiate a navigation. We suppress
|
||||
// the next src attribute handler call to avoid reloading the page
|
||||
// on every guest-initiated navigation.
|
||||
this.setValueIgnoreMutation(oldValue);
|
||||
return;
|
||||
this.setValueIgnoreMutation(oldValue)
|
||||
return
|
||||
}
|
||||
return this.parse();
|
||||
return this.parse()
|
||||
}
|
||||
|
||||
// The purpose of this mutation observer is to catch assignment to the src
|
||||
|
@ -184,114 +173,114 @@ class SrcAttribute extends WebViewAttribute {
|
|||
// where the webview guest has crashed and navigating to the same address
|
||||
// spawns off a new process.
|
||||
setupMutationObserver () {
|
||||
var params;
|
||||
var params
|
||||
this.observer = new MutationObserver((mutations) => {
|
||||
var i, len, mutation, newValue, oldValue;
|
||||
var i, len, mutation, newValue, oldValue
|
||||
for (i = 0, len = mutations.length; i < len; i++) {
|
||||
mutation = mutations[i];
|
||||
oldValue = mutation.oldValue;
|
||||
newValue = this.getValue();
|
||||
mutation = mutations[i]
|
||||
oldValue = mutation.oldValue
|
||||
newValue = this.getValue()
|
||||
if (oldValue !== newValue) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
this.handleMutation(oldValue, newValue);
|
||||
this.handleMutation(oldValue, newValue)
|
||||
}
|
||||
});
|
||||
})
|
||||
params = {
|
||||
attributes: true,
|
||||
attributeOldValue: true,
|
||||
attributeFilter: [this.name]
|
||||
};
|
||||
return this.observer.observe(this.webViewImpl.webviewNode, params);
|
||||
}
|
||||
return this.observer.observe(this.webViewImpl.webviewNode, params)
|
||||
}
|
||||
|
||||
parse () {
|
||||
var guestContents, httpreferrer, opts, useragent;
|
||||
var guestContents, httpreferrer, opts, useragent
|
||||
if (!this.webViewImpl.elementAttached || !this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_PARTITION].validPartitionId || !this.getValue()) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
if (this.webViewImpl.guestInstanceId == null) {
|
||||
if (this.webViewImpl.beforeFirstNavigation) {
|
||||
this.webViewImpl.beforeFirstNavigation = false;
|
||||
this.webViewImpl.createGuest();
|
||||
this.webViewImpl.beforeFirstNavigation = false
|
||||
this.webViewImpl.createGuest()
|
||||
}
|
||||
return;
|
||||
return
|
||||
}
|
||||
|
||||
// Navigate to |this.src|.
|
||||
opts = {};
|
||||
httpreferrer = this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_HTTPREFERRER].getValue();
|
||||
opts = {}
|
||||
httpreferrer = this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_HTTPREFERRER].getValue()
|
||||
if (httpreferrer) {
|
||||
opts.httpReferrer = httpreferrer;
|
||||
opts.httpReferrer = httpreferrer
|
||||
}
|
||||
useragent = this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_USERAGENT].getValue();
|
||||
useragent = this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_USERAGENT].getValue()
|
||||
if (useragent) {
|
||||
opts.userAgent = useragent;
|
||||
opts.userAgent = useragent
|
||||
}
|
||||
guestContents = remote.getGuestWebContents(this.webViewImpl.guestInstanceId);
|
||||
return guestContents.loadURL(this.getValue(), opts);
|
||||
guestContents = remote.getGuestWebContents(this.webViewImpl.guestInstanceId)
|
||||
return guestContents.loadURL(this.getValue(), opts)
|
||||
}
|
||||
}
|
||||
|
||||
// Attribute specifies HTTP referrer.
|
||||
class HttpReferrerAttribute extends WebViewAttribute {
|
||||
constructor (webViewImpl) {
|
||||
super(webViewConstants.ATTRIBUTE_HTTPREFERRER, webViewImpl);
|
||||
super(webViewConstants.ATTRIBUTE_HTTPREFERRER, webViewImpl)
|
||||
}
|
||||
}
|
||||
|
||||
// Attribute specifies user agent
|
||||
class UserAgentAttribute extends WebViewAttribute {
|
||||
constructor (webViewImpl) {
|
||||
super(webViewConstants.ATTRIBUTE_USERAGENT, webViewImpl);
|
||||
super(webViewConstants.ATTRIBUTE_USERAGENT, webViewImpl)
|
||||
}
|
||||
}
|
||||
|
||||
// Attribute that set preload script.
|
||||
class PreloadAttribute extends WebViewAttribute {
|
||||
constructor (webViewImpl) {
|
||||
super(webViewConstants.ATTRIBUTE_PRELOAD, webViewImpl);
|
||||
super(webViewConstants.ATTRIBUTE_PRELOAD, webViewImpl)
|
||||
}
|
||||
|
||||
getValue () {
|
||||
var preload, protocol;
|
||||
var preload, protocol
|
||||
if (!this.webViewImpl.webviewNode.hasAttribute(this.name)) {
|
||||
return this.value;
|
||||
return this.value
|
||||
}
|
||||
preload = resolveURL(this.webViewImpl.webviewNode.getAttribute(this.name));
|
||||
protocol = preload.substr(0, 5);
|
||||
preload = resolveURL(this.webViewImpl.webviewNode.getAttribute(this.name))
|
||||
protocol = preload.substr(0, 5)
|
||||
if (protocol !== 'file:') {
|
||||
console.error(webViewConstants.ERROR_MSG_INVALID_PRELOAD_ATTRIBUTE);
|
||||
preload = '';
|
||||
console.error(webViewConstants.ERROR_MSG_INVALID_PRELOAD_ATTRIBUTE)
|
||||
preload = ''
|
||||
}
|
||||
return preload;
|
||||
return preload
|
||||
}
|
||||
}
|
||||
|
||||
// Attribute that specifies the blink features to be enabled.
|
||||
class BlinkFeaturesAttribute extends WebViewAttribute {
|
||||
constructor (webViewImpl) {
|
||||
super(webViewConstants.ATTRIBUTE_BLINKFEATURES, webViewImpl);
|
||||
super(webViewConstants.ATTRIBUTE_BLINKFEATURES, webViewImpl)
|
||||
}
|
||||
}
|
||||
|
||||
// Sets up all of the webview attributes.
|
||||
WebViewImpl.prototype.setupWebViewAttributes = function () {
|
||||
this.attributes = {};
|
||||
this.attributes[webViewConstants.ATTRIBUTE_AUTOSIZE] = new AutosizeAttribute(this);
|
||||
this.attributes[webViewConstants.ATTRIBUTE_PARTITION] = new PartitionAttribute(this);
|
||||
this.attributes[webViewConstants.ATTRIBUTE_SRC] = new SrcAttribute(this);
|
||||
this.attributes[webViewConstants.ATTRIBUTE_HTTPREFERRER] = new HttpReferrerAttribute(this);
|
||||
this.attributes[webViewConstants.ATTRIBUTE_USERAGENT] = new UserAgentAttribute(this);
|
||||
this.attributes[webViewConstants.ATTRIBUTE_NODEINTEGRATION] = new BooleanAttribute(webViewConstants.ATTRIBUTE_NODEINTEGRATION, this);
|
||||
this.attributes[webViewConstants.ATTRIBUTE_PLUGINS] = new BooleanAttribute(webViewConstants.ATTRIBUTE_PLUGINS, this);
|
||||
this.attributes[webViewConstants.ATTRIBUTE_DISABLEWEBSECURITY] = new BooleanAttribute(webViewConstants.ATTRIBUTE_DISABLEWEBSECURITY, this);
|
||||
this.attributes[webViewConstants.ATTRIBUTE_ALLOWPOPUPS] = new BooleanAttribute(webViewConstants.ATTRIBUTE_ALLOWPOPUPS, this);
|
||||
this.attributes[webViewConstants.ATTRIBUTE_PRELOAD] = new PreloadAttribute(this);
|
||||
this.attributes[webViewConstants.ATTRIBUTE_BLINKFEATURES] = new BlinkFeaturesAttribute(this);
|
||||
this.attributes = {}
|
||||
this.attributes[webViewConstants.ATTRIBUTE_AUTOSIZE] = new AutosizeAttribute(this)
|
||||
this.attributes[webViewConstants.ATTRIBUTE_PARTITION] = new PartitionAttribute(this)
|
||||
this.attributes[webViewConstants.ATTRIBUTE_SRC] = new SrcAttribute(this)
|
||||
this.attributes[webViewConstants.ATTRIBUTE_HTTPREFERRER] = new HttpReferrerAttribute(this)
|
||||
this.attributes[webViewConstants.ATTRIBUTE_USERAGENT] = new UserAgentAttribute(this)
|
||||
this.attributes[webViewConstants.ATTRIBUTE_NODEINTEGRATION] = new BooleanAttribute(webViewConstants.ATTRIBUTE_NODEINTEGRATION, this)
|
||||
this.attributes[webViewConstants.ATTRIBUTE_PLUGINS] = new BooleanAttribute(webViewConstants.ATTRIBUTE_PLUGINS, this)
|
||||
this.attributes[webViewConstants.ATTRIBUTE_DISABLEWEBSECURITY] = new BooleanAttribute(webViewConstants.ATTRIBUTE_DISABLEWEBSECURITY, this)
|
||||
this.attributes[webViewConstants.ATTRIBUTE_ALLOWPOPUPS] = new BooleanAttribute(webViewConstants.ATTRIBUTE_ALLOWPOPUPS, this)
|
||||
this.attributes[webViewConstants.ATTRIBUTE_PRELOAD] = new PreloadAttribute(this)
|
||||
this.attributes[webViewConstants.ATTRIBUTE_BLINKFEATURES] = new BlinkFeaturesAttribute(this)
|
||||
|
||||
const autosizeAttributes = [webViewConstants.ATTRIBUTE_MAXHEIGHT, webViewConstants.ATTRIBUTE_MAXWIDTH, webViewConstants.ATTRIBUTE_MINHEIGHT, webViewConstants.ATTRIBUTE_MINWIDTH];
|
||||
const autosizeAttributes = [webViewConstants.ATTRIBUTE_MAXHEIGHT, webViewConstants.ATTRIBUTE_MAXWIDTH, webViewConstants.ATTRIBUTE_MINHEIGHT, webViewConstants.ATTRIBUTE_MINWIDTH]
|
||||
autosizeAttributes.forEach((attribute) => {
|
||||
this.attributes[attribute] = new AutosizeDimensionAttribute(attribute, this);
|
||||
});
|
||||
};
|
||||
this.attributes[attribute] = new AutosizeDimensionAttribute(attribute, this)
|
||||
})
|
||||
}
|
||||
|
|
|
@ -25,4 +25,4 @@ module.exports = {
|
|||
ERROR_MSG_CANNOT_INJECT_SCRIPT: '<webview>: ' + 'Script cannot be injected into content until the page has loaded.',
|
||||
ERROR_MSG_INVALID_PARTITION_ATTRIBUTE: 'Invalid partition attribute.',
|
||||
ERROR_MSG_INVALID_PRELOAD_ATTRIBUTE: 'Only "file:" protocol is supported in "preload" attribute.'
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,63 +1,63 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const deprecate = require('electron').deprecate;
|
||||
const webFrame = require('electron').webFrame;
|
||||
const remote = require('electron').remote;
|
||||
const ipcRenderer = require('electron').ipcRenderer;
|
||||
const deprecate = require('electron').deprecate
|
||||
const webFrame = require('electron').webFrame
|
||||
const remote = require('electron').remote
|
||||
const ipcRenderer = require('electron').ipcRenderer
|
||||
|
||||
const v8Util = process.atomBinding('v8_util');
|
||||
const guestViewInternal = require('./guest-view-internal');
|
||||
const webViewConstants = require('./web-view-constants');
|
||||
const v8Util = process.atomBinding('v8_util')
|
||||
const guestViewInternal = require('./guest-view-internal')
|
||||
const webViewConstants = require('./web-view-constants')
|
||||
|
||||
var hasProp = {}.hasOwnProperty;
|
||||
var hasProp = {}.hasOwnProperty
|
||||
|
||||
// ID generator.
|
||||
var nextId = 0;
|
||||
var nextId = 0
|
||||
|
||||
var getNextId = function () {
|
||||
return ++nextId;
|
||||
};
|
||||
return ++nextId
|
||||
}
|
||||
|
||||
// Represents the internal state of the WebView node.
|
||||
var WebViewImpl = (function () {
|
||||
function WebViewImpl (webviewNode) {
|
||||
var shadowRoot;
|
||||
this.webviewNode = webviewNode;
|
||||
v8Util.setHiddenValue(this.webviewNode, 'internal', this);
|
||||
this.attached = false;
|
||||
this.elementAttached = false;
|
||||
this.beforeFirstNavigation = true;
|
||||
var shadowRoot
|
||||
this.webviewNode = webviewNode
|
||||
v8Util.setHiddenValue(this.webviewNode, 'internal', this)
|
||||
this.attached = false
|
||||
this.elementAttached = false
|
||||
this.beforeFirstNavigation = true
|
||||
|
||||
// on* Event handlers.
|
||||
this.on = {};
|
||||
this.browserPluginNode = this.createBrowserPluginNode();
|
||||
shadowRoot = this.webviewNode.createShadowRoot();
|
||||
shadowRoot.innerHTML = '<style>:host { display: flex; }</style>';
|
||||
this.setupWebViewAttributes();
|
||||
this.setupFocusPropagation();
|
||||
this.viewInstanceId = getNextId();
|
||||
shadowRoot.appendChild(this.browserPluginNode);
|
||||
this.on = {}
|
||||
this.browserPluginNode = this.createBrowserPluginNode()
|
||||
shadowRoot = this.webviewNode.createShadowRoot()
|
||||
shadowRoot.innerHTML = '<style>:host { display: flex; }</style>'
|
||||
this.setupWebViewAttributes()
|
||||
this.setupFocusPropagation()
|
||||
this.viewInstanceId = getNextId()
|
||||
shadowRoot.appendChild(this.browserPluginNode)
|
||||
|
||||
// Subscribe to host's zoom level changes.
|
||||
this.onZoomLevelChanged = (zoomLevel) => {
|
||||
this.webviewNode.setZoomLevel(zoomLevel);
|
||||
};
|
||||
webFrame.on('zoom-level-changed', this.onZoomLevelChanged);
|
||||
this.webviewNode.setZoomLevel(zoomLevel)
|
||||
}
|
||||
webFrame.on('zoom-level-changed', this.onZoomLevelChanged)
|
||||
}
|
||||
|
||||
WebViewImpl.prototype.createBrowserPluginNode = function () {
|
||||
// We create BrowserPlugin as a custom element in order to observe changes
|
||||
// to attributes synchronously.
|
||||
var browserPluginNode;
|
||||
browserPluginNode = new WebViewImpl.BrowserPlugin();
|
||||
v8Util.setHiddenValue(browserPluginNode, 'internal', this);
|
||||
return browserPluginNode;
|
||||
};
|
||||
var browserPluginNode
|
||||
browserPluginNode = new WebViewImpl.BrowserPlugin()
|
||||
v8Util.setHiddenValue(browserPluginNode, 'internal', this)
|
||||
return browserPluginNode
|
||||
}
|
||||
|
||||
// Resets some state upon reattaching <webview> element to the DOM.
|
||||
WebViewImpl.prototype.reset = function () {
|
||||
// Unlisten the zoom-level-changed event.
|
||||
webFrame.removeListener('zoom-level-changed', this.onZoomLevelChanged);
|
||||
webFrame.removeListener('zoom-level-changed', this.onZoomLevelChanged)
|
||||
|
||||
// If guestInstanceId is defined then the <webview> has navigated and has
|
||||
// already picked up a partition ID. Thus, we need to reset the initialization
|
||||
|
@ -66,22 +66,22 @@ var WebViewImpl = (function() {
|
|||
// heard back from createGuest yet. We will not reset the flag in this case so
|
||||
// that we don't end up allocating a second guest.
|
||||
if (this.guestInstanceId) {
|
||||
guestViewInternal.destroyGuest(this.guestInstanceId);
|
||||
this.webContents = null;
|
||||
this.guestInstanceId = void 0;
|
||||
this.beforeFirstNavigation = true;
|
||||
this.attributes[webViewConstants.ATTRIBUTE_PARTITION].validPartitionId = true;
|
||||
guestViewInternal.destroyGuest(this.guestInstanceId)
|
||||
this.webContents = null
|
||||
this.guestInstanceId = void 0
|
||||
this.beforeFirstNavigation = true
|
||||
this.attributes[webViewConstants.ATTRIBUTE_PARTITION].validPartitionId = true
|
||||
}
|
||||
this.internalInstanceId = 0
|
||||
}
|
||||
return this.internalInstanceId = 0;
|
||||
};
|
||||
|
||||
// Sets the <webview>.request property.
|
||||
WebViewImpl.prototype.setRequestPropertyOnWebViewNode = function (request) {
|
||||
return Object.defineProperty(this.webviewNode, 'request', {
|
||||
value: request,
|
||||
enumerable: true
|
||||
});
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
WebViewImpl.prototype.setupFocusPropagation = function () {
|
||||
if (!this.webviewNode.hasAttribute('tabIndex')) {
|
||||
|
@ -89,20 +89,19 @@ var WebViewImpl = (function() {
|
|||
// TODO(fsamuel): It would be nice to avoid exposing a tabIndex attribute
|
||||
// to allow <webview> to be focusable.
|
||||
// See http://crbug.com/231664.
|
||||
this.webviewNode.setAttribute('tabIndex', -1);
|
||||
this.webviewNode.setAttribute('tabIndex', -1)
|
||||
}
|
||||
|
||||
// Focus the BrowserPlugin when the <webview> takes focus.
|
||||
this.webviewNode.addEventListener('focus', () => {
|
||||
this.browserPluginNode.focus();
|
||||
});
|
||||
this.browserPluginNode.focus()
|
||||
})
|
||||
|
||||
// Blur the BrowserPlugin when the <webview> loses focus.
|
||||
this.webviewNode.addEventListener('blur', () => {
|
||||
this.browserPluginNode.blur();
|
||||
});
|
||||
};
|
||||
|
||||
this.browserPluginNode.blur()
|
||||
})
|
||||
}
|
||||
|
||||
// This observer monitors mutations to attributes of the <webview> and
|
||||
// updates the BrowserPlugin properties accordingly. In turn, updating
|
||||
|
@ -111,129 +110,128 @@ var WebViewImpl = (function() {
|
|||
// details.
|
||||
WebViewImpl.prototype.handleWebviewAttributeMutation = function (attributeName, oldValue, newValue) {
|
||||
if (!this.attributes[attributeName] || this.attributes[attributeName].ignoreMutation) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
|
||||
// Let the changed attribute handle its own mutation;
|
||||
return this.attributes[attributeName].handleMutation(oldValue, newValue);
|
||||
};
|
||||
// Let the changed attribute handle its own mutation
|
||||
return this.attributes[attributeName].handleMutation(oldValue, newValue)
|
||||
}
|
||||
|
||||
WebViewImpl.prototype.handleBrowserPluginAttributeMutation = function (attributeName, oldValue, newValue) {
|
||||
if (attributeName === webViewConstants.ATTRIBUTE_INTERNALINSTANCEID && !oldValue && !!newValue) {
|
||||
this.browserPluginNode.removeAttribute(webViewConstants.ATTRIBUTE_INTERNALINSTANCEID);
|
||||
this.internalInstanceId = parseInt(newValue);
|
||||
this.browserPluginNode.removeAttribute(webViewConstants.ATTRIBUTE_INTERNALINSTANCEID)
|
||||
this.internalInstanceId = parseInt(newValue)
|
||||
|
||||
// Track when the element resizes using the element resize callback.
|
||||
webFrame.registerElementResizeCallback(this.internalInstanceId, this.onElementResize.bind(this));
|
||||
webFrame.registerElementResizeCallback(this.internalInstanceId, this.onElementResize.bind(this))
|
||||
if (!this.guestInstanceId) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
return guestViewInternal.attachGuest(this.internalInstanceId, this.guestInstanceId, this.buildParams())
|
||||
}
|
||||
return guestViewInternal.attachGuest(this.internalInstanceId, this.guestInstanceId, this.buildParams());
|
||||
}
|
||||
};
|
||||
|
||||
WebViewImpl.prototype.onSizeChanged = function (webViewEvent) {
|
||||
var maxHeight, maxWidth, minHeight, minWidth, newHeight, newWidth, node, width;
|
||||
newWidth = webViewEvent.newWidth;
|
||||
newHeight = webViewEvent.newHeight;
|
||||
node = this.webviewNode;
|
||||
width = node.offsetWidth;
|
||||
var maxHeight, maxWidth, minHeight, minWidth, newHeight, newWidth, node, width
|
||||
newWidth = webViewEvent.newWidth
|
||||
newHeight = webViewEvent.newHeight
|
||||
node = this.webviewNode
|
||||
width = node.offsetWidth
|
||||
|
||||
// Check the current bounds to make sure we do not resize <webview>
|
||||
// outside of current constraints.
|
||||
maxWidth = this.attributes[webViewConstants.ATTRIBUTE_MAXWIDTH].getValue() | width;
|
||||
maxHeight = this.attributes[webViewConstants.ATTRIBUTE_MAXHEIGHT].getValue() | width;
|
||||
minWidth = this.attributes[webViewConstants.ATTRIBUTE_MINWIDTH].getValue() | width;
|
||||
minHeight = this.attributes[webViewConstants.ATTRIBUTE_MINHEIGHT].getValue() | width;
|
||||
minWidth = Math.min(minWidth, maxWidth);
|
||||
minHeight = Math.min(minHeight, maxHeight);
|
||||
maxWidth = this.attributes[webViewConstants.ATTRIBUTE_MAXWIDTH].getValue() | width
|
||||
maxHeight = this.attributes[webViewConstants.ATTRIBUTE_MAXHEIGHT].getValue() | width
|
||||
minWidth = this.attributes[webViewConstants.ATTRIBUTE_MINWIDTH].getValue() | width
|
||||
minHeight = this.attributes[webViewConstants.ATTRIBUTE_MINHEIGHT].getValue() | width
|
||||
minWidth = Math.min(minWidth, maxWidth)
|
||||
minHeight = Math.min(minHeight, maxHeight)
|
||||
if (!this.attributes[webViewConstants.ATTRIBUTE_AUTOSIZE].getValue() || (newWidth >= minWidth && newWidth <= maxWidth && newHeight >= minHeight && newHeight <= maxHeight)) {
|
||||
node.style.width = newWidth + 'px';
|
||||
node.style.height = newHeight + 'px';
|
||||
node.style.width = newWidth + 'px'
|
||||
node.style.height = newHeight + 'px'
|
||||
|
||||
// Only fire the DOM event if the size of the <webview> has actually
|
||||
// changed.
|
||||
return this.dispatchEvent(webViewEvent);
|
||||
return this.dispatchEvent(webViewEvent)
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
WebViewImpl.prototype.onElementResize = function (newSize) {
|
||||
// Dispatch the 'resize' event.
|
||||
var resizeEvent;
|
||||
var resizeEvent
|
||||
resizeEvent = new Event('resize', {
|
||||
bubbles: true
|
||||
});
|
||||
resizeEvent.newWidth = newSize.width;
|
||||
resizeEvent.newHeight = newSize.height;
|
||||
this.dispatchEvent(resizeEvent);
|
||||
})
|
||||
resizeEvent.newWidth = newSize.width
|
||||
resizeEvent.newHeight = newSize.height
|
||||
this.dispatchEvent(resizeEvent)
|
||||
if (this.guestInstanceId) {
|
||||
return guestViewInternal.setSize(this.guestInstanceId, {
|
||||
normal: newSize
|
||||
});
|
||||
})
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
WebViewImpl.prototype.createGuest = function () {
|
||||
return guestViewInternal.createGuest(this.buildParams(), (event, guestInstanceId) => {
|
||||
this.attachWindow(guestInstanceId);
|
||||
});
|
||||
};
|
||||
this.attachWindow(guestInstanceId)
|
||||
})
|
||||
}
|
||||
|
||||
WebViewImpl.prototype.dispatchEvent = function (webViewEvent) {
|
||||
return this.webviewNode.dispatchEvent(webViewEvent);
|
||||
};
|
||||
return this.webviewNode.dispatchEvent(webViewEvent)
|
||||
}
|
||||
|
||||
// Adds an 'on<event>' property on the webview, which can be used to set/unset
|
||||
// an event handler.
|
||||
WebViewImpl.prototype.setupEventProperty = function (eventName) {
|
||||
var propertyName;
|
||||
propertyName = 'on' + eventName.toLowerCase();
|
||||
var propertyName
|
||||
propertyName = 'on' + eventName.toLowerCase()
|
||||
return Object.defineProperty(this.webviewNode, propertyName, {
|
||||
get: () => {
|
||||
return this.on[propertyName];
|
||||
return this.on[propertyName]
|
||||
},
|
||||
set: (value) => {
|
||||
if (this.on[propertyName]) {
|
||||
this.webviewNode.removeEventListener(eventName, this.on[propertyName]);
|
||||
this.webviewNode.removeEventListener(eventName, this.on[propertyName])
|
||||
}
|
||||
this.on[propertyName] = value;
|
||||
this.on[propertyName] = value
|
||||
if (value) {
|
||||
return this.webviewNode.addEventListener(eventName, value);
|
||||
return this.webviewNode.addEventListener(eventName, value)
|
||||
}
|
||||
},
|
||||
enumerable: true
|
||||
});
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
// Updates state upon loadcommit.
|
||||
WebViewImpl.prototype.onLoadCommit = function (webViewEvent) {
|
||||
var newValue, oldValue;
|
||||
oldValue = this.webviewNode.getAttribute(webViewConstants.ATTRIBUTE_SRC);
|
||||
newValue = webViewEvent.url;
|
||||
var newValue, oldValue
|
||||
oldValue = this.webviewNode.getAttribute(webViewConstants.ATTRIBUTE_SRC)
|
||||
newValue = webViewEvent.url
|
||||
if (webViewEvent.isMainFrame && (oldValue !== newValue)) {
|
||||
|
||||
// Touching the src attribute triggers a navigation. To avoid
|
||||
// triggering a page reload on every guest-initiated navigation,
|
||||
// we do not handle this mutation.
|
||||
return this.attributes[webViewConstants.ATTRIBUTE_SRC].setValueIgnoreMutation(newValue);
|
||||
return this.attributes[webViewConstants.ATTRIBUTE_SRC].setValueIgnoreMutation(newValue)
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
WebViewImpl.prototype.onAttach = function (storagePartitionId) {
|
||||
return this.attributes[webViewConstants.ATTRIBUTE_PARTITION].setValue(storagePartitionId);
|
||||
};
|
||||
return this.attributes[webViewConstants.ATTRIBUTE_PARTITION].setValue(storagePartitionId)
|
||||
}
|
||||
|
||||
WebViewImpl.prototype.buildParams = function () {
|
||||
var attribute, attributeName, css, elementRect, params, ref1;
|
||||
var attribute, attributeName, css, elementRect, params, ref1
|
||||
params = {
|
||||
instanceId: this.viewInstanceId,
|
||||
userAgentOverride: this.userAgentOverride
|
||||
};
|
||||
ref1 = this.attributes;
|
||||
}
|
||||
ref1 = this.attributes
|
||||
for (attributeName in ref1) {
|
||||
if (!hasProp.call(ref1, attributeName)) continue;
|
||||
attribute = ref1[attributeName];
|
||||
params[attributeName] = attribute.getValue();
|
||||
if (!hasProp.call(ref1, attributeName)) continue
|
||||
attribute = ref1[attributeName]
|
||||
params[attributeName] = attribute.getValue()
|
||||
}
|
||||
|
||||
// When the WebView is not participating in layout (display:none)
|
||||
|
@ -241,96 +239,95 @@ var WebViewImpl = (function() {
|
|||
// However, in the case where the WebView has a fixed size we can
|
||||
// use that value to initially size the guest so as to avoid a relayout of
|
||||
// the on display:block.
|
||||
css = window.getComputedStyle(this.webviewNode, null);
|
||||
elementRect = this.webviewNode.getBoundingClientRect();
|
||||
params.elementWidth = parseInt(elementRect.width) || parseInt(css.getPropertyValue('width'));
|
||||
params.elementHeight = parseInt(elementRect.height) || parseInt(css.getPropertyValue('height'));
|
||||
return params;
|
||||
};
|
||||
css = window.getComputedStyle(this.webviewNode, null)
|
||||
elementRect = this.webviewNode.getBoundingClientRect()
|
||||
params.elementWidth = parseInt(elementRect.width) || parseInt(css.getPropertyValue('width'))
|
||||
params.elementHeight = parseInt(elementRect.height) || parseInt(css.getPropertyValue('height'))
|
||||
return params
|
||||
}
|
||||
|
||||
WebViewImpl.prototype.attachWindow = function (guestInstanceId) {
|
||||
this.guestInstanceId = guestInstanceId;
|
||||
this.webContents = remote.getGuestWebContents(this.guestInstanceId);
|
||||
this.guestInstanceId = guestInstanceId
|
||||
this.webContents = remote.getGuestWebContents(this.guestInstanceId)
|
||||
if (!this.internalInstanceId) {
|
||||
return true;
|
||||
return true
|
||||
}
|
||||
return guestViewInternal.attachGuest(this.internalInstanceId, this.guestInstanceId, this.buildParams())
|
||||
}
|
||||
return guestViewInternal.attachGuest(this.internalInstanceId, this.guestInstanceId, this.buildParams());
|
||||
};
|
||||
|
||||
return WebViewImpl;
|
||||
|
||||
})();
|
||||
return WebViewImpl
|
||||
})()
|
||||
|
||||
// Registers browser plugin <object> custom element.
|
||||
var registerBrowserPluginElement = function () {
|
||||
var proto;
|
||||
proto = Object.create(HTMLObjectElement.prototype);
|
||||
var proto
|
||||
proto = Object.create(HTMLObjectElement.prototype)
|
||||
proto.createdCallback = function () {
|
||||
this.setAttribute('type', 'application/browser-plugin');
|
||||
this.setAttribute('id', 'browser-plugin-' + getNextId());
|
||||
this.setAttribute('type', 'application/browser-plugin')
|
||||
this.setAttribute('id', 'browser-plugin-' + getNextId())
|
||||
|
||||
// The <object> node fills in the <webview> container.
|
||||
return this.style.flex = '1 1 auto';
|
||||
};
|
||||
proto.attributeChangedCallback = function(name, oldValue, newValue) {
|
||||
var internal;
|
||||
internal = v8Util.getHiddenValue(this, 'internal');
|
||||
if (!internal) {
|
||||
return;
|
||||
this.style.flex = '1 1 auto'
|
||||
}
|
||||
proto.attributeChangedCallback = function (name, oldValue, newValue) {
|
||||
var internal
|
||||
internal = v8Util.getHiddenValue(this, 'internal')
|
||||
if (!internal) {
|
||||
return
|
||||
}
|
||||
return internal.handleBrowserPluginAttributeMutation(name, oldValue, newValue)
|
||||
}
|
||||
return internal.handleBrowserPluginAttributeMutation(name, oldValue, newValue);
|
||||
};
|
||||
proto.attachedCallback = function () {
|
||||
// Load the plugin immediately.
|
||||
return this.nonExistentAttribute;
|
||||
};
|
||||
return this.nonExistentAttribute
|
||||
}
|
||||
WebViewImpl.BrowserPlugin = webFrame.registerEmbedderCustomElement('browserplugin', {
|
||||
"extends": 'object',
|
||||
'extends': 'object',
|
||||
prototype: proto
|
||||
});
|
||||
delete proto.createdCallback;
|
||||
delete proto.attachedCallback;
|
||||
delete proto.detachedCallback;
|
||||
return delete proto.attributeChangedCallback;
|
||||
};
|
||||
})
|
||||
delete proto.createdCallback
|
||||
delete proto.attachedCallback
|
||||
delete proto.detachedCallback
|
||||
return delete proto.attributeChangedCallback
|
||||
}
|
||||
|
||||
// Registers <webview> custom element.
|
||||
var registerWebViewElement = function () {
|
||||
var createBlockHandler, createNonBlockHandler, i, j, len, len1, m, methods, nonblockMethods, proto;
|
||||
proto = Object.create(HTMLObjectElement.prototype);
|
||||
var createBlockHandler, createNonBlockHandler, i, j, len, len1, m, methods, nonblockMethods, proto
|
||||
proto = Object.create(HTMLObjectElement.prototype)
|
||||
proto.createdCallback = function () {
|
||||
return new WebViewImpl(this);
|
||||
};
|
||||
return new WebViewImpl(this)
|
||||
}
|
||||
proto.attributeChangedCallback = function (name, oldValue, newValue) {
|
||||
var internal;
|
||||
internal = v8Util.getHiddenValue(this, 'internal');
|
||||
var internal
|
||||
internal = v8Util.getHiddenValue(this, 'internal')
|
||||
if (!internal) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
return internal.handleWebviewAttributeMutation(name, oldValue, newValue)
|
||||
}
|
||||
return internal.handleWebviewAttributeMutation(name, oldValue, newValue);
|
||||
};
|
||||
proto.detachedCallback = function () {
|
||||
var internal;
|
||||
internal = v8Util.getHiddenValue(this, 'internal');
|
||||
var internal
|
||||
internal = v8Util.getHiddenValue(this, 'internal')
|
||||
if (!internal) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
guestViewInternal.deregisterEvents(internal.viewInstanceId)
|
||||
internal.elementAttached = false
|
||||
return internal.reset()
|
||||
}
|
||||
guestViewInternal.deregisterEvents(internal.viewInstanceId);
|
||||
internal.elementAttached = false;
|
||||
return internal.reset();
|
||||
};
|
||||
proto.attachedCallback = function () {
|
||||
var internal;
|
||||
internal = v8Util.getHiddenValue(this, 'internal');
|
||||
var internal
|
||||
internal = v8Util.getHiddenValue(this, 'internal')
|
||||
if (!internal) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
if (!internal.elementAttached) {
|
||||
guestViewInternal.registerEvents(internal, internal.viewInstanceId);
|
||||
internal.elementAttached = true;
|
||||
return internal.attributes[webViewConstants.ATTRIBUTE_SRC].parse();
|
||||
guestViewInternal.registerEvents(internal, internal.viewInstanceId)
|
||||
internal.elementAttached = true
|
||||
return internal.attributes[webViewConstants.ATTRIBUTE_SRC].parse()
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// Public-facing API methods.
|
||||
methods = [
|
||||
|
@ -377,8 +374,8 @@ var registerWebViewElement = function() {
|
|||
'downloadURL',
|
||||
'inspectServiceWorker',
|
||||
'print',
|
||||
'printToPDF',
|
||||
];
|
||||
'printToPDF'
|
||||
]
|
||||
nonblockMethods = [
|
||||
'insertCSS',
|
||||
'insertText',
|
||||
|
@ -386,80 +383,79 @@ var registerWebViewElement = function() {
|
|||
'sendInputEvent',
|
||||
'setZoomFactor',
|
||||
'setZoomLevel',
|
||||
'setZoomLevelLimits',
|
||||
];
|
||||
'setZoomLevelLimits'
|
||||
]
|
||||
|
||||
// Forward proto.foo* method calls to WebViewImpl.foo*.
|
||||
createBlockHandler = function (m) {
|
||||
return function (...args) {
|
||||
const internal = v8Util.getHiddenValue(this, 'internal');
|
||||
const internal = v8Util.getHiddenValue(this, 'internal')
|
||||
if (internal.webContents) {
|
||||
return internal.webContents[m].apply(internal.webContents, args);
|
||||
return internal.webContents[m].apply(internal.webContents, args)
|
||||
} else {
|
||||
throw new Error(`Cannot call ${m} because the webContents is unavailable. The WebView must be attached to the DOM and the dom-ready event emitted before this method can be called.`);
|
||||
throw new Error(`Cannot call ${m} because the webContents is unavailable. The WebView must be attached to the DOM and the dom-ready event emitted before this method can be called.`)
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
for (i = 0, len = methods.length; i < len; i++) {
|
||||
m = methods[i];
|
||||
proto[m] = createBlockHandler(m);
|
||||
m = methods[i]
|
||||
proto[m] = createBlockHandler(m)
|
||||
}
|
||||
createNonBlockHandler = function (m) {
|
||||
return function (...args) {
|
||||
const internal = v8Util.getHiddenValue(this, 'internal');
|
||||
return ipcRenderer.send.apply(ipcRenderer, ['ATOM_BROWSER_ASYNC_CALL_TO_GUEST_VIEW', null, internal.guestInstanceId, m].concat(args));
|
||||
};
|
||||
};
|
||||
const internal = v8Util.getHiddenValue(this, 'internal')
|
||||
return ipcRenderer.send.apply(ipcRenderer, ['ATOM_BROWSER_ASYNC_CALL_TO_GUEST_VIEW', null, internal.guestInstanceId, m].concat(args))
|
||||
}
|
||||
}
|
||||
for (j = 0, len1 = nonblockMethods.length; j < len1; j++) {
|
||||
m = nonblockMethods[j];
|
||||
proto[m] = createNonBlockHandler(m);
|
||||
m = nonblockMethods[j]
|
||||
proto[m] = createNonBlockHandler(m)
|
||||
}
|
||||
|
||||
proto.executeJavaScript = function (code, hasUserGesture, callback) {
|
||||
var internal = v8Util.getHiddenValue(this, 'internal');
|
||||
if (typeof hasUserGesture === "function") {
|
||||
callback = hasUserGesture;
|
||||
hasUserGesture = false;
|
||||
var internal = v8Util.getHiddenValue(this, 'internal')
|
||||
if (typeof hasUserGesture === 'function') {
|
||||
callback = hasUserGesture
|
||||
hasUserGesture = false
|
||||
}
|
||||
let requestId = getNextId();
|
||||
ipcRenderer.send('ATOM_BROWSER_ASYNC_CALL_TO_GUEST_VIEW', requestId, internal.guestInstanceId, "executeJavaScript", code, hasUserGesture);
|
||||
let requestId = getNextId()
|
||||
ipcRenderer.send('ATOM_BROWSER_ASYNC_CALL_TO_GUEST_VIEW', requestId, internal.guestInstanceId, 'executeJavaScript', code, hasUserGesture)
|
||||
ipcRenderer.once(`ATOM_RENDERER_ASYNC_CALL_TO_GUEST_VIEW_RESPONSE_${requestId}`, function (event, result) {
|
||||
if (callback)
|
||||
callback(result);
|
||||
});
|
||||
};
|
||||
if (callback) callback(result)
|
||||
})
|
||||
}
|
||||
|
||||
// WebContents associated with this webview.
|
||||
proto.getWebContents = function () {
|
||||
var internal = v8Util.getHiddenValue(this, 'internal');
|
||||
return internal.webContents;
|
||||
};
|
||||
var internal = v8Util.getHiddenValue(this, 'internal')
|
||||
return internal.webContents
|
||||
}
|
||||
|
||||
// Deprecated.
|
||||
deprecate.rename(proto, 'getUrl', 'getURL');
|
||||
deprecate.rename(proto, 'getUrl', 'getURL')
|
||||
window.WebView = webFrame.registerEmbedderCustomElement('webview', {
|
||||
prototype: proto
|
||||
});
|
||||
})
|
||||
|
||||
// Delete the callbacks so developers cannot call them and produce unexpected
|
||||
// behavior.
|
||||
delete proto.createdCallback;
|
||||
delete proto.attachedCallback;
|
||||
delete proto.detachedCallback;
|
||||
return delete proto.attributeChangedCallback;
|
||||
};
|
||||
delete proto.createdCallback
|
||||
delete proto.attachedCallback
|
||||
delete proto.detachedCallback
|
||||
return delete proto.attributeChangedCallback
|
||||
}
|
||||
|
||||
var useCapture = true;
|
||||
var useCapture = true
|
||||
|
||||
var listener = function (event) {
|
||||
if (document.readyState === 'loading') {
|
||||
return;
|
||||
return
|
||||
}
|
||||
registerBrowserPluginElement()
|
||||
registerWebViewElement()
|
||||
return window.removeEventListener(event.type, listener, useCapture)
|
||||
}
|
||||
registerBrowserPluginElement();
|
||||
registerWebViewElement();
|
||||
return window.removeEventListener(event.type, listener, useCapture);
|
||||
};
|
||||
|
||||
window.addEventListener('readystatechange', listener, true);
|
||||
window.addEventListener('readystatechange', listener, true)
|
||||
|
||||
module.exports = WebViewImpl;
|
||||
module.exports = WebViewImpl
|
||||
|
|
18
package.json
18
package.json
|
@ -3,17 +3,29 @@
|
|||
"version": "0.37.3",
|
||||
"devDependencies": {
|
||||
"asar": "^0.10.0",
|
||||
"eslint": "^2.1.0",
|
||||
"request": "*"
|
||||
"request": "*",
|
||||
"standard": "^6.0.8"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"runas": "^3.0.0"
|
||||
},
|
||||
"standard": {
|
||||
"ignore": [
|
||||
"/out",
|
||||
"/spec",
|
||||
"/vendor"
|
||||
],
|
||||
"env": {
|
||||
"browser": true
|
||||
}
|
||||
},
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"bootstrap": "python ./script/bootstrap.py",
|
||||
"build": "python ./script/build.py -c D",
|
||||
"lint": "python ./script/eslint.py && python ./script/cpplint.py",
|
||||
"lint": "npm run lint-js && npm run lint-cpp",
|
||||
"lint-js": "standard && standard spec",
|
||||
"lint-cpp": "python ./script/cpplint.py",
|
||||
"preinstall": "node -e 'process.exit(0)'",
|
||||
"repl": "python ./script/start.py --interactive",
|
||||
"start": "python ./script/start.py",
|
||||
|
|
|
@ -62,9 +62,10 @@ def main():
|
|||
args += ['--dev']
|
||||
run_script('bootstrap.py', args)
|
||||
|
||||
run_script('cpplint.py')
|
||||
run_script('eslint.py')
|
||||
if PLATFORM != 'win32':
|
||||
sys.stderr.write('\nRunning `npm run lint`\n')
|
||||
sys.stderr.flush()
|
||||
execute([npm, 'run', 'lint'])
|
||||
run_script('pylint.py')
|
||||
if is_release:
|
||||
run_script('build.py', ['-c', 'R'])
|
||||
|
|
|
@ -1,36 +0,0 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
import glob
|
||||
import os
|
||||
import sys
|
||||
|
||||
from lib.config import PLATFORM
|
||||
from lib.util import execute
|
||||
|
||||
|
||||
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
|
||||
|
||||
|
||||
def main():
|
||||
os.chdir(SOURCE_ROOT)
|
||||
|
||||
# Skip eslint on our Windows build machine for now.
|
||||
if PLATFORM == 'win32' and os.getenv('JANKY_SHA1'):
|
||||
return
|
||||
|
||||
eslint = os.path.join(SOURCE_ROOT, 'node_modules', '.bin', 'eslint')
|
||||
if sys.platform in ['win32', 'cygwin']:
|
||||
eslint += '.cmd'
|
||||
settings = ['--quiet', '--config']
|
||||
|
||||
sourceConfig = os.path.join('script', 'eslintrc-base.json')
|
||||
sourceFiles = ['lib']
|
||||
execute([eslint] + settings + [sourceConfig] + sourceFiles)
|
||||
|
||||
specConfig = os.path.join('script', 'eslintrc-spec.json')
|
||||
specFiles = glob.glob('spec/*.js')
|
||||
execute([eslint] + settings + [specConfig] + specFiles)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.exit(main())
|
|
@ -1,36 +0,0 @@
|
|||
{
|
||||
"rules": {
|
||||
"indent": [
|
||||
2,
|
||||
2,
|
||||
{
|
||||
"SwitchCase": 1
|
||||
}
|
||||
],
|
||||
"quotes": [
|
||||
0,
|
||||
"single"
|
||||
],
|
||||
"semi": [
|
||||
2,
|
||||
"always"
|
||||
],
|
||||
"comma-dangle": 0,
|
||||
"linebreak-style": 0,
|
||||
"no-console": 0,
|
||||
"no-undef": 2,
|
||||
"no-unused-vars": 2
|
||||
},
|
||||
"env": {
|
||||
"es6": true,
|
||||
"node": true,
|
||||
"browser": true
|
||||
},
|
||||
"extends": "eslint:recommended",
|
||||
"globals": {
|
||||
"DevToolsAPI": false,
|
||||
"InspectorFrontendHost": false,
|
||||
"WebInspector": false,
|
||||
"WebView": false
|
||||
}
|
||||
}
|
|
@ -1,7 +0,0 @@
|
|||
{
|
||||
"env": {
|
||||
"jquery": true,
|
||||
"mocha": true
|
||||
},
|
||||
"extends": "./eslintrc-base.json"
|
||||
}
|
|
@ -1,135 +1,135 @@
|
|||
const assert = require('assert');
|
||||
const ChildProcess = require('child_process');
|
||||
const path = require('path');
|
||||
const remote = require('electron').remote;
|
||||
const assert = require('assert')
|
||||
const ChildProcess = require('child_process')
|
||||
const path = require('path')
|
||||
const remote = require('electron').remote
|
||||
|
||||
const app = remote.require('electron').app;
|
||||
const BrowserWindow = remote.require('electron').BrowserWindow;
|
||||
const app = remote.require('electron').app
|
||||
const BrowserWindow = remote.require('electron').BrowserWindow
|
||||
|
||||
describe('electron module', function () {
|
||||
it('allows old style require by default', function () {
|
||||
require('shell');
|
||||
});
|
||||
require('shell')
|
||||
})
|
||||
|
||||
it('can prevent exposing internal modules to require', function (done) {
|
||||
const electron = require('electron');
|
||||
const clipboard = require('clipboard');
|
||||
assert.equal(typeof clipboard, 'object');
|
||||
electron.hideInternalModules();
|
||||
const electron = require('electron')
|
||||
const clipboard = require('clipboard')
|
||||
assert.equal(typeof clipboard, 'object')
|
||||
electron.hideInternalModules()
|
||||
try {
|
||||
require('clipboard');
|
||||
require('clipboard')
|
||||
} catch (err) {
|
||||
assert.equal(err.message, 'Cannot find module \'clipboard\'');
|
||||
done();
|
||||
assert.equal(err.message, "Cannot find module 'clipboard'")
|
||||
done()
|
||||
}
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
|
||||
describe('app module', function () {
|
||||
describe('app.getVersion()', function () {
|
||||
it('returns the version field of package.json', function () {
|
||||
assert.equal(app.getVersion(), '0.1.0');
|
||||
});
|
||||
});
|
||||
assert.equal(app.getVersion(), '0.1.0')
|
||||
})
|
||||
})
|
||||
|
||||
describe('app.setVersion(version)', function () {
|
||||
it('overrides the version', function () {
|
||||
assert.equal(app.getVersion(), '0.1.0');
|
||||
app.setVersion('test-version');
|
||||
assert.equal(app.getVersion(), 'test-version');
|
||||
app.setVersion('0.1.0');
|
||||
});
|
||||
});
|
||||
assert.equal(app.getVersion(), '0.1.0')
|
||||
app.setVersion('test-version')
|
||||
assert.equal(app.getVersion(), 'test-version')
|
||||
app.setVersion('0.1.0')
|
||||
})
|
||||
})
|
||||
|
||||
describe('app.getName()', function () {
|
||||
it('returns the name field of package.json', function () {
|
||||
assert.equal(app.getName(), 'Electron Test');
|
||||
});
|
||||
});
|
||||
assert.equal(app.getName(), 'Electron Test')
|
||||
})
|
||||
})
|
||||
|
||||
describe('app.setName(name)', function () {
|
||||
it('overrides the name', function () {
|
||||
assert.equal(app.getName(), 'Electron Test');
|
||||
app.setName('test-name');
|
||||
assert.equal(app.getName(), 'test-name');
|
||||
app.setName('Electron Test');
|
||||
});
|
||||
});
|
||||
assert.equal(app.getName(), 'Electron Test')
|
||||
app.setName('test-name')
|
||||
assert.equal(app.getName(), 'test-name')
|
||||
app.setName('Electron Test')
|
||||
})
|
||||
})
|
||||
|
||||
describe('app.getLocale()', function () {
|
||||
it('should not be empty', function () {
|
||||
assert.notEqual(app.getLocale(), '');
|
||||
});
|
||||
});
|
||||
assert.notEqual(app.getLocale(), '')
|
||||
})
|
||||
})
|
||||
|
||||
describe('app.exit(exitCode)', function () {
|
||||
var appProcess = null;
|
||||
var appProcess = null
|
||||
|
||||
afterEach(function () {
|
||||
appProcess != null ? appProcess.kill() : void 0;
|
||||
});
|
||||
appProcess != null ? appProcess.kill() : void 0
|
||||
})
|
||||
|
||||
it('emits a process exit event with the code', function (done) {
|
||||
var appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app');
|
||||
var electronPath = remote.getGlobal('process').execPath;
|
||||
var output = '';
|
||||
appProcess = ChildProcess.spawn(electronPath, [appPath]);
|
||||
var appPath = path.join(__dirname, 'fixtures', 'api', 'quit-app')
|
||||
var electronPath = remote.getGlobal('process').execPath
|
||||
var output = ''
|
||||
appProcess = ChildProcess.spawn(electronPath, [appPath])
|
||||
appProcess.stdout.on('data', function (data) {
|
||||
output += data;
|
||||
});
|
||||
output += data
|
||||
})
|
||||
appProcess.on('close', function (code) {
|
||||
if (process.platform !== 'win32') {
|
||||
assert.notEqual(output.indexOf('Exit event with code: 123'), -1);
|
||||
assert.notEqual(output.indexOf('Exit event with code: 123'), -1)
|
||||
}
|
||||
assert.equal(code, 123);
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
assert.equal(code, 123)
|
||||
done()
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('BrowserWindow events', function () {
|
||||
var w = null;
|
||||
var w = null
|
||||
|
||||
afterEach(function () {
|
||||
if (w != null) {
|
||||
w.destroy();
|
||||
w.destroy()
|
||||
}
|
||||
w = null;
|
||||
});
|
||||
w = null
|
||||
})
|
||||
|
||||
it('should emit browser-window-focus event when window is focused', function (done) {
|
||||
app.once('browser-window-focus', function (e, window) {
|
||||
assert.equal(w.id, window.id);
|
||||
done();
|
||||
});
|
||||
assert.equal(w.id, window.id)
|
||||
done()
|
||||
})
|
||||
w = new BrowserWindow({
|
||||
show: false
|
||||
});
|
||||
w.emit('focus');
|
||||
});
|
||||
})
|
||||
w.emit('focus')
|
||||
})
|
||||
|
||||
it('should emit browser-window-blur event when window is blured', function (done) {
|
||||
app.once('browser-window-blur', function (e, window) {
|
||||
assert.equal(w.id, window.id);
|
||||
done();
|
||||
});
|
||||
assert.equal(w.id, window.id)
|
||||
done()
|
||||
})
|
||||
w = new BrowserWindow({
|
||||
show: false
|
||||
});
|
||||
w.emit('blur');
|
||||
});
|
||||
})
|
||||
w.emit('blur')
|
||||
})
|
||||
|
||||
it('should emit browser-window-created event when window is created', function (done) {
|
||||
app.once('browser-window-created', function (e, window) {
|
||||
setImmediate(function () {
|
||||
assert.equal(w.id, window.id);
|
||||
done();
|
||||
});
|
||||
});
|
||||
assert.equal(w.id, window.id)
|
||||
done()
|
||||
})
|
||||
})
|
||||
w = new BrowserWindow({
|
||||
show: false
|
||||
});
|
||||
w.emit('blur');
|
||||
});
|
||||
});
|
||||
});
|
||||
})
|
||||
w.emit('blur')
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
|
@ -1,38 +1,37 @@
|
|||
const assert = require('assert');
|
||||
const autoUpdater = require('electron').remote.autoUpdater;
|
||||
const ipcRenderer = require('electron').ipcRenderer;
|
||||
const assert = require('assert')
|
||||
const autoUpdater = require('electron').remote.autoUpdater
|
||||
const ipcRenderer = require('electron').ipcRenderer
|
||||
|
||||
// Skip autoUpdater tests in MAS build.
|
||||
if (process.mas)
|
||||
return;
|
||||
|
||||
if (!process.mas) {
|
||||
describe('autoUpdater module', function () {
|
||||
describe('checkForUpdates', function () {
|
||||
it('emits an error on Windows when called the feed URL is not set', function (done) {
|
||||
if (process.platform !== 'win32') {
|
||||
return done();
|
||||
return done()
|
||||
}
|
||||
|
||||
ipcRenderer.once('auto-updater-error', function (event, message) {
|
||||
assert.equal(message, 'Update URL is not set');
|
||||
done();
|
||||
});
|
||||
autoUpdater.setFeedURL('');
|
||||
autoUpdater.checkForUpdates();
|
||||
});
|
||||
});
|
||||
assert.equal(message, 'Update URL is not set')
|
||||
done()
|
||||
})
|
||||
autoUpdater.setFeedURL('')
|
||||
autoUpdater.checkForUpdates()
|
||||
})
|
||||
})
|
||||
|
||||
describe('setFeedURL', function () {
|
||||
it('emits an error on Mac OS X when the application is unsigned', function (done) {
|
||||
if (process.platform !== 'darwin') {
|
||||
return done();
|
||||
return done()
|
||||
}
|
||||
|
||||
ipcRenderer.once('auto-updater-error', function (event, message) {
|
||||
assert.equal(message, 'Could not get code signature for running application');
|
||||
done();
|
||||
});
|
||||
autoUpdater.setFeedURL('');
|
||||
});
|
||||
});
|
||||
});
|
||||
assert.equal(message, 'Could not get code signature for running application')
|
||||
done()
|
||||
})
|
||||
autoUpdater.setFeedURL('')
|
||||
})
|
||||
})
|
||||
})
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,63 +1,63 @@
|
|||
const assert = require('assert');
|
||||
const path = require('path');
|
||||
const assert = require('assert')
|
||||
const path = require('path')
|
||||
|
||||
const clipboard = require('electron').clipboard;
|
||||
const nativeImage = require('electron').nativeImage;
|
||||
const clipboard = require('electron').clipboard
|
||||
const nativeImage = require('electron').nativeImage
|
||||
|
||||
describe('clipboard module', function () {
|
||||
var fixtures = path.resolve(__dirname, 'fixtures');
|
||||
var fixtures = path.resolve(__dirname, 'fixtures')
|
||||
|
||||
describe('clipboard.readImage()', function () {
|
||||
it('returns NativeImage intance', function () {
|
||||
var p = path.join(fixtures, 'assets', 'logo.png');
|
||||
var i = nativeImage.createFromPath(p);
|
||||
clipboard.writeImage(p);
|
||||
assert.equal(clipboard.readImage().toDataURL(), i.toDataURL());
|
||||
});
|
||||
});
|
||||
var p = path.join(fixtures, 'assets', 'logo.png')
|
||||
var i = nativeImage.createFromPath(p)
|
||||
clipboard.writeImage(p)
|
||||
assert.equal(clipboard.readImage().toDataURL(), i.toDataURL())
|
||||
})
|
||||
})
|
||||
|
||||
describe('clipboard.readText()', function () {
|
||||
it('returns unicode string correctly', function () {
|
||||
var text = '千江有水千江月,万里无云万里天';
|
||||
clipboard.writeText(text);
|
||||
assert.equal(clipboard.readText(), text);
|
||||
});
|
||||
});
|
||||
var text = '千江有水千江月,万里无云万里天'
|
||||
clipboard.writeText(text)
|
||||
assert.equal(clipboard.readText(), text)
|
||||
})
|
||||
})
|
||||
|
||||
describe('clipboard.readHtml()', function () {
|
||||
it('returns markup correctly', function () {
|
||||
var text = '<string>Hi</string>';
|
||||
var markup = process.platform === 'darwin' ? '<meta charset=\'utf-8\'><string>Hi</string>' : process.platform === 'linux' ? '<meta http-equiv="content-type" ' + 'content="text/html; charset=utf-8"><string>Hi</string>' : '<string>Hi</string>';
|
||||
clipboard.writeHtml(text);
|
||||
assert.equal(clipboard.readHtml(), markup);
|
||||
});
|
||||
});
|
||||
var text = '<string>Hi</string>'
|
||||
var markup = process.platform === 'darwin' ? "<meta charset='utf-8'><string>Hi</string>" : process.platform === 'linux' ? '<meta http-equiv="content-type" ' + 'content="text/html; charset=utf-8"><string>Hi</string>' : '<string>Hi</string>'
|
||||
clipboard.writeHtml(text)
|
||||
assert.equal(clipboard.readHtml(), markup)
|
||||
})
|
||||
})
|
||||
|
||||
describe('clipboard.readRtf', function () {
|
||||
it('returns rtf text correctly', function () {
|
||||
var rtf = "{\\rtf1\\ansi{\\fonttbl\\f0\\fswiss Helvetica;}\\f0\\pard\nThis is some {\\b bold} text.\\par\n}";
|
||||
clipboard.writeRtf(rtf);
|
||||
assert.equal(clipboard.readRtf(), rtf);
|
||||
});
|
||||
});
|
||||
var rtf = '{\\rtf1\\ansi{\\fonttbl\\f0\\fswiss Helvetica;}\\f0\\pard\nThis is some {\\b bold} text.\\par\n}'
|
||||
clipboard.writeRtf(rtf)
|
||||
assert.equal(clipboard.readRtf(), rtf)
|
||||
})
|
||||
})
|
||||
|
||||
describe('clipboard.write()', function () {
|
||||
it('returns data correctly', function () {
|
||||
var text = 'test';
|
||||
var rtf = '{\\rtf1\\utf8 text}';
|
||||
var p = path.join(fixtures, 'assets', 'logo.png');
|
||||
var i = nativeImage.createFromPath(p);
|
||||
var markup = process.platform === 'darwin' ? '<meta charset=\'utf-8\'><b>Hi</b>' : process.platform === 'linux' ? '<meta http-equiv="content-type" ' + 'content="text/html; charset=utf-8"><b>Hi</b>' : '<b>Hi</b>';
|
||||
var text = 'test'
|
||||
var rtf = '{\\rtf1\\utf8 text}'
|
||||
var p = path.join(fixtures, 'assets', 'logo.png')
|
||||
var i = nativeImage.createFromPath(p)
|
||||
var markup = process.platform === 'darwin' ? "<meta charset='utf-8'><b>Hi</b>" : process.platform === 'linux' ? '<meta http-equiv="content-type" ' + 'content="text/html; charset=utf-8"><b>Hi</b>' : '<b>Hi</b>'
|
||||
clipboard.write({
|
||||
text: "test",
|
||||
text: 'test',
|
||||
html: '<b>Hi</b>',
|
||||
rtf: '{\\rtf1\\utf8 text}',
|
||||
image: p
|
||||
});
|
||||
assert.equal(clipboard.readText(), text);
|
||||
assert.equal(clipboard.readHtml(), markup);
|
||||
assert.equal(clipboard.readRtf(), rtf);
|
||||
assert.equal(clipboard.readImage().toDataURL(), i.toDataURL());
|
||||
});
|
||||
});
|
||||
});
|
||||
})
|
||||
assert.equal(clipboard.readText(), text)
|
||||
assert.equal(clipboard.readHtml(), markup)
|
||||
assert.equal(clipboard.readRtf(), rtf)
|
||||
assert.equal(clipboard.readImage().toDataURL(), i.toDataURL())
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
|
@ -1,93 +1,92 @@
|
|||
const assert = require('assert');
|
||||
const http = require('http');
|
||||
const multiparty = require('multiparty');
|
||||
const path = require('path');
|
||||
const url = require('url');
|
||||
const assert = require('assert')
|
||||
const http = require('http')
|
||||
const multiparty = require('multiparty')
|
||||
const path = require('path')
|
||||
const url = require('url')
|
||||
|
||||
const remote = require('electron').remote;
|
||||
const app = remote.require('electron').app;
|
||||
const crashReporter = remote.require('electron').crashReporter;
|
||||
const BrowserWindow = remote.require('electron').BrowserWindow;
|
||||
const remote = require('electron').remote
|
||||
const app = remote.require('electron').app
|
||||
const crashReporter = remote.require('electron').crashReporter
|
||||
const BrowserWindow = remote.require('electron').BrowserWindow
|
||||
|
||||
describe('crash-reporter module', function () {
|
||||
var fixtures = path.resolve(__dirname, 'fixtures');
|
||||
var w = null;
|
||||
var fixtures = path.resolve(__dirname, 'fixtures')
|
||||
var w = null
|
||||
|
||||
beforeEach(function () {
|
||||
w = new BrowserWindow({
|
||||
show: false
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
|
||||
afterEach(function () {
|
||||
w.destroy();
|
||||
});
|
||||
w.destroy()
|
||||
})
|
||||
|
||||
if (process.mas) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
|
||||
var isCI = remote.getGlobal('isCi');
|
||||
var isCI = remote.getGlobal('isCi')
|
||||
if (isCI) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
|
||||
it('should send minidump when renderer crashes', function (done) {
|
||||
this.timeout(120000);
|
||||
this.timeout(120000)
|
||||
|
||||
var called = false;
|
||||
var called = false
|
||||
var server = http.createServer(function (req, res) {
|
||||
server.close();
|
||||
var form = new multiparty.Form();
|
||||
server.close()
|
||||
var form = new multiparty.Form()
|
||||
form.parse(req, function (error, fields) {
|
||||
if (called) {
|
||||
return;
|
||||
}
|
||||
called = true;
|
||||
assert.equal(fields['prod'], 'Electron');
|
||||
assert.equal(fields['ver'], process.versions['electron']);
|
||||
assert.equal(fields['process_type'], 'renderer');
|
||||
assert.equal(fields['platform'], process.platform);
|
||||
assert.equal(fields['extra1'], 'extra1');
|
||||
assert.equal(fields['extra2'], 'extra2');
|
||||
assert.equal(fields['_productName'], 'Zombies');
|
||||
assert.equal(fields['_companyName'], 'Umbrella Corporation');
|
||||
assert.equal(fields['_version'], app.getVersion());
|
||||
res.end('abc-123-def');
|
||||
done();
|
||||
});
|
||||
});
|
||||
var port = remote.process.port;
|
||||
if (error) throw error
|
||||
if (called) return
|
||||
called = true
|
||||
assert.equal(fields['prod'], 'Electron')
|
||||
assert.equal(fields['ver'], process.versions['electron'])
|
||||
assert.equal(fields['process_type'], 'renderer')
|
||||
assert.equal(fields['platform'], process.platform)
|
||||
assert.equal(fields['extra1'], 'extra1')
|
||||
assert.equal(fields['extra2'], 'extra2')
|
||||
assert.equal(fields['_productName'], 'Zombies')
|
||||
assert.equal(fields['_companyName'], 'Umbrella Corporation')
|
||||
assert.equal(fields['_version'], app.getVersion())
|
||||
res.end('abc-123-def')
|
||||
done()
|
||||
})
|
||||
})
|
||||
var port = remote.process.port
|
||||
server.listen(port, '127.0.0.1', function () {
|
||||
port = server.address().port;
|
||||
remote.process.port = port;
|
||||
port = server.address().port
|
||||
remote.process.port = port
|
||||
const crashUrl = url.format({
|
||||
protocol: 'file',
|
||||
pathname: path.join(fixtures, 'api', 'crash.html'),
|
||||
search: "?port=" + port
|
||||
});
|
||||
search: '?port=' + port
|
||||
})
|
||||
if (process.platform === 'darwin') {
|
||||
crashReporter.start({
|
||||
companyName: 'Umbrella Corporation',
|
||||
submitURL: "http://127.0.0.1:" + port
|
||||
});
|
||||
submitURL: 'http://127.0.0.1:' + port
|
||||
})
|
||||
}
|
||||
w.loadURL(crashUrl);
|
||||
});
|
||||
});
|
||||
w.loadURL(crashUrl)
|
||||
})
|
||||
})
|
||||
|
||||
describe(".start(options)", function() {
|
||||
describe('.start(options)', function () {
|
||||
it('requires that the companyName and submitURL options be specified', function () {
|
||||
assert.throws(function () {
|
||||
crashReporter.start({
|
||||
companyName: 'Missing submitURL'
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
assert.throws(function () {
|
||||
crashReporter.start({
|
||||
submitURL: 'Missing companyName'
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
|
@ -1,133 +1,134 @@
|
|||
const assert = require('assert');
|
||||
const path = require('path');
|
||||
const BrowserWindow = require('electron').remote.BrowserWindow;
|
||||
const assert = require('assert')
|
||||
const path = require('path')
|
||||
const BrowserWindow = require('electron').remote.BrowserWindow
|
||||
|
||||
describe('debugger module', function () {
|
||||
var fixtures = path.resolve(__dirname, 'fixtures');
|
||||
var w = null;
|
||||
var fixtures = path.resolve(__dirname, 'fixtures')
|
||||
var w = null
|
||||
|
||||
beforeEach(function () {
|
||||
if (w != null) {
|
||||
w.destroy();
|
||||
w.destroy()
|
||||
}
|
||||
w = new BrowserWindow({
|
||||
show: false,
|
||||
width: 400,
|
||||
height: 400
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
|
||||
afterEach(function () {
|
||||
if (w != null) {
|
||||
w.destroy();
|
||||
w.destroy()
|
||||
}
|
||||
w = null;
|
||||
});
|
||||
w = null
|
||||
})
|
||||
|
||||
describe('debugger.attach', function () {
|
||||
it('fails when devtools is already open', function (done) {
|
||||
w.webContents.on('did-finish-load', function () {
|
||||
w.webContents.openDevTools();
|
||||
w.webContents.openDevTools()
|
||||
try {
|
||||
w.webContents.debugger.attach();
|
||||
w.webContents.debugger.attach()
|
||||
} catch (err) {
|
||||
assert(w.webContents.debugger.isAttached());
|
||||
done();
|
||||
assert(w.webContents.debugger.isAttached())
|
||||
done()
|
||||
}
|
||||
});
|
||||
w.webContents.loadURL('file://' + path.join(fixtures, 'pages', 'a.html'));
|
||||
});
|
||||
})
|
||||
w.webContents.loadURL('file://' + path.join(fixtures, 'pages', 'a.html'))
|
||||
})
|
||||
|
||||
it('fails when protocol version is not supported', function (done) {
|
||||
try {
|
||||
w.webContents.debugger.attach("2.0");
|
||||
w.webContents.debugger.attach('2.0')
|
||||
} catch (err) {
|
||||
assert(!w.webContents.debugger.isAttached());
|
||||
done();
|
||||
assert(!w.webContents.debugger.isAttached())
|
||||
done()
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
it('attaches when no protocol version is specified', function (done) {
|
||||
try {
|
||||
w.webContents.debugger.attach();
|
||||
w.webContents.debugger.attach()
|
||||
} catch (err) {
|
||||
done('unexpected error : ' + err);
|
||||
done('unexpected error : ' + err)
|
||||
}
|
||||
assert(w.webContents.debugger.isAttached());
|
||||
done();
|
||||
});
|
||||
});
|
||||
assert(w.webContents.debugger.isAttached())
|
||||
done()
|
||||
})
|
||||
})
|
||||
|
||||
describe('debugger.detach', function () {
|
||||
it('fires detach event', function (done) {
|
||||
w.webContents.debugger.on('detach', function (e, reason) {
|
||||
assert.equal(reason, 'target closed');
|
||||
assert(!w.webContents.debugger.isAttached());
|
||||
done();
|
||||
});
|
||||
assert.equal(reason, 'target closed')
|
||||
assert(!w.webContents.debugger.isAttached())
|
||||
done()
|
||||
})
|
||||
try {
|
||||
w.webContents.debugger.attach();
|
||||
w.webContents.debugger.attach()
|
||||
} catch (err) {
|
||||
done('unexpected error : ' + err);
|
||||
done('unexpected error : ' + err)
|
||||
}
|
||||
w.webContents.debugger.detach();
|
||||
});
|
||||
});
|
||||
w.webContents.debugger.detach()
|
||||
})
|
||||
})
|
||||
|
||||
describe('debugger.sendCommand', function () {
|
||||
it('retuns response', function (done) {
|
||||
w.webContents.loadURL('about:blank');
|
||||
w.webContents.loadURL('about:blank')
|
||||
try {
|
||||
w.webContents.debugger.attach();
|
||||
w.webContents.debugger.attach()
|
||||
} catch (err) {
|
||||
done('unexpected error : ' + err);
|
||||
return done('unexpected error : ' + err)
|
||||
}
|
||||
var callback = function (err, res) {
|
||||
assert(!res.wasThrown);
|
||||
assert.equal(res.result.value, 6);
|
||||
w.webContents.debugger.detach();
|
||||
done();
|
||||
};
|
||||
assert(!err.message)
|
||||
assert(!res.wasThrown)
|
||||
assert.equal(res.result.value, 6)
|
||||
w.webContents.debugger.detach()
|
||||
done()
|
||||
}
|
||||
const params = {
|
||||
"expression": "4+2",
|
||||
};
|
||||
w.webContents.debugger.sendCommand("Runtime.evaluate", params, callback);
|
||||
});
|
||||
'expression': '4+2'
|
||||
}
|
||||
w.webContents.debugger.sendCommand('Runtime.evaluate', params, callback)
|
||||
})
|
||||
|
||||
it('fires message event', function (done) {
|
||||
var url = process.platform != 'win32' ?
|
||||
'file://' + path.join(fixtures, 'pages', 'a.html') :
|
||||
'file:///' + path.join(fixtures, 'pages', 'a.html').replace(/\\/g, '/');
|
||||
w.webContents.loadURL(url);
|
||||
var url = process.platform !== 'win32'
|
||||
? 'file://' + path.join(fixtures, 'pages', 'a.html')
|
||||
: 'file:///' + path.join(fixtures, 'pages', 'a.html').replace(/\\/g, '/')
|
||||
w.webContents.loadURL(url)
|
||||
try {
|
||||
w.webContents.debugger.attach();
|
||||
w.webContents.debugger.attach()
|
||||
} catch (err) {
|
||||
done('unexpected error : ' + err);
|
||||
done('unexpected error : ' + err)
|
||||
}
|
||||
w.webContents.debugger.on('message', function (e, method, params) {
|
||||
if(method == "Console.messageAdded") {
|
||||
assert.equal(params.message.type, 'log');
|
||||
assert.equal(params.message.url, url);
|
||||
assert.equal(params.message.text, 'a');
|
||||
w.webContents.debugger.detach();
|
||||
done();
|
||||
if (method === 'Console.messageAdded') {
|
||||
assert.equal(params.message.type, 'log')
|
||||
assert.equal(params.message.url, url)
|
||||
assert.equal(params.message.text, 'a')
|
||||
w.webContents.debugger.detach()
|
||||
done()
|
||||
}
|
||||
});
|
||||
w.webContents.debugger.sendCommand("Console.enable");
|
||||
});
|
||||
})
|
||||
w.webContents.debugger.sendCommand('Console.enable')
|
||||
})
|
||||
|
||||
it('returns error message when command fails', function (done) {
|
||||
w.webContents.loadURL('about:blank');
|
||||
w.webContents.loadURL('about:blank')
|
||||
try {
|
||||
w.webContents.debugger.attach();
|
||||
w.webContents.debugger.attach()
|
||||
} catch (err) {
|
||||
done('unexpected error : ' + err);
|
||||
done('unexpected error : ' + err)
|
||||
}
|
||||
w.webContents.debugger.sendCommand("Test", function(err) {
|
||||
assert.equal(err.message, '\'Test\' wasn\'t found');
|
||||
w.webContents.debugger.detach();
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
w.webContents.debugger.sendCommand('Test', function (err) {
|
||||
assert.equal(err.message, "'Test' wasn't found")
|
||||
w.webContents.debugger.detach()
|
||||
done()
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
|
@ -1,27 +1,27 @@
|
|||
const assert = require('assert');
|
||||
const deprecations = require('electron').deprecations;
|
||||
const assert = require('assert')
|
||||
const deprecations = require('electron').deprecations
|
||||
|
||||
describe('deprecations', function () {
|
||||
beforeEach(function () {
|
||||
deprecations.setHandler(null);
|
||||
process.throwDeprecation = true;
|
||||
});
|
||||
deprecations.setHandler(null)
|
||||
process.throwDeprecation = true
|
||||
})
|
||||
|
||||
it('allows a deprecation handler function to be specified', function () {
|
||||
var messages = [];
|
||||
var messages = []
|
||||
|
||||
deprecations.setHandler(function (message) {
|
||||
messages.push(message);
|
||||
});
|
||||
messages.push(message)
|
||||
})
|
||||
|
||||
require('electron').webFrame.registerUrlSchemeAsSecure('some-scheme');
|
||||
require('electron').webFrame.registerUrlSchemeAsSecure('some-scheme')
|
||||
|
||||
assert.deepEqual(messages, ['registerUrlSchemeAsSecure is deprecated. Use registerURLSchemeAsSecure instead.']);
|
||||
});
|
||||
assert.deepEqual(messages, ['registerUrlSchemeAsSecure is deprecated. Use registerURLSchemeAsSecure instead.'])
|
||||
})
|
||||
|
||||
it('throws an exception if no deprecation handler is specified', function () {
|
||||
assert.throws(function () {
|
||||
require('electron').webFrame.registerUrlSchemeAsPrivileged('some-scheme');
|
||||
}, "registerUrlSchemeAsPrivileged is deprecated. Use registerURLSchemeAsPrivileged instead.");
|
||||
});
|
||||
});
|
||||
require('electron').webFrame.registerUrlSchemeAsPrivileged('some-scheme')
|
||||
}, 'registerUrlSchemeAsPrivileged is deprecated. Use registerURLSchemeAsPrivileged instead.')
|
||||
})
|
||||
})
|
||||
|
|
|
@ -1,27 +1,27 @@
|
|||
const assert = require('assert');
|
||||
const desktopCapturer = require('electron').desktopCapturer;
|
||||
const assert = require('assert')
|
||||
const desktopCapturer = require('electron').desktopCapturer
|
||||
|
||||
describe('desktopCapturer', function () {
|
||||
it('should return a non-empty array of sources', function (done) {
|
||||
desktopCapturer.getSources({
|
||||
types: ['window', 'screen']
|
||||
}, function (error, sources) {
|
||||
assert.equal(error, null);
|
||||
assert.notEqual(sources.length, 0);
|
||||
done();
|
||||
});
|
||||
});
|
||||
assert.equal(error, null)
|
||||
assert.notEqual(sources.length, 0)
|
||||
done()
|
||||
})
|
||||
})
|
||||
|
||||
it('does not throw an error when called more than once (regression)', function (done) {
|
||||
var callCount = 0;
|
||||
var callCount = 0
|
||||
var callback = function (error, sources) {
|
||||
callCount++;
|
||||
assert.equal(error, null);
|
||||
assert.notEqual(sources.length, 0);
|
||||
if (callCount === 2) done();
|
||||
};
|
||||
callCount++
|
||||
assert.equal(error, null)
|
||||
assert.notEqual(sources.length, 0)
|
||||
if (callCount === 2) done()
|
||||
}
|
||||
|
||||
desktopCapturer.getSources({types: ['window', 'screen']}, callback);
|
||||
desktopCapturer.getSources({types: ['window', 'screen']}, callback);
|
||||
});
|
||||
});
|
||||
desktopCapturer.getSources({types: ['window', 'screen']}, callback)
|
||||
desktopCapturer.getSources({types: ['window', 'screen']}, callback)
|
||||
})
|
||||
})
|
||||
|
|
|
@ -1,210 +1,210 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const assert = require('assert');
|
||||
const path = require('path');
|
||||
const assert = require('assert')
|
||||
const path = require('path')
|
||||
|
||||
const ipcRenderer = require('electron').ipcRenderer;
|
||||
const remote = require('electron').remote;
|
||||
const ipcRenderer = require('electron').ipcRenderer
|
||||
const remote = require('electron').remote
|
||||
|
||||
const ipcMain = remote.require('electron').ipcMain;
|
||||
const BrowserWindow = remote.require('electron').BrowserWindow;
|
||||
const ipcMain = remote.require('electron').ipcMain
|
||||
const BrowserWindow = remote.require('electron').BrowserWindow
|
||||
|
||||
const comparePaths = function (path1, path2) {
|
||||
if (process.platform === 'win32') {
|
||||
path1 = path1.toLowerCase();
|
||||
path2 = path2.toLowerCase();
|
||||
path1 = path1.toLowerCase()
|
||||
path2 = path2.toLowerCase()
|
||||
}
|
||||
assert.equal(path1, path2)
|
||||
}
|
||||
assert.equal(path1, path2);
|
||||
};
|
||||
|
||||
describe('ipc module', function () {
|
||||
var fixtures = path.join(__dirname, 'fixtures');
|
||||
var fixtures = path.join(__dirname, 'fixtures')
|
||||
|
||||
describe('remote.require', function () {
|
||||
it('should returns same object for the same module', function () {
|
||||
var dialog1 = remote.require('electron');
|
||||
var dialog2 = remote.require('electron');
|
||||
assert.equal(dialog1, dialog2);
|
||||
});
|
||||
var dialog1 = remote.require('electron')
|
||||
var dialog2 = remote.require('electron')
|
||||
assert.equal(dialog1, dialog2)
|
||||
})
|
||||
|
||||
it('should work when object contains id property', function () {
|
||||
var a = remote.require(path.join(fixtures, 'module', 'id.js'));
|
||||
assert.equal(a.id, 1127);
|
||||
});
|
||||
var a = remote.require(path.join(fixtures, 'module', 'id.js'))
|
||||
assert.equal(a.id, 1127)
|
||||
})
|
||||
|
||||
it('should search module from the user app', function () {
|
||||
comparePaths(path.normalize(remote.process.mainModule.filename), path.resolve(__dirname, 'static', 'main.js'));
|
||||
comparePaths(path.normalize(remote.process.mainModule.paths[0]), path.resolve(__dirname, 'static', 'node_modules'));
|
||||
});
|
||||
});
|
||||
comparePaths(path.normalize(remote.process.mainModule.filename), path.resolve(__dirname, 'static', 'main.js'))
|
||||
comparePaths(path.normalize(remote.process.mainModule.paths[0]), path.resolve(__dirname, 'static', 'node_modules'))
|
||||
})
|
||||
})
|
||||
|
||||
describe('remote.createFunctionWithReturnValue', function () {
|
||||
it('should be called in browser synchronously', function () {
|
||||
var buf = new Buffer('test');
|
||||
var call = remote.require(path.join(fixtures, 'module', 'call.js'));
|
||||
var result = call.call(remote.createFunctionWithReturnValue(buf));
|
||||
assert.equal(result.constructor.name, 'Buffer');
|
||||
});
|
||||
});
|
||||
var buf = new Buffer('test')
|
||||
var call = remote.require(path.join(fixtures, 'module', 'call.js'))
|
||||
var result = call.call(remote.createFunctionWithReturnValue(buf))
|
||||
assert.equal(result.constructor.name, 'Buffer')
|
||||
})
|
||||
})
|
||||
|
||||
describe('remote object in renderer', function () {
|
||||
it('can change its properties', function () {
|
||||
var property = remote.require(path.join(fixtures, 'module', 'property.js'));
|
||||
assert.equal(property.property, 1127);
|
||||
property.property = 1007;
|
||||
assert.equal(property.property, 1007);
|
||||
var property2 = remote.require(path.join(fixtures, 'module', 'property.js'));
|
||||
assert.equal(property2.property, 1007);
|
||||
property.property = 1127;
|
||||
});
|
||||
var property = remote.require(path.join(fixtures, 'module', 'property.js'))
|
||||
assert.equal(property.property, 1127)
|
||||
property.property = 1007
|
||||
assert.equal(property.property, 1007)
|
||||
var property2 = remote.require(path.join(fixtures, 'module', 'property.js'))
|
||||
assert.equal(property2.property, 1007)
|
||||
property.property = 1127
|
||||
})
|
||||
|
||||
it('can construct an object from its member', function () {
|
||||
var call = remote.require(path.join(fixtures, 'module', 'call.js'));
|
||||
var obj = new call.constructor;
|
||||
assert.equal(obj.test, 'test');
|
||||
});
|
||||
var call = remote.require(path.join(fixtures, 'module', 'call.js'))
|
||||
var obj = new call.constructor()
|
||||
assert.equal(obj.test, 'test')
|
||||
})
|
||||
|
||||
it('can reassign and delete its member functions', function () {
|
||||
var remoteFunctions = remote.require(path.join(fixtures, 'module', 'function.js'));
|
||||
assert.equal(remoteFunctions.aFunction(), 1127);
|
||||
var remoteFunctions = remote.require(path.join(fixtures, 'module', 'function.js'))
|
||||
assert.equal(remoteFunctions.aFunction(), 1127)
|
||||
|
||||
remoteFunctions.aFunction = function () { return 1234; };
|
||||
assert.equal(remoteFunctions.aFunction(), 1234);
|
||||
remoteFunctions.aFunction = function () { return 1234 }
|
||||
assert.equal(remoteFunctions.aFunction(), 1234)
|
||||
|
||||
assert.equal(delete remoteFunctions.aFunction, true);
|
||||
});
|
||||
});
|
||||
assert.equal(delete remoteFunctions.aFunction, true)
|
||||
})
|
||||
})
|
||||
|
||||
describe('remote value in browser', function () {
|
||||
var print = path.join(fixtures, 'module', 'print_name.js');
|
||||
var print = path.join(fixtures, 'module', 'print_name.js')
|
||||
|
||||
it('keeps its constructor name for objects', function () {
|
||||
var buf = new Buffer('test');
|
||||
var print_name = remote.require(print);
|
||||
assert.equal(print_name.print(buf), 'Buffer');
|
||||
});
|
||||
var buf = new Buffer('test')
|
||||
var print_name = remote.require(print)
|
||||
assert.equal(print_name.print(buf), 'Buffer')
|
||||
})
|
||||
|
||||
it('supports instanceof Date', function () {
|
||||
var now = new Date();
|
||||
var print_name = remote.require(print);
|
||||
assert.equal(print_name.print(now), 'Date');
|
||||
assert.deepEqual(print_name.echo(now), now);
|
||||
});
|
||||
});
|
||||
var now = new Date()
|
||||
var print_name = remote.require(print)
|
||||
assert.equal(print_name.print(now), 'Date')
|
||||
assert.deepEqual(print_name.echo(now), now)
|
||||
})
|
||||
})
|
||||
|
||||
describe('remote promise', function () {
|
||||
it('can be used as promise in each side', function (done) {
|
||||
var promise = remote.require(path.join(fixtures, 'module', 'promise.js'));
|
||||
var promise = remote.require(path.join(fixtures, 'module', 'promise.js'))
|
||||
promise.twicePromise(Promise.resolve(1234)).then(function (value) {
|
||||
assert.equal(value, 2468);
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
assert.equal(value, 2468)
|
||||
done()
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('remote webContents', function () {
|
||||
it('can return same object with different getters', function () {
|
||||
var contents1 = remote.getCurrentWindow().webContents;
|
||||
var contents2 = remote.getCurrentWebContents();
|
||||
assert(contents1 == contents2);
|
||||
});
|
||||
});
|
||||
var contents1 = remote.getCurrentWindow().webContents
|
||||
var contents2 = remote.getCurrentWebContents()
|
||||
assert(contents1 === contents2)
|
||||
})
|
||||
})
|
||||
|
||||
describe('remote class', function () {
|
||||
let cl = remote.require(path.join(fixtures, 'module', 'class.js'));
|
||||
let base = cl.base;
|
||||
let derived = cl.derived;
|
||||
let cl = remote.require(path.join(fixtures, 'module', 'class.js'))
|
||||
let base = cl.base
|
||||
let derived = cl.derived
|
||||
|
||||
it('can get methods', function () {
|
||||
assert.equal(base.method(), 'method');
|
||||
});
|
||||
assert.equal(base.method(), 'method')
|
||||
})
|
||||
|
||||
it('can get properties', function () {
|
||||
assert.equal(base.readonly, 'readonly');
|
||||
});
|
||||
assert.equal(base.readonly, 'readonly')
|
||||
})
|
||||
|
||||
it('can change properties', function () {
|
||||
assert.equal(base.value, 'old');
|
||||
base.value = 'new';
|
||||
assert.equal(base.value, 'new');
|
||||
base.value = 'old';
|
||||
});
|
||||
assert.equal(base.value, 'old')
|
||||
base.value = 'new'
|
||||
assert.equal(base.value, 'new')
|
||||
base.value = 'old'
|
||||
})
|
||||
|
||||
it('has unenumerable methods', function () {
|
||||
assert(!base.hasOwnProperty('method'));
|
||||
assert(Object.getPrototypeOf(base).hasOwnProperty('method'));
|
||||
});
|
||||
assert(!base.hasOwnProperty('method'))
|
||||
assert(Object.getPrototypeOf(base).hasOwnProperty('method'))
|
||||
})
|
||||
|
||||
it('keeps prototype chain in derived class', function () {
|
||||
assert.equal(derived.method(), 'method');
|
||||
assert.equal(derived.readonly, 'readonly');
|
||||
assert(!derived.hasOwnProperty('method'));
|
||||
let proto = Object.getPrototypeOf(derived);
|
||||
assert(!proto.hasOwnProperty('method'));
|
||||
assert(Object.getPrototypeOf(proto).hasOwnProperty('method'));
|
||||
});
|
||||
});
|
||||
assert.equal(derived.method(), 'method')
|
||||
assert.equal(derived.readonly, 'readonly')
|
||||
assert(!derived.hasOwnProperty('method'))
|
||||
let proto = Object.getPrototypeOf(derived)
|
||||
assert(!proto.hasOwnProperty('method'))
|
||||
assert(Object.getPrototypeOf(proto).hasOwnProperty('method'))
|
||||
})
|
||||
})
|
||||
|
||||
describe('ipc.sender.send', function () {
|
||||
it('should work when sending an object containing id property', function (done) {
|
||||
var obj = {
|
||||
id: 1,
|
||||
name: 'ly'
|
||||
};
|
||||
}
|
||||
ipcRenderer.once('message', function (event, message) {
|
||||
assert.deepEqual(message, obj);
|
||||
done();
|
||||
});
|
||||
ipcRenderer.send('message', obj);
|
||||
});
|
||||
assert.deepEqual(message, obj)
|
||||
done()
|
||||
})
|
||||
ipcRenderer.send('message', obj)
|
||||
})
|
||||
|
||||
it('can send instance of Date', function (done) {
|
||||
const currentDate = new Date();
|
||||
const currentDate = new Date()
|
||||
ipcRenderer.once('message', function (event, value) {
|
||||
assert.equal(value, currentDate.toISOString());
|
||||
done();
|
||||
});
|
||||
ipcRenderer.send('message', currentDate);
|
||||
});
|
||||
});
|
||||
assert.equal(value, currentDate.toISOString())
|
||||
done()
|
||||
})
|
||||
ipcRenderer.send('message', currentDate)
|
||||
})
|
||||
})
|
||||
|
||||
describe('ipc.sendSync', function () {
|
||||
it('can be replied by setting event.returnValue', function () {
|
||||
var msg = ipcRenderer.sendSync('echo', 'test');
|
||||
assert.equal(msg, 'test');
|
||||
});
|
||||
var msg = ipcRenderer.sendSync('echo', 'test')
|
||||
assert.equal(msg, 'test')
|
||||
})
|
||||
|
||||
it('does not crash when reply is not sent and browser is destroyed', function (done) {
|
||||
this.timeout(10000);
|
||||
this.timeout(10000)
|
||||
|
||||
var w = new BrowserWindow({
|
||||
show: false
|
||||
});
|
||||
})
|
||||
ipcMain.once('send-sync-message', function (event) {
|
||||
event.returnValue = null;
|
||||
w.destroy();
|
||||
done();
|
||||
});
|
||||
w.loadURL('file://' + path.join(fixtures, 'api', 'send-sync-message.html'));
|
||||
});
|
||||
});
|
||||
event.returnValue = null
|
||||
w.destroy()
|
||||
done()
|
||||
})
|
||||
w.loadURL('file://' + path.join(fixtures, 'api', 'send-sync-message.html'))
|
||||
})
|
||||
})
|
||||
|
||||
describe('remote listeners', function () {
|
||||
var w = null;
|
||||
var w = null
|
||||
|
||||
afterEach(function () {
|
||||
w.destroy();
|
||||
});
|
||||
w.destroy()
|
||||
})
|
||||
|
||||
it('can be added and removed correctly', function () {
|
||||
w = new BrowserWindow({
|
||||
show: false
|
||||
});
|
||||
var listener = function() {};
|
||||
w.on('test', listener);
|
||||
assert.equal(w.listenerCount('test'), 1);
|
||||
w.removeListener('test', listener);
|
||||
assert.equal(w.listenerCount('test'), 0);
|
||||
});
|
||||
});
|
||||
});
|
||||
})
|
||||
var listener = function () {}
|
||||
w.on('test', listener)
|
||||
assert.equal(w.listenerCount('test'), 1)
|
||||
w.removeListener('test', listener)
|
||||
assert.equal(w.listenerCount('test'), 0)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
const assert = require('assert');
|
||||
const assert = require('assert')
|
||||
|
||||
const remote = require('electron').remote;
|
||||
const ipcRenderer = require('electron').ipcRenderer;
|
||||
const remote = require('electron').remote
|
||||
const ipcRenderer = require('electron').ipcRenderer
|
||||
|
||||
const Menu = remote.require('electron').Menu;
|
||||
const MenuItem = remote.require('electron').MenuItem;
|
||||
const Menu = remote.require('electron').Menu
|
||||
const MenuItem = remote.require('electron').MenuItem
|
||||
|
||||
describe('menu module', function () {
|
||||
describe('Menu.buildFromTemplate', function () {
|
||||
|
@ -14,12 +14,12 @@ describe('menu module', function() {
|
|||
label: 'text',
|
||||
extra: 'field'
|
||||
}
|
||||
]);
|
||||
assert.equal(menu.items[0].extra, 'field');
|
||||
});
|
||||
])
|
||||
assert.equal(menu.items[0].extra, 'field')
|
||||
})
|
||||
|
||||
it('does not modify the specified template', function () {
|
||||
var template = ipcRenderer.sendSync('eval', "var template = [{label: 'text', submenu: [{label: 'sub'}]}];\nrequire('electron').Menu.buildFromTemplate(template);\ntemplate;");
|
||||
var template = ipcRenderer.sendSync('eval', "var template = [{label: 'text', submenu: [{label: 'sub'}]}];\nrequire('electron').Menu.buildFromTemplate(template);\ntemplate;")
|
||||
assert.deepStrictEqual(template, [
|
||||
{
|
||||
label: 'text',
|
||||
|
@ -29,8 +29,8 @@ describe('menu module', function() {
|
|||
}
|
||||
]
|
||||
}
|
||||
]);
|
||||
});
|
||||
])
|
||||
})
|
||||
|
||||
it('does not throw exceptions for undefined/null values', function () {
|
||||
assert.doesNotThrow(function () {
|
||||
|
@ -43,9 +43,9 @@ describe('menu module', function() {
|
|||
label: 'text again',
|
||||
accelerator: null
|
||||
}
|
||||
]);
|
||||
});
|
||||
});
|
||||
])
|
||||
})
|
||||
})
|
||||
|
||||
describe('Menu.buildFromTemplate should reorder based on item position specifiers', function () {
|
||||
it('should position before existing item', function () {
|
||||
|
@ -61,11 +61,11 @@ describe('menu module', function() {
|
|||
id: '1',
|
||||
position: 'before=2'
|
||||
}
|
||||
]);
|
||||
assert.equal(menu.items[0].label, '1');
|
||||
assert.equal(menu.items[1].label, '2');
|
||||
assert.equal(menu.items[2].label, '3');
|
||||
});
|
||||
])
|
||||
assert.equal(menu.items[0].label, '1')
|
||||
assert.equal(menu.items[1].label, '2')
|
||||
assert.equal(menu.items[2].label, '3')
|
||||
})
|
||||
|
||||
it('should position after existing item', function () {
|
||||
var menu = Menu.buildFromTemplate([
|
||||
|
@ -80,11 +80,11 @@ describe('menu module', function() {
|
|||
id: '2',
|
||||
position: 'after=1'
|
||||
}
|
||||
]);
|
||||
assert.equal(menu.items[0].label, '1');
|
||||
assert.equal(menu.items[1].label, '2');
|
||||
assert.equal(menu.items[2].label, '3');
|
||||
});
|
||||
])
|
||||
assert.equal(menu.items[0].label, '1')
|
||||
assert.equal(menu.items[1].label, '2')
|
||||
assert.equal(menu.items[2].label, '3')
|
||||
})
|
||||
|
||||
it('should position at endof existing separator groups', function () {
|
||||
var menu = Menu.buildFromTemplate([
|
||||
|
@ -119,16 +119,16 @@ describe('menu module', function() {
|
|||
id: '3',
|
||||
position: 'endof=numbers'
|
||||
}
|
||||
]);
|
||||
assert.equal(menu.items[0].id, 'numbers');
|
||||
assert.equal(menu.items[1].label, '1');
|
||||
assert.equal(menu.items[2].label, '2');
|
||||
assert.equal(menu.items[3].label, '3');
|
||||
assert.equal(menu.items[4].id, 'letters');
|
||||
assert.equal(menu.items[5].label, 'a');
|
||||
assert.equal(menu.items[6].label, 'b');
|
||||
assert.equal(menu.items[7].label, 'c');
|
||||
});
|
||||
])
|
||||
assert.equal(menu.items[0].id, 'numbers')
|
||||
assert.equal(menu.items[1].label, '1')
|
||||
assert.equal(menu.items[2].label, '2')
|
||||
assert.equal(menu.items[3].label, '3')
|
||||
assert.equal(menu.items[4].id, 'letters')
|
||||
assert.equal(menu.items[5].label, 'a')
|
||||
assert.equal(menu.items[6].label, 'b')
|
||||
assert.equal(menu.items[7].label, 'c')
|
||||
})
|
||||
|
||||
it('should create separator group if endof does not reference existing separator group', function () {
|
||||
var menu = Menu.buildFromTemplate([
|
||||
|
@ -157,16 +157,16 @@ describe('menu module', function() {
|
|||
id: '3',
|
||||
position: 'endof=numbers'
|
||||
}
|
||||
]);
|
||||
assert.equal(menu.items[0].id, 'letters');
|
||||
assert.equal(menu.items[1].label, 'a');
|
||||
assert.equal(menu.items[2].label, 'b');
|
||||
assert.equal(menu.items[3].label, 'c');
|
||||
assert.equal(menu.items[4].id, 'numbers');
|
||||
assert.equal(menu.items[5].label, '1');
|
||||
assert.equal(menu.items[6].label, '2');
|
||||
assert.equal(menu.items[7].label, '3');
|
||||
});
|
||||
])
|
||||
assert.equal(menu.items[0].id, 'letters')
|
||||
assert.equal(menu.items[1].label, 'a')
|
||||
assert.equal(menu.items[2].label, 'b')
|
||||
assert.equal(menu.items[3].label, 'c')
|
||||
assert.equal(menu.items[4].id, 'numbers')
|
||||
assert.equal(menu.items[5].label, '1')
|
||||
assert.equal(menu.items[6].label, '2')
|
||||
assert.equal(menu.items[7].label, '3')
|
||||
})
|
||||
|
||||
it('should continue inserting items at next index when no specifier is present', function () {
|
||||
var menu = Menu.buildFromTemplate([
|
||||
|
@ -187,15 +187,15 @@ describe('menu module', function() {
|
|||
label: '3',
|
||||
id: '3'
|
||||
}
|
||||
]);
|
||||
assert.equal(menu.items[0].label, '1');
|
||||
assert.equal(menu.items[1].label, '2');
|
||||
assert.equal(menu.items[2].label, '3');
|
||||
assert.equal(menu.items[3].label, '4');
|
||||
assert.equal(menu.items[4].label, '5');
|
||||
});
|
||||
});
|
||||
});
|
||||
])
|
||||
assert.equal(menu.items[0].label, '1')
|
||||
assert.equal(menu.items[1].label, '2')
|
||||
assert.equal(menu.items[2].label, '3')
|
||||
assert.equal(menu.items[3].label, '4')
|
||||
assert.equal(menu.items[4].label, '5')
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('Menu.insert', function () {
|
||||
it('should store item in @items by its index', function () {
|
||||
|
@ -207,17 +207,17 @@ describe('menu module', function() {
|
|||
}, {
|
||||
label: '3'
|
||||
}
|
||||
]);
|
||||
])
|
||||
var item = new MenuItem({
|
||||
label: 'inserted'
|
||||
});
|
||||
menu.insert(1, item);
|
||||
assert.equal(menu.items[0].label, '1');
|
||||
assert.equal(menu.items[1].label, 'inserted');
|
||||
assert.equal(menu.items[2].label, '2');
|
||||
assert.equal(menu.items[3].label, '3');
|
||||
});
|
||||
});
|
||||
})
|
||||
menu.insert(1, item)
|
||||
assert.equal(menu.items[0].label, '1')
|
||||
assert.equal(menu.items[1].label, 'inserted')
|
||||
assert.equal(menu.items[2].label, '2')
|
||||
assert.equal(menu.items[3].label, '3')
|
||||
})
|
||||
})
|
||||
|
||||
describe('MenuItem.click', function () {
|
||||
it('should be called with the item object passed', function (done) {
|
||||
|
@ -225,15 +225,15 @@ describe('menu module', function() {
|
|||
{
|
||||
label: 'text',
|
||||
click: function (item) {
|
||||
assert.equal(item.constructor.name, 'MenuItem');
|
||||
assert.equal(item.label, 'text');
|
||||
done();
|
||||
assert.equal(item.constructor.name, 'MenuItem')
|
||||
assert.equal(item.label, 'text')
|
||||
done()
|
||||
}
|
||||
}
|
||||
]);
|
||||
menu.delegate.executeCommand(menu.items[0].commandId);
|
||||
});
|
||||
});
|
||||
])
|
||||
menu.delegate.executeCommand(menu.items[0].commandId)
|
||||
})
|
||||
})
|
||||
|
||||
describe('MenuItem with checked property', function () {
|
||||
it('clicking an checkbox item should flip the checked property', function () {
|
||||
|
@ -242,11 +242,11 @@ describe('menu module', function() {
|
|||
label: 'text',
|
||||
type: 'checkbox'
|
||||
}
|
||||
]);
|
||||
assert.equal(menu.items[0].checked, false);
|
||||
menu.delegate.executeCommand(menu.items[0].commandId);
|
||||
assert.equal(menu.items[0].checked, true);
|
||||
});
|
||||
])
|
||||
assert.equal(menu.items[0].checked, false)
|
||||
menu.delegate.executeCommand(menu.items[0].commandId)
|
||||
assert.equal(menu.items[0].checked, true)
|
||||
})
|
||||
|
||||
it('clicking an radio item should always make checked property true', function () {
|
||||
var menu = Menu.buildFromTemplate([
|
||||
|
@ -254,109 +254,109 @@ describe('menu module', function() {
|
|||
label: 'text',
|
||||
type: 'radio'
|
||||
}
|
||||
]);
|
||||
menu.delegate.executeCommand(menu.items[0].commandId);
|
||||
assert.equal(menu.items[0].checked, true);
|
||||
menu.delegate.executeCommand(menu.items[0].commandId);
|
||||
assert.equal(menu.items[0].checked, true);
|
||||
});
|
||||
])
|
||||
menu.delegate.executeCommand(menu.items[0].commandId)
|
||||
assert.equal(menu.items[0].checked, true)
|
||||
menu.delegate.executeCommand(menu.items[0].commandId)
|
||||
assert.equal(menu.items[0].checked, true)
|
||||
})
|
||||
|
||||
it('at least have one item checked in each group', function () {
|
||||
var i, j, k, menu, template;
|
||||
template = [];
|
||||
var i, j, k, menu, template
|
||||
template = []
|
||||
for (i = j = 0; j <= 10; i = ++j) {
|
||||
template.push({
|
||||
label: "" + i,
|
||||
label: '' + i,
|
||||
type: 'radio'
|
||||
});
|
||||
})
|
||||
}
|
||||
template.push({
|
||||
type: 'separator'
|
||||
});
|
||||
})
|
||||
for (i = k = 12; k <= 20; i = ++k) {
|
||||
template.push({
|
||||
label: "" + i,
|
||||
label: '' + i,
|
||||
type: 'radio'
|
||||
});
|
||||
})
|
||||
}
|
||||
menu = Menu.buildFromTemplate(template);
|
||||
menu.delegate.menuWillShow();
|
||||
assert.equal(menu.items[0].checked, true);
|
||||
assert.equal(menu.items[12].checked, true);
|
||||
});
|
||||
menu = Menu.buildFromTemplate(template)
|
||||
menu.delegate.menuWillShow()
|
||||
assert.equal(menu.items[0].checked, true)
|
||||
assert.equal(menu.items[12].checked, true)
|
||||
})
|
||||
|
||||
it('should assign groupId automatically', function () {
|
||||
var groupId, i, j, k, l, m, menu, template;
|
||||
template = [];
|
||||
var groupId, i, j, k, l, m, menu, template
|
||||
template = []
|
||||
for (i = j = 0; j <= 10; i = ++j) {
|
||||
template.push({
|
||||
label: "" + i,
|
||||
label: '' + i,
|
||||
type: 'radio'
|
||||
});
|
||||
})
|
||||
}
|
||||
template.push({
|
||||
type: 'separator'
|
||||
});
|
||||
})
|
||||
for (i = k = 12; k <= 20; i = ++k) {
|
||||
template.push({
|
||||
label: "" + i,
|
||||
label: '' + i,
|
||||
type: 'radio'
|
||||
});
|
||||
})
|
||||
}
|
||||
menu = Menu.buildFromTemplate(template);
|
||||
groupId = menu.items[0].groupId;
|
||||
menu = Menu.buildFromTemplate(template)
|
||||
groupId = menu.items[0].groupId
|
||||
for (i = l = 0; l <= 10; i = ++l) {
|
||||
assert.equal(menu.items[i].groupId, groupId);
|
||||
assert.equal(menu.items[i].groupId, groupId)
|
||||
}
|
||||
for (i = m = 12; m <= 20; i = ++m) {
|
||||
assert.equal(menu.items[i].groupId, groupId + 1);
|
||||
assert.equal(menu.items[i].groupId, groupId + 1)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
it("setting 'checked' should flip other items' 'checked' property", function () {
|
||||
var i, j, k, l, m, menu, n, o, p, q, template;
|
||||
template = [];
|
||||
var i, j, k, l, m, menu, n, o, p, q, template
|
||||
template = []
|
||||
for (i = j = 0; j <= 10; i = ++j) {
|
||||
template.push({
|
||||
label: "" + i,
|
||||
label: '' + i,
|
||||
type: 'radio'
|
||||
});
|
||||
})
|
||||
}
|
||||
template.push({
|
||||
type: 'separator'
|
||||
});
|
||||
})
|
||||
for (i = k = 12; k <= 20; i = ++k) {
|
||||
template.push({
|
||||
label: "" + i,
|
||||
label: '' + i,
|
||||
type: 'radio'
|
||||
});
|
||||
})
|
||||
}
|
||||
menu = Menu.buildFromTemplate(template);
|
||||
menu = Menu.buildFromTemplate(template)
|
||||
for (i = l = 0; l <= 10; i = ++l) {
|
||||
assert.equal(menu.items[i].checked, false);
|
||||
assert.equal(menu.items[i].checked, false)
|
||||
}
|
||||
menu.items[0].checked = true;
|
||||
assert.equal(menu.items[0].checked, true);
|
||||
menu.items[0].checked = true
|
||||
assert.equal(menu.items[0].checked, true)
|
||||
for (i = m = 1; m <= 10; i = ++m) {
|
||||
assert.equal(menu.items[i].checked, false);
|
||||
assert.equal(menu.items[i].checked, false)
|
||||
}
|
||||
menu.items[10].checked = true;
|
||||
assert.equal(menu.items[10].checked, true);
|
||||
menu.items[10].checked = true
|
||||
assert.equal(menu.items[10].checked, true)
|
||||
for (i = n = 0; n <= 9; i = ++n) {
|
||||
assert.equal(menu.items[i].checked, false);
|
||||
assert.equal(menu.items[i].checked, false)
|
||||
}
|
||||
for (i = o = 12; o <= 20; i = ++o) {
|
||||
assert.equal(menu.items[i].checked, false);
|
||||
assert.equal(menu.items[i].checked, false)
|
||||
}
|
||||
menu.items[12].checked = true;
|
||||
assert.equal(menu.items[10].checked, true);
|
||||
menu.items[12].checked = true
|
||||
assert.equal(menu.items[10].checked, true)
|
||||
for (i = p = 0; p <= 9; i = ++p) {
|
||||
assert.equal(menu.items[i].checked, false);
|
||||
assert.equal(menu.items[i].checked, false)
|
||||
}
|
||||
assert.equal(menu.items[12].checked, true);
|
||||
assert.equal(menu.items[12].checked, true)
|
||||
for (i = q = 13; q <= 20; i = ++q) {
|
||||
assert.equal(menu.items[i].checked, false);
|
||||
assert.equal(menu.items[i].checked, false)
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
|
@ -1,51 +1,51 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const assert = require('assert');
|
||||
const nativeImage = require('electron').nativeImage;
|
||||
const path = require('path');
|
||||
const assert = require('assert')
|
||||
const nativeImage = require('electron').nativeImage
|
||||
const path = require('path')
|
||||
|
||||
describe('nativeImage module', () => {
|
||||
describe('createFromPath(path)', () => {
|
||||
it('returns an empty image for invalid paths', () => {
|
||||
assert(nativeImage.createFromPath('').isEmpty());
|
||||
assert(nativeImage.createFromPath('does-not-exist.png').isEmpty());
|
||||
});
|
||||
assert(nativeImage.createFromPath('').isEmpty())
|
||||
assert(nativeImage.createFromPath('does-not-exist.png').isEmpty())
|
||||
})
|
||||
|
||||
it('loads images from paths relative to the current working directory', () => {
|
||||
const imagePath = `.${path.sep}${path.join('spec', 'fixtures', 'assets', 'logo.png')}`;
|
||||
const image = nativeImage.createFromPath(imagePath);
|
||||
assert(!image.isEmpty());
|
||||
assert.equal(image.getSize().height, 190);
|
||||
assert.equal(image.getSize().width, 538);
|
||||
});
|
||||
const imagePath = `.${path.sep}${path.join('spec', 'fixtures', 'assets', 'logo.png')}`
|
||||
const image = nativeImage.createFromPath(imagePath)
|
||||
assert(!image.isEmpty())
|
||||
assert.equal(image.getSize().height, 190)
|
||||
assert.equal(image.getSize().width, 538)
|
||||
})
|
||||
|
||||
it('loads images from paths with `.` segments', () => {
|
||||
const imagePath = `${path.join(__dirname, 'fixtures')}${path.sep}.${path.sep}${path.join('assets', 'logo.png')}`;
|
||||
const image = nativeImage.createFromPath(imagePath);
|
||||
assert(!image.isEmpty());
|
||||
assert.equal(image.getSize().height, 190);
|
||||
assert.equal(image.getSize().width, 538);
|
||||
});
|
||||
const imagePath = `${path.join(__dirname, 'fixtures')}${path.sep}.${path.sep}${path.join('assets', 'logo.png')}`
|
||||
const image = nativeImage.createFromPath(imagePath)
|
||||
assert(!image.isEmpty())
|
||||
assert.equal(image.getSize().height, 190)
|
||||
assert.equal(image.getSize().width, 538)
|
||||
})
|
||||
|
||||
it('loads images from paths with `..` segments', () => {
|
||||
const imagePath = `${path.join(__dirname, 'fixtures', 'api')}${path.sep}..${path.sep}${path.join('assets', 'logo.png')}`;
|
||||
const image = nativeImage.createFromPath(imagePath);
|
||||
assert(!image.isEmpty());
|
||||
assert.equal(image.getSize().height, 190);
|
||||
assert.equal(image.getSize().width, 538);
|
||||
});
|
||||
const imagePath = `${path.join(__dirname, 'fixtures', 'api')}${path.sep}..${path.sep}${path.join('assets', 'logo.png')}`
|
||||
const image = nativeImage.createFromPath(imagePath)
|
||||
assert(!image.isEmpty())
|
||||
assert.equal(image.getSize().height, 190)
|
||||
assert.equal(image.getSize().width, 538)
|
||||
})
|
||||
|
||||
it('Gets an NSImage pointer on OS X', () => {
|
||||
if (process.platform !== 'darwin') return;
|
||||
if (process.platform !== 'darwin') return
|
||||
|
||||
const imagePath = `${path.join(__dirname, 'fixtures', 'api')}${path.sep}..${path.sep}${path.join('assets', 'logo.png')}`;
|
||||
const image = nativeImage.createFromPath(imagePath);
|
||||
const nsimage = image.getNativeHandle();
|
||||
const imagePath = `${path.join(__dirname, 'fixtures', 'api')}${path.sep}..${path.sep}${path.join('assets', 'logo.png')}`
|
||||
const image = nativeImage.createFromPath(imagePath)
|
||||
const nsimage = image.getNativeHandle()
|
||||
|
||||
assert.equal(nsimage.length, 8);
|
||||
assert.equal(nsimage.length, 8)
|
||||
|
||||
// If all bytes are null, that's Bad
|
||||
assert.equal(nsimage.reduce((acc,x) => acc || (x != 0), false), true);
|
||||
});
|
||||
});
|
||||
});
|
||||
assert.equal(nsimage.reduce((acc, x) => acc || (x !== 0), false), true)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,21 +1,21 @@
|
|||
const assert = require('assert');
|
||||
const screen = require('electron').screen;
|
||||
const assert = require('assert')
|
||||
const screen = require('electron').screen
|
||||
|
||||
describe('screen module', function () {
|
||||
describe('screen.getCursorScreenPoint()', function () {
|
||||
it('returns a point object', function () {
|
||||
var point = screen.getCursorScreenPoint();
|
||||
assert.equal(typeof point.x, 'number');
|
||||
assert.equal(typeof point.y, 'number');
|
||||
});
|
||||
});
|
||||
var point = screen.getCursorScreenPoint()
|
||||
assert.equal(typeof point.x, 'number')
|
||||
assert.equal(typeof point.y, 'number')
|
||||
})
|
||||
})
|
||||
|
||||
describe('screen.getPrimaryDisplay()', function () {
|
||||
it('returns a display object', function () {
|
||||
var display = screen.getPrimaryDisplay();
|
||||
assert.equal(typeof display.scaleFactor, 'number');
|
||||
assert(display.size.width > 0);
|
||||
assert(display.size.height > 0);
|
||||
});
|
||||
});
|
||||
});
|
||||
var display = screen.getPrimaryDisplay()
|
||||
assert.equal(typeof display.scaleFactor, 'number')
|
||||
assert(display.size.width > 0)
|
||||
assert(display.size.height > 0)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
|
@ -1,67 +1,67 @@
|
|||
const assert = require('assert');
|
||||
const http = require('http');
|
||||
const path = require('path');
|
||||
const fs = require('fs');
|
||||
const assert = require('assert')
|
||||
const http = require('http')
|
||||
const path = require('path')
|
||||
const fs = require('fs')
|
||||
|
||||
const ipcRenderer = require('electron').ipcRenderer;
|
||||
const remote = require('electron').remote;
|
||||
const ipcRenderer = require('electron').ipcRenderer
|
||||
const remote = require('electron').remote
|
||||
|
||||
const ipcMain = remote.ipcMain;
|
||||
const session = remote.session;
|
||||
const BrowserWindow = remote.BrowserWindow;
|
||||
const ipcMain = remote.ipcMain
|
||||
const session = remote.session
|
||||
const BrowserWindow = remote.BrowserWindow
|
||||
|
||||
describe('session module', function () {
|
||||
this.timeout(10000);
|
||||
this.timeout(10000)
|
||||
|
||||
var fixtures = path.resolve(__dirname, 'fixtures');
|
||||
var w = null;
|
||||
var url = "http://127.0.0.1";
|
||||
var fixtures = path.resolve(__dirname, 'fixtures')
|
||||
var w = null
|
||||
var url = 'http://127.0.0.1'
|
||||
|
||||
beforeEach(function () {
|
||||
w = new BrowserWindow({
|
||||
show: false,
|
||||
width: 400,
|
||||
height: 400
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
|
||||
afterEach(function () {
|
||||
w.destroy();
|
||||
});
|
||||
w.destroy()
|
||||
})
|
||||
|
||||
describe('session.cookies', function () {
|
||||
it('should get cookies', function (done) {
|
||||
var server = http.createServer(function (req, res) {
|
||||
res.setHeader('Set-Cookie', ['0=0']);
|
||||
res.end('finished');
|
||||
server.close();
|
||||
});
|
||||
res.setHeader('Set-Cookie', ['0=0'])
|
||||
res.end('finished')
|
||||
server.close()
|
||||
})
|
||||
server.listen(0, '127.0.0.1', function () {
|
||||
var port = server.address().port;
|
||||
w.loadURL(url + ":" + port);
|
||||
var port = server.address().port
|
||||
w.loadURL(url + ':' + port)
|
||||
w.webContents.on('did-finish-load', function () {
|
||||
w.webContents.session.cookies.get({
|
||||
url: url
|
||||
}, function (error, list) {
|
||||
var cookie, i, len;
|
||||
var cookie, i, len
|
||||
if (error) {
|
||||
return done(error);
|
||||
return done(error)
|
||||
}
|
||||
for (i = 0, len = list.length; i < len; i++) {
|
||||
cookie = list[i];
|
||||
cookie = list[i]
|
||||
if (cookie.name === '0') {
|
||||
if (cookie.value === '0') {
|
||||
return done();
|
||||
return done()
|
||||
} else {
|
||||
return done("cookie value is " + cookie.value + " while expecting 0");
|
||||
return done('cookie value is ' + cookie.value + ' while expecting 0')
|
||||
}
|
||||
}
|
||||
}
|
||||
done('Can not find cookie');
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
done('Can not find cookie')
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
it('should over-write the existent cookie', function (done) {
|
||||
session.defaultSession.cookies.set({
|
||||
|
@ -70,29 +70,29 @@ describe('session module', function() {
|
|||
value: '1'
|
||||
}, function (error) {
|
||||
if (error) {
|
||||
return done(error);
|
||||
return done(error)
|
||||
}
|
||||
session.defaultSession.cookies.get({
|
||||
url: url
|
||||
}, function (error, list) {
|
||||
var cookie, i, len;
|
||||
var cookie, i, len
|
||||
if (error) {
|
||||
return done(error);
|
||||
return done(error)
|
||||
}
|
||||
for (i = 0, len = list.length; i < len; i++) {
|
||||
cookie = list[i];
|
||||
cookie = list[i]
|
||||
if (cookie.name === '1') {
|
||||
if (cookie.value === '1') {
|
||||
return done();
|
||||
return done()
|
||||
} else {
|
||||
return done("cookie value is " + cookie.value + " while expecting 1");
|
||||
return done('cookie value is ' + cookie.value + ' while expecting 1')
|
||||
}
|
||||
}
|
||||
}
|
||||
done('Can not find cookie');
|
||||
});
|
||||
});
|
||||
});
|
||||
done('Can not find cookie')
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
it('should remove cookies', function (done) {
|
||||
session.defaultSession.cookies.set({
|
||||
|
@ -101,165 +101,165 @@ describe('session module', function() {
|
|||
value: '2'
|
||||
}, function (error) {
|
||||
if (error) {
|
||||
return done(error);
|
||||
return done(error)
|
||||
}
|
||||
session.defaultSession.cookies.remove(url, '2', function () {
|
||||
session.defaultSession.cookies.get({
|
||||
url: url
|
||||
}, function (error, list) {
|
||||
var cookie, i, len;
|
||||
var cookie, i, len
|
||||
if (error) {
|
||||
return done(error);
|
||||
return done(error)
|
||||
}
|
||||
for (i = 0, len = list.length; i < len; i++) {
|
||||
cookie = list[i];
|
||||
cookie = list[i]
|
||||
if (cookie.name === '2') {
|
||||
return done('Cookie not deleted');
|
||||
return done('Cookie not deleted')
|
||||
}
|
||||
}
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
done()
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('session.clearStorageData(options)', function () {
|
||||
fixtures = path.resolve(__dirname, 'fixtures');
|
||||
fixtures = path.resolve(__dirname, 'fixtures')
|
||||
it('clears localstorage data', function (done) {
|
||||
ipcMain.on('count', function (event, count) {
|
||||
ipcMain.removeAllListeners('count');
|
||||
assert(!count);
|
||||
done();
|
||||
});
|
||||
w.loadURL('file://' + path.join(fixtures, 'api', 'localstorage.html'));
|
||||
ipcMain.removeAllListeners('count')
|
||||
assert(!count)
|
||||
done()
|
||||
})
|
||||
w.loadURL('file://' + path.join(fixtures, 'api', 'localstorage.html'))
|
||||
w.webContents.on('did-finish-load', function () {
|
||||
var options = {
|
||||
origin: "file://",
|
||||
origin: 'file://',
|
||||
storages: ['localstorage'],
|
||||
quotas: ['persistent']
|
||||
};
|
||||
}
|
||||
w.webContents.session.clearStorageData(options, function () {
|
||||
w.webContents.send('getcount');
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
w.webContents.send('getcount')
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('session will-download event', function () {
|
||||
var w = null;
|
||||
var w = null
|
||||
|
||||
beforeEach(function () {
|
||||
w = new BrowserWindow({
|
||||
show: false,
|
||||
width: 400,
|
||||
height: 400
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
|
||||
afterEach(function () {
|
||||
w.destroy();
|
||||
});
|
||||
w.destroy()
|
||||
})
|
||||
|
||||
it('can cancel default download behavior', function (done) {
|
||||
const mockFile = new Buffer(1024);
|
||||
const contentDisposition = 'inline; filename="mockFile.txt"';
|
||||
const mockFile = new Buffer(1024)
|
||||
const contentDisposition = 'inline; filename="mockFile.txt"'
|
||||
const downloadServer = http.createServer(function (req, res) {
|
||||
res.writeHead(200, {
|
||||
'Content-Length': mockFile.length,
|
||||
'Content-Type': 'application/plain',
|
||||
'Content-Disposition': contentDisposition
|
||||
});
|
||||
res.end(mockFile);
|
||||
downloadServer.close();
|
||||
});
|
||||
})
|
||||
res.end(mockFile)
|
||||
downloadServer.close()
|
||||
})
|
||||
|
||||
downloadServer.listen(0, '127.0.0.1', function () {
|
||||
const port = downloadServer.address().port;
|
||||
const url = "http://127.0.0.1:" + port + '/';
|
||||
const port = downloadServer.address().port
|
||||
const url = 'http://127.0.0.1:' + port + '/'
|
||||
|
||||
ipcRenderer.sendSync('set-download-option', false, true);
|
||||
w.loadURL(url);
|
||||
ipcRenderer.sendSync('set-download-option', false, true)
|
||||
w.loadURL(url)
|
||||
ipcRenderer.once('download-error', function (event, downloadUrl, filename, error) {
|
||||
assert.equal(downloadUrl, url);
|
||||
assert.equal(filename, 'mockFile.txt');
|
||||
assert.equal(error, 'Object has been destroyed');
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
assert.equal(downloadUrl, url)
|
||||
assert.equal(filename, 'mockFile.txt')
|
||||
assert.equal(error, 'Object has been destroyed')
|
||||
done()
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('DownloadItem', function () {
|
||||
var mockPDF = new Buffer(1024 * 1024 * 5);
|
||||
var contentDisposition = 'inline; filename="mock.pdf"';
|
||||
var downloadFilePath = path.join(fixtures, 'mock.pdf');
|
||||
var mockPDF = new Buffer(1024 * 1024 * 5)
|
||||
var contentDisposition = 'inline; filename="mock.pdf"'
|
||||
var downloadFilePath = path.join(fixtures, 'mock.pdf')
|
||||
var downloadServer = http.createServer(function (req, res) {
|
||||
res.writeHead(200, {
|
||||
'Content-Length': mockPDF.length,
|
||||
'Content-Type': 'application/pdf',
|
||||
'Content-Disposition': contentDisposition
|
||||
});
|
||||
res.end(mockPDF);
|
||||
downloadServer.close();
|
||||
});
|
||||
})
|
||||
res.end(mockPDF)
|
||||
downloadServer.close()
|
||||
})
|
||||
var assertDownload = function (event, state, url, mimeType, receivedBytes, totalBytes, disposition, filename, port) {
|
||||
assert.equal(state, 'completed');
|
||||
assert.equal(filename, 'mock.pdf');
|
||||
assert.equal(url, "http://127.0.0.1:" + port + "/");
|
||||
assert.equal(mimeType, 'application/pdf');
|
||||
assert.equal(receivedBytes, mockPDF.length);
|
||||
assert.equal(totalBytes, mockPDF.length);
|
||||
assert.equal(disposition, contentDisposition);
|
||||
assert(fs.existsSync(downloadFilePath));
|
||||
fs.unlinkSync(downloadFilePath);
|
||||
};
|
||||
assert.equal(state, 'completed')
|
||||
assert.equal(filename, 'mock.pdf')
|
||||
assert.equal(url, 'http://127.0.0.1:' + port + '/')
|
||||
assert.equal(mimeType, 'application/pdf')
|
||||
assert.equal(receivedBytes, mockPDF.length)
|
||||
assert.equal(totalBytes, mockPDF.length)
|
||||
assert.equal(disposition, contentDisposition)
|
||||
assert(fs.existsSync(downloadFilePath))
|
||||
fs.unlinkSync(downloadFilePath)
|
||||
}
|
||||
|
||||
it('can download using BrowserWindow.loadURL', function (done) {
|
||||
downloadServer.listen(0, '127.0.0.1', function () {
|
||||
var port = downloadServer.address().port;
|
||||
ipcRenderer.sendSync('set-download-option', false, false);
|
||||
w.loadURL(url + ":" + port);
|
||||
var port = downloadServer.address().port
|
||||
ipcRenderer.sendSync('set-download-option', false, false)
|
||||
w.loadURL(url + ':' + port)
|
||||
ipcRenderer.once('download-done', function (event, state, url, mimeType, receivedBytes, totalBytes, disposition, filename) {
|
||||
assertDownload(event, state, url, mimeType, receivedBytes, totalBytes, disposition, filename, port);
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
assertDownload(event, state, url, mimeType, receivedBytes, totalBytes, disposition, filename, port)
|
||||
done()
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
it('can download using WebView.downloadURL', function (done) {
|
||||
downloadServer.listen(0, '127.0.0.1', function () {
|
||||
var port = downloadServer.address().port;
|
||||
ipcRenderer.sendSync('set-download-option', false, false);
|
||||
var webview = new WebView;
|
||||
webview.src = "file://" + fixtures + "/api/blank.html";
|
||||
var port = downloadServer.address().port
|
||||
ipcRenderer.sendSync('set-download-option', false, false)
|
||||
var webview = new WebView()
|
||||
webview.src = 'file://' + fixtures + '/api/blank.html'
|
||||
webview.addEventListener('did-finish-load', function () {
|
||||
webview.downloadURL(url + ":" + port + "/");
|
||||
});
|
||||
webview.downloadURL(url + ':' + port + '/')
|
||||
})
|
||||
ipcRenderer.once('download-done', function (event, state, url, mimeType, receivedBytes, totalBytes, disposition, filename) {
|
||||
assertDownload(event, state, url, mimeType, receivedBytes, totalBytes, disposition, filename, port);
|
||||
document.body.removeChild(webview);
|
||||
done();
|
||||
});
|
||||
document.body.appendChild(webview);
|
||||
});
|
||||
});
|
||||
assertDownload(event, state, url, mimeType, receivedBytes, totalBytes, disposition, filename, port)
|
||||
document.body.removeChild(webview)
|
||||
done()
|
||||
})
|
||||
document.body.appendChild(webview)
|
||||
})
|
||||
})
|
||||
|
||||
it('can cancel download', function (done) {
|
||||
downloadServer.listen(0, '127.0.0.1', function () {
|
||||
var port = downloadServer.address().port;
|
||||
ipcRenderer.sendSync('set-download-option', true, false);
|
||||
w.loadURL(url + ":" + port + "/");
|
||||
var port = downloadServer.address().port
|
||||
ipcRenderer.sendSync('set-download-option', true, false)
|
||||
w.loadURL(url + ':' + port + '/')
|
||||
ipcRenderer.once('download-done', function (event, state, url, mimeType, receivedBytes, totalBytes, disposition, filename) {
|
||||
assert.equal(state, 'cancelled');
|
||||
assert.equal(filename, 'mock.pdf');
|
||||
assert.equal(mimeType, 'application/pdf');
|
||||
assert.equal(receivedBytes, 0);
|
||||
assert.equal(totalBytes, mockPDF.length);
|
||||
assert.equal(disposition, contentDisposition);
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
assert.equal(state, 'cancelled')
|
||||
assert.equal(filename, 'mock.pdf')
|
||||
assert.equal(mimeType, 'application/pdf')
|
||||
assert.equal(receivedBytes, 0)
|
||||
assert.equal(totalBytes, mockPDF.length)
|
||||
assert.equal(disposition, contentDisposition)
|
||||
done()
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
|
@ -1,19 +1,19 @@
|
|||
const assert = require('assert');
|
||||
const path = require('path');
|
||||
const webFrame = require('electron').webFrame;
|
||||
const assert = require('assert')
|
||||
const path = require('path')
|
||||
const webFrame = require('electron').webFrame
|
||||
|
||||
describe('webFrame module', function () {
|
||||
var fixtures = path.resolve(__dirname, 'fixtures');
|
||||
var fixtures = path.resolve(__dirname, 'fixtures')
|
||||
describe('webFrame.registerURLSchemeAsPrivileged', function () {
|
||||
it('supports fetch api', function (done) {
|
||||
webFrame.registerURLSchemeAsPrivileged('file');
|
||||
var url = "file://" + fixtures + "/assets/logo.png";
|
||||
fetch(url).then(function(response) {
|
||||
assert(response.ok);
|
||||
done();
|
||||
webFrame.registerURLSchemeAsPrivileged('file')
|
||||
var url = 'file://' + fixtures + '/assets/logo.png'
|
||||
window.fetch(url).then(function (response) {
|
||||
assert(response.ok)
|
||||
done()
|
||||
}).catch(function (err) {
|
||||
done('unexpected error : ' + err);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
done('unexpected error : ' + err)
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
|
@ -1,413 +1,412 @@
|
|||
const assert = require('assert');
|
||||
const http = require('http');
|
||||
const qs = require('querystring');
|
||||
const remote = require('electron').remote;
|
||||
const session = remote.session;
|
||||
const assert = require('assert')
|
||||
const http = require('http')
|
||||
const qs = require('querystring')
|
||||
const remote = require('electron').remote
|
||||
const session = remote.session
|
||||
|
||||
describe('webRequest module', function () {
|
||||
var ses = session.defaultSession;
|
||||
var ses = session.defaultSession
|
||||
var server = http.createServer(function (req, res) {
|
||||
res.setHeader('Custom', ['Header']);
|
||||
var content = req.url;
|
||||
res.setHeader('Custom', ['Header'])
|
||||
var content = req.url
|
||||
if (req.headers.accept === '*/*;test/header') {
|
||||
content += 'header/received';
|
||||
content += 'header/received'
|
||||
}
|
||||
res.end(content);
|
||||
});
|
||||
var defaultURL = null;
|
||||
res.end(content)
|
||||
})
|
||||
var defaultURL = null
|
||||
|
||||
before(function (done) {
|
||||
server.listen(0, '127.0.0.1', function () {
|
||||
var port = server.address().port;
|
||||
defaultURL = "http://127.0.0.1:" + port + "/";
|
||||
done();
|
||||
});
|
||||
});
|
||||
var port = server.address().port
|
||||
defaultURL = 'http://127.0.0.1:' + port + '/'
|
||||
done()
|
||||
})
|
||||
})
|
||||
|
||||
after(function () {
|
||||
server.close();
|
||||
});
|
||||
server.close()
|
||||
})
|
||||
|
||||
describe('webRequest.onBeforeRequest', function () {
|
||||
afterEach(function () {
|
||||
ses.webRequest.onBeforeRequest(null);
|
||||
});
|
||||
ses.webRequest.onBeforeRequest(null)
|
||||
})
|
||||
|
||||
it('can cancel the request', function (done) {
|
||||
ses.webRequest.onBeforeRequest(function (details, callback) {
|
||||
callback({
|
||||
cancel: true
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
$.ajax({
|
||||
url: defaultURL,
|
||||
success: function () {
|
||||
done('unexpected success');
|
||||
done('unexpected success')
|
||||
},
|
||||
error: function () {
|
||||
done();
|
||||
done()
|
||||
}
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
|
||||
it('can filter URLs', function (done) {
|
||||
var filter = {
|
||||
urls: [defaultURL + "filter/*"]
|
||||
};
|
||||
urls: [defaultURL + 'filter/*']
|
||||
}
|
||||
ses.webRequest.onBeforeRequest(filter, function (details, callback) {
|
||||
callback({
|
||||
cancel: true
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
$.ajax({
|
||||
url: defaultURL + "nofilter/test",
|
||||
url: defaultURL + 'nofilter/test',
|
||||
success: function (data) {
|
||||
assert.equal(data, '/nofilter/test');
|
||||
assert.equal(data, '/nofilter/test')
|
||||
$.ajax({
|
||||
url: defaultURL + "filter/test",
|
||||
url: defaultURL + 'filter/test',
|
||||
success: function () {
|
||||
done('unexpected success');
|
||||
done('unexpected success')
|
||||
},
|
||||
error: function () {
|
||||
done();
|
||||
done()
|
||||
}
|
||||
});
|
||||
})
|
||||
},
|
||||
error: function (xhr, errorType) {
|
||||
done(errorType);
|
||||
done(errorType)
|
||||
}
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
|
||||
it('receives details object', function (done) {
|
||||
ses.webRequest.onBeforeRequest(function (details, callback) {
|
||||
assert.equal(typeof details.id, 'number');
|
||||
assert.equal(typeof details.timestamp, 'number');
|
||||
assert.equal(details.url, defaultURL);
|
||||
assert.equal(details.method, 'GET');
|
||||
assert.equal(details.resourceType, 'xhr');
|
||||
assert(!details.uploadData);
|
||||
callback({});
|
||||
});
|
||||
assert.equal(typeof details.id, 'number')
|
||||
assert.equal(typeof details.timestamp, 'number')
|
||||
assert.equal(details.url, defaultURL)
|
||||
assert.equal(details.method, 'GET')
|
||||
assert.equal(details.resourceType, 'xhr')
|
||||
assert(!details.uploadData)
|
||||
callback({})
|
||||
})
|
||||
$.ajax({
|
||||
url: defaultURL,
|
||||
success: function (data) {
|
||||
assert.equal(data, '/');
|
||||
done();
|
||||
assert.equal(data, '/')
|
||||
done()
|
||||
},
|
||||
error: function (xhr, errorType) {
|
||||
done(errorType);
|
||||
done(errorType)
|
||||
}
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
|
||||
it('receives post data in details object', function (done) {
|
||||
var postData = {
|
||||
name: 'post test',
|
||||
type: 'string'
|
||||
};
|
||||
}
|
||||
ses.webRequest.onBeforeRequest(function (details, callback) {
|
||||
assert.equal(details.url, defaultURL);
|
||||
assert.equal(details.method, 'POST');
|
||||
assert.equal(details.uploadData.length, 1);
|
||||
var data = qs.parse(details.uploadData[0].bytes.toString());
|
||||
assert.deepEqual(data, postData);
|
||||
assert.equal(details.url, defaultURL)
|
||||
assert.equal(details.method, 'POST')
|
||||
assert.equal(details.uploadData.length, 1)
|
||||
var data = qs.parse(details.uploadData[0].bytes.toString())
|
||||
assert.deepEqual(data, postData)
|
||||
callback({
|
||||
cancel: true
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
$.ajax({
|
||||
url: defaultURL,
|
||||
type: 'POST',
|
||||
data: postData,
|
||||
success: function() {
|
||||
},
|
||||
success: function () {},
|
||||
error: function () {
|
||||
done();
|
||||
done()
|
||||
}
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
|
||||
it('can redirect the request', function (done) {
|
||||
ses.webRequest.onBeforeRequest(function (details, callback) {
|
||||
if (details.url === defaultURL) {
|
||||
callback({
|
||||
redirectURL: defaultURL + "redirect"
|
||||
});
|
||||
redirectURL: defaultURL + 'redirect'
|
||||
})
|
||||
} else {
|
||||
callback({});
|
||||
callback({})
|
||||
}
|
||||
});
|
||||
})
|
||||
$.ajax({
|
||||
url: defaultURL,
|
||||
success: function (data) {
|
||||
assert.equal(data, '/redirect');
|
||||
done();
|
||||
assert.equal(data, '/redirect')
|
||||
done()
|
||||
},
|
||||
error: function (xhr, errorType) {
|
||||
done(errorType);
|
||||
done(errorType)
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('webRequest.onBeforeSendHeaders', function () {
|
||||
afterEach(function () {
|
||||
ses.webRequest.onBeforeSendHeaders(null);
|
||||
});
|
||||
ses.webRequest.onBeforeSendHeaders(null)
|
||||
})
|
||||
|
||||
it('receives details object', function (done) {
|
||||
ses.webRequest.onBeforeSendHeaders(function (details, callback) {
|
||||
assert.equal(typeof details.requestHeaders, 'object');
|
||||
callback({});
|
||||
});
|
||||
assert.equal(typeof details.requestHeaders, 'object')
|
||||
callback({})
|
||||
})
|
||||
$.ajax({
|
||||
url: defaultURL,
|
||||
success: function (data) {
|
||||
assert.equal(data, '/');
|
||||
done();
|
||||
assert.equal(data, '/')
|
||||
done()
|
||||
},
|
||||
error: function (xhr, errorType) {
|
||||
done(errorType);
|
||||
done(errorType)
|
||||
}
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
|
||||
it('can change the request headers', function (done) {
|
||||
ses.webRequest.onBeforeSendHeaders(function (details, callback) {
|
||||
var requestHeaders = details.requestHeaders;
|
||||
requestHeaders.Accept = '*/*;test/header';
|
||||
var requestHeaders = details.requestHeaders
|
||||
requestHeaders.Accept = '*/*;test/header'
|
||||
callback({
|
||||
requestHeaders: requestHeaders
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
$.ajax({
|
||||
url: defaultURL,
|
||||
success: function (data) {
|
||||
assert.equal(data, '/header/received');
|
||||
done();
|
||||
assert.equal(data, '/header/received')
|
||||
done()
|
||||
},
|
||||
error: function (xhr, errorType) {
|
||||
done(errorType);
|
||||
done(errorType)
|
||||
}
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
|
||||
it('resets the whole headers', function (done) {
|
||||
var requestHeaders = {
|
||||
Test: 'header'
|
||||
};
|
||||
}
|
||||
ses.webRequest.onBeforeSendHeaders(function (details, callback) {
|
||||
callback({
|
||||
requestHeaders: requestHeaders
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
ses.webRequest.onSendHeaders(function (details) {
|
||||
assert.deepEqual(details.requestHeaders, requestHeaders);
|
||||
done();
|
||||
});
|
||||
assert.deepEqual(details.requestHeaders, requestHeaders)
|
||||
done()
|
||||
})
|
||||
$.ajax({
|
||||
url: defaultURL,
|
||||
error: function (xhr, errorType) {
|
||||
done(errorType);
|
||||
done(errorType)
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('webRequest.onSendHeaders', function () {
|
||||
afterEach(function () {
|
||||
ses.webRequest.onSendHeaders(null);
|
||||
});
|
||||
ses.webRequest.onSendHeaders(null)
|
||||
})
|
||||
|
||||
it('receives details object', function (done) {
|
||||
ses.webRequest.onSendHeaders(function (details) {
|
||||
assert.equal(typeof details.requestHeaders, 'object');
|
||||
});
|
||||
assert.equal(typeof details.requestHeaders, 'object')
|
||||
})
|
||||
$.ajax({
|
||||
url: defaultURL,
|
||||
success: function (data) {
|
||||
assert.equal(data, '/');
|
||||
done();
|
||||
assert.equal(data, '/')
|
||||
done()
|
||||
},
|
||||
error: function (xhr, errorType) {
|
||||
done(errorType);
|
||||
done(errorType)
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('webRequest.onHeadersReceived', function () {
|
||||
afterEach(function () {
|
||||
ses.webRequest.onHeadersReceived(null);
|
||||
});
|
||||
ses.webRequest.onHeadersReceived(null)
|
||||
})
|
||||
|
||||
it('receives details object', function (done) {
|
||||
ses.webRequest.onHeadersReceived(function (details, callback) {
|
||||
assert.equal(details.statusLine, 'HTTP/1.1 200 OK');
|
||||
assert.equal(details.statusCode, 200);
|
||||
assert.equal(details.responseHeaders['Custom'], 'Header');
|
||||
callback({});
|
||||
});
|
||||
assert.equal(details.statusLine, 'HTTP/1.1 200 OK')
|
||||
assert.equal(details.statusCode, 200)
|
||||
assert.equal(details.responseHeaders['Custom'], 'Header')
|
||||
callback({})
|
||||
})
|
||||
$.ajax({
|
||||
url: defaultURL,
|
||||
success: function (data) {
|
||||
assert.equal(data, '/');
|
||||
done();
|
||||
assert.equal(data, '/')
|
||||
done()
|
||||
},
|
||||
error: function (xhr, errorType) {
|
||||
done(errorType);
|
||||
done(errorType)
|
||||
}
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
|
||||
it('can change the response header', function (done) {
|
||||
ses.webRequest.onHeadersReceived(function (details, callback) {
|
||||
var responseHeaders = details.responseHeaders;
|
||||
responseHeaders['Custom'] = ['Changed'];
|
||||
var responseHeaders = details.responseHeaders
|
||||
responseHeaders['Custom'] = ['Changed']
|
||||
callback({
|
||||
responseHeaders: responseHeaders
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
$.ajax({
|
||||
url: defaultURL,
|
||||
success: function (data, status, xhr) {
|
||||
assert.equal(xhr.getResponseHeader('Custom'), 'Changed');
|
||||
assert.equal(data, '/');
|
||||
done();
|
||||
assert.equal(xhr.getResponseHeader('Custom'), 'Changed')
|
||||
assert.equal(data, '/')
|
||||
done()
|
||||
},
|
||||
error: function (xhr, errorType) {
|
||||
done(errorType);
|
||||
done(errorType)
|
||||
}
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
|
||||
it('does not change header by default', function (done) {
|
||||
ses.webRequest.onHeadersReceived(function (details, callback) {
|
||||
callback({});
|
||||
});
|
||||
callback({})
|
||||
})
|
||||
$.ajax({
|
||||
url: defaultURL,
|
||||
success: function (data, status, xhr) {
|
||||
assert.equal(xhr.getResponseHeader('Custom'), 'Header');
|
||||
assert.equal(data, '/');
|
||||
done();
|
||||
assert.equal(xhr.getResponseHeader('Custom'), 'Header')
|
||||
assert.equal(data, '/')
|
||||
done()
|
||||
},
|
||||
error: function (xhr, errorType) {
|
||||
done(errorType);
|
||||
done(errorType)
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('webRequest.onResponseStarted', function () {
|
||||
afterEach(function () {
|
||||
ses.webRequest.onResponseStarted(null);
|
||||
});
|
||||
ses.webRequest.onResponseStarted(null)
|
||||
})
|
||||
|
||||
it('receives details object', function (done) {
|
||||
ses.webRequest.onResponseStarted(function (details) {
|
||||
assert.equal(typeof details.fromCache, 'boolean');
|
||||
assert.equal(details.statusLine, 'HTTP/1.1 200 OK');
|
||||
assert.equal(details.statusCode, 200);
|
||||
assert.equal(details.responseHeaders['Custom'], 'Header');
|
||||
});
|
||||
assert.equal(typeof details.fromCache, 'boolean')
|
||||
assert.equal(details.statusLine, 'HTTP/1.1 200 OK')
|
||||
assert.equal(details.statusCode, 200)
|
||||
assert.equal(details.responseHeaders['Custom'], 'Header')
|
||||
})
|
||||
$.ajax({
|
||||
url: defaultURL,
|
||||
success: function (data, status, xhr) {
|
||||
assert.equal(xhr.getResponseHeader('Custom'), 'Header');
|
||||
assert.equal(data, '/');
|
||||
done();
|
||||
assert.equal(xhr.getResponseHeader('Custom'), 'Header')
|
||||
assert.equal(data, '/')
|
||||
done()
|
||||
},
|
||||
error: function (xhr, errorType) {
|
||||
done(errorType);
|
||||
done(errorType)
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('webRequest.onBeforeRedirect', function () {
|
||||
afterEach(function () {
|
||||
ses.webRequest.onBeforeRedirect(null);
|
||||
ses.webRequest.onBeforeRequest(null);
|
||||
});
|
||||
ses.webRequest.onBeforeRedirect(null)
|
||||
ses.webRequest.onBeforeRequest(null)
|
||||
})
|
||||
|
||||
it('receives details object', function (done) {
|
||||
var redirectURL = defaultURL + "redirect";
|
||||
var redirectURL = defaultURL + 'redirect'
|
||||
ses.webRequest.onBeforeRequest(function (details, callback) {
|
||||
if (details.url === defaultURL) {
|
||||
callback({
|
||||
redirectURL: redirectURL
|
||||
});
|
||||
})
|
||||
} else {
|
||||
callback({});
|
||||
callback({})
|
||||
}
|
||||
});
|
||||
})
|
||||
ses.webRequest.onBeforeRedirect(function (details) {
|
||||
assert.equal(typeof details.fromCache, 'boolean');
|
||||
assert.equal(details.statusLine, 'HTTP/1.1 307 Internal Redirect');
|
||||
assert.equal(details.statusCode, 307);
|
||||
assert.equal(details.redirectURL, redirectURL);
|
||||
});
|
||||
assert.equal(typeof details.fromCache, 'boolean')
|
||||
assert.equal(details.statusLine, 'HTTP/1.1 307 Internal Redirect')
|
||||
assert.equal(details.statusCode, 307)
|
||||
assert.equal(details.redirectURL, redirectURL)
|
||||
})
|
||||
$.ajax({
|
||||
url: defaultURL,
|
||||
success: function (data) {
|
||||
assert.equal(data, '/redirect');
|
||||
done();
|
||||
assert.equal(data, '/redirect')
|
||||
done()
|
||||
},
|
||||
error: function (xhr, errorType) {
|
||||
done(errorType);
|
||||
done(errorType)
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('webRequest.onCompleted', function () {
|
||||
afterEach(function () {
|
||||
ses.webRequest.onCompleted(null);
|
||||
});
|
||||
ses.webRequest.onCompleted(null)
|
||||
})
|
||||
|
||||
it('receives details object', function (done) {
|
||||
ses.webRequest.onCompleted(function (details) {
|
||||
assert.equal(typeof details.fromCache, 'boolean');
|
||||
assert.equal(details.statusLine, 'HTTP/1.1 200 OK');
|
||||
assert.equal(details.statusCode, 200);
|
||||
});
|
||||
assert.equal(typeof details.fromCache, 'boolean')
|
||||
assert.equal(details.statusLine, 'HTTP/1.1 200 OK')
|
||||
assert.equal(details.statusCode, 200)
|
||||
})
|
||||
$.ajax({
|
||||
url: defaultURL,
|
||||
success: function (data) {
|
||||
assert.equal(data, '/');
|
||||
done();
|
||||
assert.equal(data, '/')
|
||||
done()
|
||||
},
|
||||
error: function (xhr, errorType) {
|
||||
done(errorType);
|
||||
done(errorType)
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('webRequest.onErrorOccurred', function () {
|
||||
afterEach(function () {
|
||||
ses.webRequest.onErrorOccurred(null);
|
||||
ses.webRequest.onBeforeRequest(null);
|
||||
});
|
||||
ses.webRequest.onErrorOccurred(null)
|
||||
ses.webRequest.onBeforeRequest(null)
|
||||
})
|
||||
|
||||
it('receives details object', function (done) {
|
||||
ses.webRequest.onBeforeRequest(function (details, callback) {
|
||||
callback({
|
||||
cancel: true
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
ses.webRequest.onErrorOccurred(function (details) {
|
||||
assert.equal(details.error, 'net::ERR_BLOCKED_BY_CLIENT');
|
||||
done();
|
||||
});
|
||||
assert.equal(details.error, 'net::ERR_BLOCKED_BY_CLIENT')
|
||||
done()
|
||||
})
|
||||
$.ajax({
|
||||
url: defaultURL,
|
||||
success: function () {
|
||||
done('unexpected success');
|
||||
done('unexpected success')
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
1074
spec/asar-spec.js
1074
spec/asar-spec.js
File diff suppressed because it is too large
Load diff
|
@ -1,396 +1,400 @@
|
|||
const assert = require('assert');
|
||||
const http = require('http');
|
||||
const path = require('path');
|
||||
const ws = require('ws');
|
||||
const remote = require('electron').remote;
|
||||
|
||||
const BrowserWindow = remote.require('electron').BrowserWindow;
|
||||
const session = remote.require('electron').session;
|
||||
const assert = require('assert')
|
||||
const http = require('http')
|
||||
const path = require('path')
|
||||
const ws = require('ws')
|
||||
const remote = require('electron').remote
|
||||
|
||||
const isCI = remote.getGlobal('isCi');
|
||||
const BrowserWindow = remote.require('electron').BrowserWindow
|
||||
const session = remote.require('electron').session
|
||||
|
||||
const isCI = remote.getGlobal('isCi')
|
||||
|
||||
describe('chromium feature', function () {
|
||||
var fixtures = path.resolve(__dirname, 'fixtures');
|
||||
var listener = null;
|
||||
var fixtures = path.resolve(__dirname, 'fixtures')
|
||||
var listener = null
|
||||
|
||||
afterEach(function () {
|
||||
if (listener != null) {
|
||||
window.removeEventListener('message', listener);
|
||||
window.removeEventListener('message', listener)
|
||||
}
|
||||
listener = null;
|
||||
});
|
||||
listener = null
|
||||
})
|
||||
|
||||
xdescribe('heap snapshot', function () {
|
||||
it('does not crash', function () {
|
||||
process.atomBinding('v8_util').takeHeapSnapshot();
|
||||
});
|
||||
});
|
||||
process.atomBinding('v8_util').takeHeapSnapshot()
|
||||
})
|
||||
})
|
||||
|
||||
describe('sending request of http protocol urls', function () {
|
||||
it('does not crash', function (done) {
|
||||
this.timeout(5000);
|
||||
this.timeout(5000)
|
||||
|
||||
var server = http.createServer(function (req, res) {
|
||||
res.end();
|
||||
server.close();
|
||||
done();
|
||||
});
|
||||
res.end()
|
||||
server.close()
|
||||
done()
|
||||
})
|
||||
server.listen(0, '127.0.0.1', function () {
|
||||
var port = server.address().port;
|
||||
$.get("http://127.0.0.1:" + port);
|
||||
});
|
||||
});
|
||||
});
|
||||
var port = server.address().port
|
||||
$.get('http://127.0.0.1:' + port)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('document.hidden', function () {
|
||||
var url = "file://" + fixtures + "/pages/document-hidden.html";
|
||||
var w = null;
|
||||
var url = 'file://' + fixtures + '/pages/document-hidden.html'
|
||||
var w = null
|
||||
|
||||
afterEach(function () {
|
||||
w != null ? w.destroy() : void 0;
|
||||
});
|
||||
w != null ? w.destroy() : void 0
|
||||
})
|
||||
|
||||
it('is set correctly when window is not shown', function (done) {
|
||||
w = new BrowserWindow({
|
||||
show: false
|
||||
});
|
||||
})
|
||||
w.webContents.on('ipc-message', function (event, args) {
|
||||
assert.deepEqual(args, ['hidden', true]);
|
||||
done();
|
||||
});
|
||||
w.loadURL(url);
|
||||
});
|
||||
assert.deepEqual(args, ['hidden', true])
|
||||
done()
|
||||
})
|
||||
w.loadURL(url)
|
||||
})
|
||||
|
||||
it('is set correctly when window is inactive', function (done) {
|
||||
w = new BrowserWindow({
|
||||
show: false
|
||||
});
|
||||
})
|
||||
w.webContents.on('ipc-message', function (event, args) {
|
||||
assert.deepEqual(args, ['hidden', false]);
|
||||
done();
|
||||
});
|
||||
w.showInactive();
|
||||
w.loadURL(url);
|
||||
});
|
||||
});
|
||||
assert.deepEqual(args, ['hidden', false])
|
||||
done()
|
||||
})
|
||||
w.showInactive()
|
||||
w.loadURL(url)
|
||||
})
|
||||
})
|
||||
|
||||
xdescribe('navigator.webkitGetUserMedia', function () {
|
||||
it('calls its callbacks', function (done) {
|
||||
this.timeout(5000);
|
||||
this.timeout(5000)
|
||||
|
||||
navigator.webkitGetUserMedia({
|
||||
audio: true,
|
||||
video: false
|
||||
}, function () {
|
||||
done();
|
||||
done()
|
||||
}, function () {
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
done()
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('navigator.mediaDevices', function () {
|
||||
if (process.env.TRAVIS === 'true') {
|
||||
return;
|
||||
return
|
||||
}
|
||||
if (isCI && process.platform === 'linux') {
|
||||
return;
|
||||
return
|
||||
}
|
||||
|
||||
it('can return labels of enumerated devices', function (done) {
|
||||
navigator.mediaDevices.enumerateDevices().then((devices) => {
|
||||
const labels = devices.map((device) => device.label);
|
||||
const labelFound = labels.some((label) => !!label);
|
||||
if (labelFound)
|
||||
done();
|
||||
else
|
||||
done('No device labels found: ' + JSON.stringify(labels));
|
||||
}).catch(done);
|
||||
});
|
||||
});
|
||||
const labels = devices.map((device) => device.label)
|
||||
const labelFound = labels.some((label) => !!label)
|
||||
if (labelFound) {
|
||||
done()
|
||||
} else {
|
||||
done('No device labels found: ' + JSON.stringify(labels))
|
||||
}
|
||||
}).catch(done)
|
||||
})
|
||||
})
|
||||
|
||||
describe('navigator.language', function () {
|
||||
it('should not be empty', function () {
|
||||
assert.notEqual(navigator.language, '');
|
||||
});
|
||||
});
|
||||
assert.notEqual(navigator.language, '')
|
||||
})
|
||||
})
|
||||
|
||||
describe('navigator.serviceWorker', function () {
|
||||
var url = "file://" + fixtures + "/pages/service-worker/index.html";
|
||||
var w = null;
|
||||
var url = 'file://' + fixtures + '/pages/service-worker/index.html'
|
||||
var w = null
|
||||
|
||||
afterEach(function () {
|
||||
w != null ? w.destroy() : void 0;
|
||||
});
|
||||
w != null ? w.destroy() : void 0
|
||||
})
|
||||
|
||||
it('should register for file scheme', function (done) {
|
||||
w = new BrowserWindow({
|
||||
show: false
|
||||
});
|
||||
})
|
||||
w.webContents.on('ipc-message', function (event, args) {
|
||||
if (args[0] === 'reload') {
|
||||
w.webContents.reload();
|
||||
w.webContents.reload()
|
||||
} else if (args[0] === 'error') {
|
||||
done('unexpected error : ' + args[1]);
|
||||
done('unexpected error : ' + args[1])
|
||||
} else if (args[0] === 'response') {
|
||||
assert.equal(args[1], 'Hello from serviceWorker!');
|
||||
assert.equal(args[1], 'Hello from serviceWorker!')
|
||||
session.defaultSession.clearStorageData({
|
||||
storages: ['serviceworkers']
|
||||
}, function () {
|
||||
done();
|
||||
});
|
||||
done()
|
||||
})
|
||||
}
|
||||
});
|
||||
w.loadURL(url);
|
||||
});
|
||||
});
|
||||
})
|
||||
w.loadURL(url)
|
||||
})
|
||||
})
|
||||
|
||||
describe('window.open', function () {
|
||||
this.timeout(20000);
|
||||
this.timeout(20000)
|
||||
|
||||
it('returns a BrowserWindowProxy object', function () {
|
||||
var b = window.open('about:blank', '', 'show=no');
|
||||
assert.equal(b.closed, false);
|
||||
assert.equal(b.constructor.name, 'BrowserWindowProxy');
|
||||
b.close();
|
||||
});
|
||||
var b = window.open('about:blank', '', 'show=no')
|
||||
assert.equal(b.closed, false)
|
||||
assert.equal(b.constructor.name, 'BrowserWindowProxy')
|
||||
b.close()
|
||||
})
|
||||
|
||||
it('accepts "nodeIntegration" as feature', function (done) {
|
||||
var b;
|
||||
var b
|
||||
listener = function (event) {
|
||||
assert.equal(event.data, 'undefined');
|
||||
b.close();
|
||||
done();
|
||||
};
|
||||
window.addEventListener('message', listener);
|
||||
b = window.open("file://" + fixtures + "/pages/window-opener-node.html", '', 'nodeIntegration=no,show=no');
|
||||
});
|
||||
assert.equal(event.data, 'undefined')
|
||||
b.close()
|
||||
done()
|
||||
}
|
||||
window.addEventListener('message', listener)
|
||||
b = window.open('file://' + fixtures + '/pages/window-opener-node.html', '', 'nodeIntegration=no,show=no')
|
||||
})
|
||||
|
||||
it('inherit options of parent window', function (done) {
|
||||
var b;
|
||||
var b
|
||||
listener = function (event) {
|
||||
var height, ref1, width;
|
||||
ref1 = remote.getCurrentWindow().getSize(), width = ref1[0], height = ref1[1];
|
||||
assert.equal(event.data, "size: " + width + " " + height);
|
||||
b.close();
|
||||
done();
|
||||
};
|
||||
window.addEventListener('message', listener);
|
||||
b = window.open("file://" + fixtures + "/pages/window-open-size.html", '', 'show=no');
|
||||
});
|
||||
var ref1 = remote.getCurrentWindow().getSize()
|
||||
var width = ref1[0]
|
||||
var height = ref1[1]
|
||||
assert.equal(event.data, 'size: ' + width + ' ' + height)
|
||||
b.close()
|
||||
done()
|
||||
}
|
||||
window.addEventListener('message', listener)
|
||||
b = window.open('file://' + fixtures + '/pages/window-open-size.html', '', 'show=no')
|
||||
})
|
||||
|
||||
it('does not override child options', function (done) {
|
||||
var b, size;
|
||||
var b, size
|
||||
size = {
|
||||
width: 350,
|
||||
height: 450
|
||||
};
|
||||
}
|
||||
listener = function (event) {
|
||||
assert.equal(event.data, "size: " + size.width + " " + size.height);
|
||||
b.close();
|
||||
done();
|
||||
};
|
||||
window.addEventListener('message', listener);
|
||||
b = window.open("file://" + fixtures + "/pages/window-open-size.html", '', "show=no,width=" + size.width + ",height=" + size.height);
|
||||
});
|
||||
assert.equal(event.data, 'size: ' + size.width + ' ' + size.height)
|
||||
b.close()
|
||||
done()
|
||||
}
|
||||
window.addEventListener('message', listener)
|
||||
b = window.open('file://' + fixtures + '/pages/window-open-size.html', '', 'show=no,width=' + size.width + ',height=' + size.height)
|
||||
})
|
||||
|
||||
it('defines a window.location getter', function (done) {
|
||||
var b, targetURL;
|
||||
targetURL = "file://" + fixtures + "/pages/base-page.html";
|
||||
b = window.open(targetURL);
|
||||
var b, targetURL
|
||||
targetURL = 'file://' + fixtures + '/pages/base-page.html'
|
||||
b = window.open(targetURL)
|
||||
BrowserWindow.fromId(b.guestId).webContents.once('did-finish-load', function () {
|
||||
assert.equal(b.location, targetURL);
|
||||
b.close();
|
||||
done();
|
||||
});
|
||||
});
|
||||
assert.equal(b.location, targetURL)
|
||||
b.close()
|
||||
done()
|
||||
})
|
||||
})
|
||||
|
||||
it('defines a window.location setter', function (done) {
|
||||
// Load a page that definitely won't redirect
|
||||
var b;
|
||||
b = window.open("about:blank");
|
||||
var b
|
||||
b = window.open('about:blank')
|
||||
BrowserWindow.fromId(b.guestId).webContents.once('did-finish-load', function () {
|
||||
// When it loads, redirect
|
||||
b.location = "file://" + fixtures + "/pages/base-page.html";
|
||||
b.location = 'file://' + fixtures + '/pages/base-page.html'
|
||||
BrowserWindow.fromId(b.guestId).webContents.once('did-finish-load', function () {
|
||||
// After our second redirect, cleanup and callback
|
||||
b.close();
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
b.close()
|
||||
done()
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('window.opener', function () {
|
||||
this.timeout(10000);
|
||||
this.timeout(10000)
|
||||
|
||||
var url = "file://" + fixtures + "/pages/window-opener.html";
|
||||
var w = null;
|
||||
var url = 'file://' + fixtures + '/pages/window-opener.html'
|
||||
var w = null
|
||||
|
||||
afterEach(function () {
|
||||
w != null ? w.destroy() : void 0;
|
||||
});
|
||||
w != null ? w.destroy() : void 0
|
||||
})
|
||||
|
||||
it('is null for main window', function (done) {
|
||||
w = new BrowserWindow({
|
||||
show: false
|
||||
});
|
||||
})
|
||||
w.webContents.on('ipc-message', function (event, args) {
|
||||
assert.deepEqual(args, ['opener', null]);
|
||||
done();
|
||||
});
|
||||
w.loadURL(url);
|
||||
});
|
||||
assert.deepEqual(args, ['opener', null])
|
||||
done()
|
||||
})
|
||||
w.loadURL(url)
|
||||
})
|
||||
|
||||
it('is not null for window opened by window.open', function (done) {
|
||||
var b;
|
||||
var b
|
||||
listener = function (event) {
|
||||
assert.equal(event.data, 'object');
|
||||
b.close();
|
||||
done();
|
||||
};
|
||||
window.addEventListener('message', listener);
|
||||
b = window.open(url, '', 'show=no');
|
||||
});
|
||||
});
|
||||
assert.equal(event.data, 'object')
|
||||
b.close()
|
||||
done()
|
||||
}
|
||||
window.addEventListener('message', listener)
|
||||
b = window.open(url, '', 'show=no')
|
||||
})
|
||||
})
|
||||
|
||||
describe('window.postMessage', function () {
|
||||
it('sets the source and origin correctly', function (done) {
|
||||
var b, sourceId;
|
||||
sourceId = remote.getCurrentWindow().id;
|
||||
var b, sourceId
|
||||
sourceId = remote.getCurrentWindow().id
|
||||
listener = function (event) {
|
||||
window.removeEventListener('message', listener);
|
||||
b.close();
|
||||
var message = JSON.parse(event.data);
|
||||
assert.equal(message.data, 'testing');
|
||||
assert.equal(message.origin, 'file://');
|
||||
assert.equal(message.sourceEqualsOpener, true);
|
||||
assert.equal(message.sourceId, sourceId);
|
||||
assert.equal(event.origin, 'file://');
|
||||
done();
|
||||
};
|
||||
window.addEventListener('message', listener);
|
||||
b = window.open("file://" + fixtures + "/pages/window-open-postMessage.html", '', 'show=no');
|
||||
window.removeEventListener('message', listener)
|
||||
b.close()
|
||||
var message = JSON.parse(event.data)
|
||||
assert.equal(message.data, 'testing')
|
||||
assert.equal(message.origin, 'file://')
|
||||
assert.equal(message.sourceEqualsOpener, true)
|
||||
assert.equal(message.sourceId, sourceId)
|
||||
assert.equal(event.origin, 'file://')
|
||||
done()
|
||||
}
|
||||
window.addEventListener('message', listener)
|
||||
b = window.open('file://' + fixtures + '/pages/window-open-postMessage.html', '', 'show=no')
|
||||
BrowserWindow.fromId(b.guestId).webContents.once('did-finish-load', function () {
|
||||
b.postMessage('testing', '*');
|
||||
});
|
||||
});
|
||||
});
|
||||
b.postMessage('testing', '*')
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('window.opener.postMessage', function () {
|
||||
it('sets source and origin correctly', function (done) {
|
||||
var b;
|
||||
var b
|
||||
listener = function (event) {
|
||||
window.removeEventListener('message', listener);
|
||||
b.close();
|
||||
assert.equal(event.source, b);
|
||||
assert.equal(event.origin, 'file://');
|
||||
done();
|
||||
};
|
||||
window.addEventListener('message', listener);
|
||||
b = window.open("file://" + fixtures + "/pages/window-opener-postMessage.html", '', 'show=no');
|
||||
});
|
||||
});
|
||||
window.removeEventListener('message', listener)
|
||||
b.close()
|
||||
assert.equal(event.source, b)
|
||||
assert.equal(event.origin, 'file://')
|
||||
done()
|
||||
}
|
||||
window.addEventListener('message', listener)
|
||||
b = window.open('file://' + fixtures + '/pages/window-opener-postMessage.html', '', 'show=no')
|
||||
})
|
||||
})
|
||||
|
||||
describe('creating a Uint8Array under browser side', function () {
|
||||
it('does not crash', function () {
|
||||
var RUint8Array = remote.getGlobal('Uint8Array');
|
||||
new RUint8Array;
|
||||
});
|
||||
});
|
||||
var RUint8Array = remote.getGlobal('Uint8Array')
|
||||
var arr = new RUint8Array()
|
||||
assert(arr)
|
||||
})
|
||||
})
|
||||
|
||||
describe('webgl', function () {
|
||||
it('can be get as context in canvas', function () {
|
||||
if (process.platform === 'linux') {
|
||||
return;
|
||||
}
|
||||
var webgl = document.createElement('canvas').getContext('webgl');
|
||||
assert.notEqual(webgl, null);
|
||||
});
|
||||
});
|
||||
if (process.platform === 'linux') return
|
||||
|
||||
var webgl = document.createElement('canvas').getContext('webgl')
|
||||
assert.notEqual(webgl, null)
|
||||
})
|
||||
})
|
||||
|
||||
describe('web workers', function () {
|
||||
it('Worker can work', function (done) {
|
||||
var worker = new Worker('../fixtures/workers/worker.js');
|
||||
var message = 'ping';
|
||||
var worker = new Worker('../fixtures/workers/worker.js')
|
||||
var message = 'ping'
|
||||
worker.onmessage = function (event) {
|
||||
assert.equal(event.data, message);
|
||||
worker.terminate();
|
||||
done();
|
||||
};
|
||||
worker.postMessage(message);
|
||||
});
|
||||
assert.equal(event.data, message)
|
||||
worker.terminate()
|
||||
done()
|
||||
}
|
||||
worker.postMessage(message)
|
||||
})
|
||||
|
||||
it('SharedWorker can work', function (done) {
|
||||
var worker = new SharedWorker('../fixtures/workers/shared_worker.js');
|
||||
var message = 'ping';
|
||||
var worker = new SharedWorker('../fixtures/workers/shared_worker.js')
|
||||
var message = 'ping'
|
||||
worker.port.onmessage = function (event) {
|
||||
assert.equal(event.data, message);
|
||||
done();
|
||||
};
|
||||
worker.port.postMessage(message);
|
||||
});
|
||||
});
|
||||
assert.equal(event.data, message)
|
||||
done()
|
||||
}
|
||||
worker.port.postMessage(message)
|
||||
})
|
||||
})
|
||||
|
||||
describe('iframe', function () {
|
||||
var iframe = null;
|
||||
var iframe = null
|
||||
|
||||
beforeEach(function () {
|
||||
iframe = document.createElement('iframe');
|
||||
});
|
||||
iframe = document.createElement('iframe')
|
||||
})
|
||||
|
||||
afterEach(function () {
|
||||
document.body.removeChild(iframe);
|
||||
});
|
||||
document.body.removeChild(iframe)
|
||||
})
|
||||
|
||||
it('does not have node integration', function (done) {
|
||||
iframe.src = "file://" + fixtures + "/pages/set-global.html";
|
||||
document.body.appendChild(iframe);
|
||||
iframe.src = 'file://' + fixtures + '/pages/set-global.html'
|
||||
document.body.appendChild(iframe)
|
||||
iframe.onload = function () {
|
||||
assert.equal(iframe.contentWindow.test, 'undefined undefined undefined');
|
||||
done();
|
||||
};
|
||||
});
|
||||
});
|
||||
assert.equal(iframe.contentWindow.test, 'undefined undefined undefined')
|
||||
done()
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
describe('storage', function () {
|
||||
it('requesting persitent quota works', function (done) {
|
||||
navigator.webkitPersistentStorage.requestQuota(1024 * 1024, function (grantedBytes) {
|
||||
assert.equal(grantedBytes, 1048576);
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
assert.equal(grantedBytes, 1048576)
|
||||
done()
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('websockets', function () {
|
||||
var wss = null;
|
||||
var server = null;
|
||||
var WebSocketServer = ws.Server;
|
||||
var wss = null
|
||||
var server = null
|
||||
var WebSocketServer = ws.Server
|
||||
|
||||
afterEach(function () {
|
||||
wss.close();
|
||||
server.close();
|
||||
});
|
||||
wss.close()
|
||||
server.close()
|
||||
})
|
||||
|
||||
it('has user agent', function (done) {
|
||||
server = http.createServer();
|
||||
server = http.createServer()
|
||||
server.listen(0, '127.0.0.1', function () {
|
||||
var port = server.address().port;
|
||||
var port = server.address().port
|
||||
wss = new WebSocketServer({
|
||||
server: server
|
||||
});
|
||||
wss.on('error', done);
|
||||
})
|
||||
wss.on('error', done)
|
||||
wss.on('connection', function (ws) {
|
||||
if (ws.upgradeReq.headers['user-agent']) {
|
||||
done();
|
||||
done()
|
||||
} else {
|
||||
done('user agent is empty');
|
||||
done('user agent is empty')
|
||||
}
|
||||
});
|
||||
new WebSocket("ws://127.0.0.1:" + port);
|
||||
});
|
||||
});
|
||||
});
|
||||
})
|
||||
var socket = new WebSocket(`ws://127.0.0.1:${port}`)
|
||||
assert(socket)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('Promise', function () {
|
||||
it('resolves correctly in Node.js calls', function (done) {
|
||||
|
@ -400,16 +404,16 @@ describe('chromium feature', function() {
|
|||
value: function () {}
|
||||
}
|
||||
})
|
||||
});
|
||||
})
|
||||
setImmediate(function () {
|
||||
var called = false;
|
||||
var called = false
|
||||
Promise.resolve().then(function () {
|
||||
done(called ? void 0 : new Error('wrong sequence'));
|
||||
});
|
||||
document.createElement('x-element');
|
||||
called = true;
|
||||
});
|
||||
});
|
||||
done(called ? void 0 : new Error('wrong sequence'))
|
||||
})
|
||||
document.createElement('x-element')
|
||||
called = true
|
||||
})
|
||||
})
|
||||
|
||||
it('resolves correctly in Electron calls', function (done) {
|
||||
document.registerElement('y-element', {
|
||||
|
@ -418,15 +422,15 @@ describe('chromium feature', function() {
|
|||
value: function () {}
|
||||
}
|
||||
})
|
||||
});
|
||||
})
|
||||
remote.getGlobal('setImmediate')(function () {
|
||||
var called = false;
|
||||
var called = false
|
||||
Promise.resolve().then(function () {
|
||||
done(called ? void 0 : new Error('wrong sequence'));
|
||||
});
|
||||
document.createElement('y-element');
|
||||
called = true;
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
done(called ? void 0 : new Error('wrong sequence'))
|
||||
})
|
||||
document.createElement('y-element')
|
||||
called = true
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
12
spec/fixtures/api/quit-app/main.js
vendored
12
spec/fixtures/api/quit-app/main.js
vendored
|
@ -1,12 +1,12 @@
|
|||
var app = require('electron').app;
|
||||
var app = require('electron').app
|
||||
|
||||
app.on('ready', function () {
|
||||
// This setImmediate call gets the spec passing on Linux
|
||||
setImmediate(function () {
|
||||
app.exit(123);
|
||||
});
|
||||
});
|
||||
app.exit(123)
|
||||
})
|
||||
})
|
||||
|
||||
process.on('exit', function (code) {
|
||||
console.log('Exit event with code: ' + code);
|
||||
});
|
||||
console.log('Exit event with code: ' + code)
|
||||
})
|
||||
|
|
6
spec/fixtures/module/asar.js
vendored
6
spec/fixtures/module/asar.js
vendored
|
@ -1,4 +1,4 @@
|
|||
var fs = require('fs');
|
||||
var fs = require('fs')
|
||||
process.on('message', function (file) {
|
||||
process.send(fs.readFileSync(file).toString());
|
||||
});
|
||||
process.send(fs.readFileSync(file).toString())
|
||||
})
|
||||
|
|
8
spec/fixtures/module/call.js
vendored
8
spec/fixtures/module/call.js
vendored
|
@ -1,7 +1,7 @@
|
|||
exports.call = function (func) {
|
||||
return func();
|
||||
};
|
||||
return func()
|
||||
}
|
||||
|
||||
exports.constructor = function () {
|
||||
this.test = 'test';
|
||||
};
|
||||
this.test = 'test'
|
||||
}
|
||||
|
|
16
spec/fixtures/module/class.js
vendored
16
spec/fixtures/module/class.js
vendored
|
@ -1,22 +1,22 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
let value = 'old';
|
||||
let value = 'old'
|
||||
|
||||
class BaseClass {
|
||||
method () {
|
||||
return 'method';
|
||||
return 'method'
|
||||
}
|
||||
|
||||
get readonly () {
|
||||
return 'readonly';
|
||||
return 'readonly'
|
||||
}
|
||||
|
||||
get value () {
|
||||
return value;
|
||||
return value
|
||||
}
|
||||
|
||||
set value (val) {
|
||||
value = val;
|
||||
value = val
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -24,6 +24,6 @@ class DerivedClass extends BaseClass {
|
|||
}
|
||||
|
||||
module.exports = {
|
||||
base: new BaseClass,
|
||||
derived: new DerivedClass,
|
||||
base: new BaseClass(),
|
||||
derived: new DerivedClass()
|
||||
}
|
||||
|
|
8
spec/fixtures/module/create_socket.js
vendored
8
spec/fixtures/module/create_socket.js
vendored
|
@ -1,4 +1,4 @@
|
|||
var net = require('net');
|
||||
var server = net.createServer(function() {});
|
||||
server.listen(process.argv[2]);
|
||||
process.exit(0);
|
||||
var net = require('net')
|
||||
var server = net.createServer(function () {})
|
||||
server.listen(process.argv[2])
|
||||
process.exit(0)
|
||||
|
|
22
spec/fixtures/module/fork_ping.js
vendored
22
spec/fixtures/module/fork_ping.js
vendored
|
@ -1,14 +1,16 @@
|
|||
process.on('uncaughtException', function(error) {
|
||||
process.send(error.stack);
|
||||
});
|
||||
const path = require('path')
|
||||
|
||||
var child = require('child_process').fork(__dirname + '/ping.js');
|
||||
process.on('uncaughtException', function (error) {
|
||||
process.send(error.stack)
|
||||
})
|
||||
|
||||
var child = require('child_process').fork(path.join(__dirname, '/ping.js'))
|
||||
process.on('message', function (msg) {
|
||||
child.send(msg);
|
||||
});
|
||||
child.send(msg)
|
||||
})
|
||||
child.on('message', function (msg) {
|
||||
process.send(msg);
|
||||
});
|
||||
process.send(msg)
|
||||
})
|
||||
child.on('exit', function (code) {
|
||||
process.exit(code);
|
||||
});
|
||||
process.exit(code)
|
||||
})
|
||||
|
|
2
spec/fixtures/module/function.js
vendored
2
spec/fixtures/module/function.js
vendored
|
@ -1 +1 @@
|
|||
exports.aFunction = function() { return 1127; };
|
||||
exports.aFunction = function () { return 1127 }
|
||||
|
|
2
spec/fixtures/module/id.js
vendored
2
spec/fixtures/module/id.js
vendored
|
@ -1 +1 @@
|
|||
exports.id = 1127;
|
||||
exports.id = 1127
|
||||
|
|
6
spec/fixtures/module/locale-compare.js
vendored
6
spec/fixtures/module/locale-compare.js
vendored
|
@ -2,6 +2,6 @@ process.on('message', function () {
|
|||
process.send([
|
||||
'a'.localeCompare('a'),
|
||||
'ä'.localeCompare('z', 'de'),
|
||||
'ä'.localeCompare('a', 'sv', { sensitivity: 'base' }),
|
||||
]);
|
||||
});
|
||||
'ä'.localeCompare('a', 'sv', { sensitivity: 'base' })
|
||||
])
|
||||
})
|
||||
|
|
4
spec/fixtures/module/original-fs.js
vendored
4
spec/fixtures/module/original-fs.js
vendored
|
@ -1,3 +1,3 @@
|
|||
process.on('message', function () {
|
||||
process.send(typeof require('original-fs'));
|
||||
});
|
||||
process.send(typeof require('original-fs'))
|
||||
})
|
||||
|
|
6
spec/fixtures/module/ping.js
vendored
6
spec/fixtures/module/ping.js
vendored
|
@ -1,4 +1,4 @@
|
|||
process.on('message', function (msg) {
|
||||
process.send(msg);
|
||||
process.exit(0);
|
||||
});
|
||||
process.send(msg)
|
||||
process.exit(0)
|
||||
})
|
||||
|
|
6
spec/fixtures/module/preload-ipc.js
vendored
6
spec/fixtures/module/preload-ipc.js
vendored
|
@ -1,4 +1,4 @@
|
|||
var ipcRenderer = require('electron').ipcRenderer;
|
||||
var ipcRenderer = require('electron').ipcRenderer
|
||||
ipcRenderer.on('ping', function (event, message) {
|
||||
ipcRenderer.sendToHost('pong', message);
|
||||
});
|
||||
ipcRenderer.sendToHost('pong', message)
|
||||
})
|
||||
|
|
6
spec/fixtures/module/preload-node-off.js
vendored
6
spec/fixtures/module/preload-node-off.js
vendored
|
@ -1,7 +1,7 @@
|
|||
setImmediate(function () {
|
||||
try {
|
||||
console.log([typeof process, typeof setImmediate, typeof global].join(' '));
|
||||
console.log([typeof process, typeof setImmediate, typeof global].join(' '))
|
||||
} catch (e) {
|
||||
console.log(e.message);
|
||||
console.log(e.message)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
|
2
spec/fixtures/module/preload.js
vendored
2
spec/fixtures/module/preload.js
vendored
|
@ -1 +1 @@
|
|||
console.log([typeof require, typeof module, typeof process].join(' '));
|
||||
console.log([typeof require, typeof module, typeof process].join(' '))
|
||||
|
|
8
spec/fixtures/module/print_name.js
vendored
8
spec/fixtures/module/print_name.js
vendored
|
@ -1,7 +1,7 @@
|
|||
exports.print = function (obj) {
|
||||
return obj.constructor.name;
|
||||
};
|
||||
return obj.constructor.name
|
||||
}
|
||||
|
||||
exports.echo = function (obj) {
|
||||
return obj;
|
||||
};
|
||||
return obj
|
||||
}
|
||||
|
|
6
spec/fixtures/module/process_args.js
vendored
6
spec/fixtures/module/process_args.js
vendored
|
@ -1,4 +1,4 @@
|
|||
process.on('message', function () {
|
||||
process.send(process.argv);
|
||||
process.exit(0);
|
||||
});
|
||||
process.send(process.argv)
|
||||
process.exit(0)
|
||||
})
|
||||
|
|
6
spec/fixtures/module/promise.js
vendored
6
spec/fixtures/module/promise.js
vendored
|
@ -1,5 +1,5 @@
|
|||
exports.twicePromise = function (promise) {
|
||||
return promise.then(function (value) {
|
||||
return value * 2;
|
||||
});
|
||||
};
|
||||
return value * 2
|
||||
})
|
||||
}
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue