Remove extra newlines around comments
This commit is contained in:
parent
990dc30e8d
commit
030d2a843c
40 changed files with 103 additions and 425 deletions
|
@ -53,9 +53,7 @@ app.getAppPath = function() {
|
||||||
return appPath;
|
return appPath;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Routes the events to webContents.
|
// Routes the events to webContents.
|
||||||
|
|
||||||
ref1 = ['login', 'certificate-error', 'select-client-certificate'];
|
ref1 = ['login', 'certificate-error', 'select-client-certificate'];
|
||||||
fn = function(name) {
|
fn = function(name) {
|
||||||
return app.on(name, function() {
|
return app.on(name, function() {
|
||||||
|
@ -69,7 +67,6 @@ for (i = 0, len = ref1.length; i < len; i++) {
|
||||||
fn(name);
|
fn(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Deprecated.
|
// Deprecated.
|
||||||
|
|
||||||
app.getHomeDir = deprecate('app.getHomeDir', 'app.getPath', function() {
|
app.getHomeDir = deprecate('app.getHomeDir', 'app.getPath', function() {
|
||||||
|
@ -108,9 +105,7 @@ deprecate.event(app, 'activate-with-no-open-windows', 'activate', function(event
|
||||||
|
|
||||||
deprecate.event(app, 'select-certificate', 'select-client-certificate');
|
deprecate.event(app, 'select-certificate', 'select-client-certificate');
|
||||||
|
|
||||||
|
|
||||||
// Wrappers for native classes.
|
// Wrappers for native classes.
|
||||||
|
|
||||||
wrapDownloadItem = function(downloadItem) {
|
wrapDownloadItem = function(downloadItem) {
|
||||||
|
|
||||||
// downloadItem is an EventEmitter.
|
// downloadItem is an EventEmitter.
|
||||||
|
@ -125,7 +120,5 @@ wrapDownloadItem = function(downloadItem) {
|
||||||
|
|
||||||
downloadItemBindings._setWrapDownloadItem(wrapDownloadItem);
|
downloadItemBindings._setWrapDownloadItem(wrapDownloadItem);
|
||||||
|
|
||||||
|
|
||||||
// Only one App object pemitted.
|
// Only one App object pemitted.
|
||||||
|
|
||||||
module.exports = app;
|
module.exports = app;
|
||||||
|
|
|
@ -4,11 +4,7 @@ deprecate = require('electron').deprecate;
|
||||||
|
|
||||||
autoUpdater = process.platform === 'win32' ? require('./auto-updater/auto-updater-win') : require('./auto-updater/auto-updater-native');
|
autoUpdater = process.platform === 'win32' ? require('./auto-updater/auto-updater-win') : require('./auto-updater/auto-updater-native');
|
||||||
|
|
||||||
|
|
||||||
// Deprecated.
|
// Deprecated.
|
||||||
|
|
||||||
deprecate.rename(autoUpdater, 'setFeedUrl', 'setFeedURL');
|
deprecate.rename(autoUpdater, 'setFeedUrl', 'setFeedURL');
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
module.exports = autoUpdater;
|
module.exports = autoUpdater;
|
||||||
|
|
|
@ -61,16 +61,12 @@ spawnUpdate = function(args, detached, callback) {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Start an instance of the installed app.
|
// Start an instance of the installed app.
|
||||||
|
|
||||||
exports.processStart = function(callback) {
|
exports.processStart = function(callback) {
|
||||||
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.
|
// Download the releases specified by the URL and write new results to stdout.
|
||||||
|
|
||||||
exports.download = function(updateURL, callback) {
|
exports.download = function(updateURL, callback) {
|
||||||
return spawnUpdate(['--download', updateURL], false, function(error, stdout) {
|
return spawnUpdate(['--download', updateURL], false, function(error, stdout) {
|
||||||
var error1, json, ref, ref1, update;
|
var error1, json, ref, ref1, update;
|
||||||
|
@ -91,14 +87,12 @@ exports.download = function(updateURL, callback) {
|
||||||
|
|
||||||
|
|
||||||
// Update the application to the latest remote version specified by URL.
|
// Update the application to the latest remote version specified by URL.
|
||||||
|
|
||||||
exports.update = function(updateURL, callback) {
|
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?
|
// Is the Update.exe installed with the current application?
|
||||||
|
|
||||||
exports.supported = function() {
|
exports.supported = function() {
|
||||||
var error1;
|
var error1;
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -151,7 +151,6 @@ BrowserWindow.fromDevToolsWebContents = function(webContents) {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Helpers.
|
// Helpers.
|
||||||
|
|
||||||
BrowserWindow.prototype.loadURL = function() {
|
BrowserWindow.prototype.loadURL = function() {
|
||||||
|
@ -198,7 +197,6 @@ BrowserWindow.prototype.inspectServiceWorker = function() {
|
||||||
return this.webContents.inspectServiceWorker();
|
return this.webContents.inspectServiceWorker();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Deprecated.
|
// Deprecated.
|
||||||
|
|
||||||
deprecate.member(BrowserWindow, 'undo', 'webContents');
|
deprecate.member(BrowserWindow, 'undo', 'webContents');
|
||||||
|
|
|
@ -23,14 +23,12 @@ messageBoxOptions = {
|
||||||
|
|
||||||
parseArgs = function(window, options, callback) {
|
parseArgs = function(window, options, callback) {
|
||||||
if (!(window === null || (window != null ? window.constructor : void 0) === BrowserWindow)) {
|
if (!(window === null || (window != null ? window.constructor : void 0) === BrowserWindow)) {
|
||||||
|
|
||||||
// Shift.
|
// Shift.
|
||||||
callback = options;
|
callback = options;
|
||||||
options = window;
|
options = window;
|
||||||
window = null;
|
window = null;
|
||||||
}
|
}
|
||||||
if ((callback == null) && typeof options === 'function') {
|
if ((callback == null) && typeof options === 'function') {
|
||||||
|
|
||||||
// Shift.
|
// Shift.
|
||||||
callback = options;
|
callback = options;
|
||||||
options = null;
|
options = null;
|
||||||
|
@ -165,9 +163,7 @@ module.exports = {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Mark standard asynchronous functions.
|
// Mark standard asynchronous functions.
|
||||||
|
|
||||||
ref1 = ['showMessageBox', 'showOpenDialog', 'showSaveDialog'];
|
ref1 = ['showMessageBox', 'showOpenDialog', 'showSaveDialog'];
|
||||||
for (j = 0, len = ref1.length; j < len; j++) {
|
for (j = 0, len = ref1.length; j < len; j++) {
|
||||||
api = ref1[j];
|
api = ref1[j];
|
||||||
|
|
|
@ -4,7 +4,6 @@ common = require('../../../../common/api/lib/exports/electron');
|
||||||
|
|
||||||
|
|
||||||
// Import common modules.
|
// Import common modules.
|
||||||
|
|
||||||
common.defineProperties(exports);
|
common.defineProperties(exports);
|
||||||
|
|
||||||
Object.defineProperties(exports, {
|
Object.defineProperties(exports, {
|
||||||
|
|
|
@ -2,9 +2,7 @@ var deprecate, ipcMain, ref;
|
||||||
|
|
||||||
ref = require('electron'), deprecate = ref.deprecate, ipcMain = ref.ipcMain;
|
ref = require('electron'), deprecate = ref.deprecate, ipcMain = ref.ipcMain;
|
||||||
|
|
||||||
|
|
||||||
// This module is deprecated, we mirror everything from 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;
|
||||||
|
|
|
@ -4,9 +4,7 @@ v8Util = process.atomBinding('v8_util');
|
||||||
|
|
||||||
nextCommandId = 0;
|
nextCommandId = 0;
|
||||||
|
|
||||||
|
|
||||||
// Maps role to methods of webContents
|
// Maps role to methods of webContents
|
||||||
|
|
||||||
rolesMap = {
|
rolesMap = {
|
||||||
undo: 'undo',
|
undo: 'undo',
|
||||||
redo: 'redo',
|
redo: 'redo',
|
||||||
|
@ -18,9 +16,7 @@ rolesMap = {
|
||||||
close: 'close'
|
close: 'close'
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Maps methods that should be called directly on the BrowserWindow instance
|
// Maps methods that should be called directly on the BrowserWindow instance
|
||||||
|
|
||||||
methodInBrowserWindow = {
|
methodInBrowserWindow = {
|
||||||
minimize: true,
|
minimize: true,
|
||||||
close: true
|
close: true
|
||||||
|
|
|
@ -8,17 +8,11 @@ v8Util = process.atomBinding('v8_util');
|
||||||
|
|
||||||
bindings = process.atomBinding('menu');
|
bindings = process.atomBinding('menu');
|
||||||
|
|
||||||
|
|
||||||
// Automatically generated radio menu item's group id.
|
// Automatically generated radio menu item's group id.
|
||||||
|
|
||||||
nextGroupId = 0;
|
nextGroupId = 0;
|
||||||
|
|
||||||
|
|
||||||
// Search between seperators to find a radio menu item and return its group id,
|
// Search between seperators to find a radio menu item and return its group id,
|
||||||
|
|
||||||
|
|
||||||
// otherwise generate a group id.
|
// otherwise generate a group id.
|
||||||
|
|
||||||
generateGroupId = function(items, pos) {
|
generateGroupId = function(items, pos) {
|
||||||
var i, item, j, k, ref1, ref2, ref3;
|
var i, item, j, k, ref1, ref2, ref3;
|
||||||
if (pos > 0) {
|
if (pos > 0) {
|
||||||
|
@ -45,9 +39,7 @@ generateGroupId = function(items, pos) {
|
||||||
return ++nextGroupId;
|
return ++nextGroupId;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Returns the index of item according to |id|.
|
// Returns the index of item according to |id|.
|
||||||
|
|
||||||
indexOfItemById = function(items, id) {
|
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) {
|
for (i = j = 0, len = items.length; j < len; i = ++j) {
|
||||||
|
@ -59,9 +51,7 @@ indexOfItemById = function(items, id) {
|
||||||
return -1;
|
return -1;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Returns the index of where to insert the item according to |position|.
|
// Returns the index of where to insert the item according to |position|.
|
||||||
|
|
||||||
indexToInsertByPosition = function(items, position) {
|
indexToInsertByPosition = function(items, position) {
|
||||||
var id, insertIndex, query, ref1;
|
var id, insertIndex, query, ref1;
|
||||||
if (!position) {
|
if (!position) {
|
||||||
|
@ -174,7 +164,6 @@ Menu.prototype._init = function() {
|
||||||
|
|
||||||
Menu.prototype.popup = function(window, x, y) {
|
Menu.prototype.popup = function(window, x, y) {
|
||||||
if ((window != null ? window.constructor : void 0) !== BrowserWindow) {
|
if ((window != null ? window.constructor : void 0) !== BrowserWindow) {
|
||||||
|
|
||||||
// Shift.
|
// Shift.
|
||||||
y = x;
|
y = x;
|
||||||
x = window;
|
x = window;
|
||||||
|
@ -210,7 +199,6 @@ Menu.prototype.insert = function(pos, item) {
|
||||||
this.insertSubMenu(pos, item.commandId, item.label, item.submenu);
|
this.insertSubMenu(pos, item.commandId, item.label, item.submenu);
|
||||||
break;
|
break;
|
||||||
case 'radio':
|
case 'radio':
|
||||||
|
|
||||||
// Grouping radio menu items.
|
// 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) {
|
if ((base = this.groupsMap)[name = item.groupId] == null) {
|
||||||
|
@ -261,7 +249,6 @@ Menu.prototype.insert = function(pos, item) {
|
||||||
|
|
||||||
|
|
||||||
// Force menuWillShow to be called
|
// Force menuWillShow to be called
|
||||||
|
|
||||||
Menu.prototype._callMenuWillShow = function() {
|
Menu.prototype._callMenuWillShow = function() {
|
||||||
var item, j, len, ref1, ref2, results;
|
var item, j, len, ref1, ref2, results;
|
||||||
if ((ref1 = this.delegate) != null) {
|
if ((ref1 = this.delegate) != null) {
|
||||||
|
@ -323,7 +310,6 @@ Menu.buildFromTemplate = function(template) {
|
||||||
if (item.position) {
|
if (item.position) {
|
||||||
insertIndex = indexToInsertByPosition(positionedTemplate, item.position);
|
insertIndex = indexToInsertByPosition(positionedTemplate, item.position);
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
// If no |position| is specified, insert after last item.
|
// If no |position| is specified, insert after last item.
|
||||||
insertIndex++;
|
insertIndex++;
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,9 +3,7 @@ var NavigationController, ipcMain,
|
||||||
|
|
||||||
ipcMain = require('electron').ipcMain;
|
ipcMain = require('electron').ipcMain;
|
||||||
|
|
||||||
|
|
||||||
// The history operation in renderer is redirected to browser.
|
// The history operation in renderer is redirected to browser.
|
||||||
|
|
||||||
ipcMain.on('ATOM_SHELL_NAVIGATION_CONTROLLER', function() {
|
ipcMain.on('ATOM_SHELL_NAVIGATION_CONTROLLER', function() {
|
||||||
var args, event, method, ref;
|
var args, event, method, ref;
|
||||||
event = arguments[0], method = arguments[1], args = 3 <= arguments.length ? slice.call(arguments, 2) : [];
|
event = arguments[0], method = arguments[1], args = 3 <= arguments.length ? slice.call(arguments, 2) : [];
|
||||||
|
|
|
@ -8,9 +8,7 @@ if (!app.isReady()) {
|
||||||
|
|
||||||
protocol = process.atomBinding('protocol').protocol;
|
protocol = process.atomBinding('protocol').protocol;
|
||||||
|
|
||||||
|
|
||||||
// Warn about removed APIs.
|
// Warn about removed APIs.
|
||||||
|
|
||||||
logAndThrow = function(callback, message) {
|
logAndThrow = function(callback, message) {
|
||||||
console.error(message);
|
console.error(message);
|
||||||
if (callback) {
|
if (callback) {
|
||||||
|
|
|
@ -6,9 +6,7 @@ bindings = process.atomBinding('session');
|
||||||
|
|
||||||
PERSIST_PERFIX = 'persist:';
|
PERSIST_PERFIX = 'persist:';
|
||||||
|
|
||||||
|
|
||||||
// Returns the Session from |partition| string.
|
// Returns the Session from |partition| string.
|
||||||
|
|
||||||
exports.fromPartition = function(partition) {
|
exports.fromPartition = function(partition) {
|
||||||
if (partition == null) {
|
if (partition == null) {
|
||||||
partition = '';
|
partition = '';
|
||||||
|
@ -23,9 +21,7 @@ exports.fromPartition = function(partition) {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Returns the default session.
|
// Returns the default session.
|
||||||
|
|
||||||
Object.defineProperty(exports, 'defaultSession', {
|
Object.defineProperty(exports, 'defaultSession', {
|
||||||
enumerable: true,
|
enumerable: true,
|
||||||
get: function() {
|
get: function() {
|
||||||
|
@ -34,7 +30,6 @@ Object.defineProperty(exports, 'defaultSession', {
|
||||||
});
|
});
|
||||||
|
|
||||||
wrapSession = function(session) {
|
wrapSession = function(session) {
|
||||||
|
|
||||||
// session is an EventEmitter.
|
// session is an EventEmitter.
|
||||||
return session.__proto__ = EventEmitter.prototype;
|
return session.__proto__ = EventEmitter.prototype;
|
||||||
};
|
};
|
||||||
|
|
|
@ -9,7 +9,6 @@ Tray = process.atomBinding('tray').Tray;
|
||||||
Tray.prototype.__proto__ = EventEmitter.prototype;
|
Tray.prototype.__proto__ = EventEmitter.prototype;
|
||||||
|
|
||||||
Tray.prototype._init = function() {
|
Tray.prototype._init = function() {
|
||||||
|
|
||||||
// Deprecated.
|
// Deprecated.
|
||||||
deprecate.rename(this, 'popContextMenu', 'popUpContextMenu');
|
deprecate.rename(this, 'popContextMenu', 'popUpContextMenu');
|
||||||
deprecate.event(this, 'clicked', 'click');
|
deprecate.event(this, 'clicked', 'click');
|
||||||
|
|
|
@ -65,7 +65,6 @@ const webFrameMethods = [
|
||||||
];
|
];
|
||||||
|
|
||||||
wrapWebContents = function(webContents) {
|
wrapWebContents = function(webContents) {
|
||||||
|
|
||||||
// webContents is an EventEmitter.
|
// webContents is an EventEmitter.
|
||||||
var controller, method, name, ref1;
|
var controller, method, name, ref1;
|
||||||
webContents.__proto__ = EventEmitter.prototype;
|
webContents.__proto__ = EventEmitter.prototype;
|
||||||
|
|
|
@ -8,9 +8,7 @@ path = require('path');
|
||||||
|
|
||||||
url = require('url');
|
url = require('url');
|
||||||
|
|
||||||
|
|
||||||
// Mapping between hostname and file path.
|
// Mapping between hostname and file path.
|
||||||
|
|
||||||
hostPathMap = {};
|
hostPathMap = {};
|
||||||
|
|
||||||
hostPathMapNextKey = 0;
|
hostPathMapNextKey = 0;
|
||||||
|
@ -26,9 +24,7 @@ getPathForHost = function(host) {
|
||||||
return hostPathMap[host];
|
return hostPathMap[host];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Cache extensionInfo.
|
// Cache extensionInfo.
|
||||||
|
|
||||||
extensionInfoMap = {};
|
extensionInfoMap = {};
|
||||||
|
|
||||||
getExtensionInfoFromPath = function(srcDirectory) {
|
getExtensionInfoFromPath = function(srcDirectory) {
|
||||||
|
@ -54,16 +50,11 @@ getExtensionInfoFromPath = function(srcDirectory) {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// The loaded extensions cache and its persistent path.
|
// The loaded extensions cache and its persistent path.
|
||||||
|
|
||||||
loadedExtensions = null;
|
loadedExtensions = null;
|
||||||
|
|
||||||
loadedExtensionsPath = null;
|
loadedExtensionsPath = null;
|
||||||
|
|
||||||
|
|
||||||
// Persistent loaded extensions.
|
// Persistent loaded extensions.
|
||||||
|
|
||||||
app = electron.app;
|
app = electron.app;
|
||||||
|
|
||||||
app.on('will-quit', function() {
|
app.on('will-quit', function() {
|
||||||
|
@ -83,9 +74,7 @@ app.on('will-quit', function() {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// We can not use protocol or BrowserWindow until app is ready.
|
// We can not use protocol or BrowserWindow until app is ready.
|
||||||
|
|
||||||
app.once('ready', function() {
|
app.once('ready', function() {
|
||||||
var BrowserWindow, chromeExtensionHandler, e, error1, i, init, len, protocol, srcDirectory;
|
var BrowserWindow, chromeExtensionHandler, e, error1, i, init, len, protocol, srcDirectory;
|
||||||
protocol = electron.protocol, BrowserWindow = electron.BrowserWindow;
|
protocol = electron.protocol, BrowserWindow = electron.BrowserWindow;
|
||||||
|
|
|
@ -8,9 +8,7 @@ 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.
|
// A queue for holding all requests from renderer process.
|
||||||
|
|
||||||
requestsQueue = [];
|
requestsQueue = [];
|
||||||
|
|
||||||
ipcMain.on('ATOM_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', function(event, captureWindow, captureScreen, thumbnailSize, id) {
|
ipcMain.on('ATOM_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', function(event, captureWindow, captureScreen, thumbnailSize, id) {
|
||||||
|
@ -37,7 +35,6 @@ ipcMain.on('ATOM_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', function(event, captureW
|
||||||
});
|
});
|
||||||
|
|
||||||
desktopCapturer.emit = function(event, name, sources) {
|
desktopCapturer.emit = function(event, name, sources) {
|
||||||
|
|
||||||
// Receiving sources result from main process, now send them back to renderer.
|
// Receiving sources result from main process, now send them back to renderer.
|
||||||
var captureScreen, captureWindow, handledRequest, i, len, ref, ref1, ref2, request, result, source, thumbnailSize, unhandledRequestsQueue;
|
var captureScreen, captureWindow, handledRequest, i, len, ref, ref1, ref2, request, result, source, thumbnailSize, unhandledRequestsQueue;
|
||||||
handledRequest = requestsQueue.shift(0);
|
handledRequest = requestsQueue.shift(0);
|
||||||
|
|
|
@ -3,9 +3,7 @@ var attachGuest, createGuest, destroyGuest, embedderElementsMap, getNextInstance
|
||||||
|
|
||||||
ref = require('electron'), ipcMain = ref.ipcMain, webContents = ref.webContents;
|
ref = require('electron'), ipcMain = ref.ipcMain, webContents = ref.webContents;
|
||||||
|
|
||||||
|
|
||||||
// Doesn't exist in early initialization.
|
// Doesn't exist in early initialization.
|
||||||
|
|
||||||
webViewManager = null;
|
webViewManager = null;
|
||||||
|
|
||||||
supportedWebViewEvents = ['load-commit', 'did-finish-load', 'did-fail-load', 'did-frame-finish-load', 'did-start-loading', 'did-stop-loading', 'did-get-response-details', 'did-get-redirect-request', 'dom-ready', 'console-message', 'devtools-opened', 'devtools-closed', 'devtools-focused', 'new-window', 'will-navigate', 'did-navigate', 'did-navigate-in-page', 'close', 'crashed', 'gpu-crashed', 'plugin-crashed', 'destroyed', 'page-title-updated', 'page-favicon-updated', 'enter-html-full-screen', 'leave-html-full-screen', 'media-started-playing', 'media-paused', 'found-in-page', 'did-change-theme-color'];
|
supportedWebViewEvents = ['load-commit', 'did-finish-load', 'did-fail-load', 'did-frame-finish-load', 'did-start-loading', 'did-stop-loading', 'did-get-response-details', 'did-get-redirect-request', 'dom-ready', 'console-message', 'devtools-opened', 'devtools-closed', 'devtools-focused', 'new-window', 'will-navigate', 'did-navigate', 'did-navigate-in-page', 'close', 'crashed', 'gpu-crashed', 'plugin-crashed', 'destroyed', 'page-title-updated', 'page-favicon-updated', 'enter-html-full-screen', 'leave-html-full-screen', 'media-started-playing', 'media-paused', 'found-in-page', 'did-change-theme-color'];
|
||||||
|
@ -18,23 +16,17 @@ embedderElementsMap = {};
|
||||||
|
|
||||||
reverseEmbedderElementsMap = {};
|
reverseEmbedderElementsMap = {};
|
||||||
|
|
||||||
|
|
||||||
// Moves the last element of array to the first one.
|
// Moves the last element of array to the first one.
|
||||||
|
|
||||||
moveLastToFirst = function(list) {
|
moveLastToFirst = function(list) {
|
||||||
return list.unshift(list.pop());
|
return list.unshift(list.pop());
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Generate guestInstanceId.
|
// Generate guestInstanceId.
|
||||||
|
|
||||||
getNextInstanceId = function(webContents) {
|
getNextInstanceId = function(webContents) {
|
||||||
return ++nextInstanceId;
|
return ++nextInstanceId;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Create a new guest instance.
|
// Create a new guest instance.
|
||||||
|
|
||||||
createGuest = function(embedder, params) {
|
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) {
|
if (webViewManager == null) {
|
||||||
|
@ -146,9 +138,7 @@ createGuest = function(embedder, params) {
|
||||||
return id;
|
return id;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Attach the guest to an element of embedder.
|
// Attach the guest to an element of embedder.
|
||||||
|
|
||||||
attachGuest = function(embedder, elementInstanceId, guestInstanceId, params) {
|
attachGuest = function(embedder, elementInstanceId, guestInstanceId, params) {
|
||||||
var guest, key, oldGuestInstanceId, ref1, webPreferences;
|
var guest, key, oldGuestInstanceId, ref1, webPreferences;
|
||||||
guest = guestInstances[guestInstanceId].guest;
|
guest = guestInstances[guestInstanceId].guest;
|
||||||
|
@ -182,9 +172,7 @@ attachGuest = function(embedder, elementInstanceId, guestInstanceId, params) {
|
||||||
return reverseEmbedderElementsMap[guestInstanceId] = key;
|
return reverseEmbedderElementsMap[guestInstanceId] = key;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Destroy an existing guest instance.
|
// Destroy an existing guest instance.
|
||||||
|
|
||||||
destroyGuest = function(embedder, id) {
|
destroyGuest = function(embedder, id) {
|
||||||
var key;
|
var key;
|
||||||
webViewManager.removeGuest(embedder, id);
|
webViewManager.removeGuest(embedder, id);
|
||||||
|
@ -219,17 +207,13 @@ ipcMain.on('ATOM_SHELL_GUEST_VIEW_MANAGER_SET_ALLOW_TRANSPARENCY', function(even
|
||||||
return (ref1 = guestInstances[id]) != null ? ref1.guest.setAllowTransparency(allowtransparency) : void 0;
|
return (ref1 = guestInstances[id]) != null ? ref1.guest.setAllowTransparency(allowtransparency) : void 0;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// Returns WebContents from its guest id.
|
// Returns WebContents from its guest id.
|
||||||
|
|
||||||
exports.getGuest = function(id) {
|
exports.getGuest = function(id) {
|
||||||
var ref1;
|
var ref1;
|
||||||
return (ref1 = guestInstances[id]) != null ? ref1.guest : void 0;
|
return (ref1 = guestInstances[id]) != null ? ref1.guest : void 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Returns the embedder of the guest.
|
// Returns the embedder of the guest.
|
||||||
|
|
||||||
exports.getEmbedder = function(id) {
|
exports.getEmbedder = function(id) {
|
||||||
var ref1;
|
var ref1;
|
||||||
return (ref1 = guestInstances[id]) != null ? ref1.embedder : void 0;
|
return (ref1 = guestInstances[id]) != null ? ref1.embedder : void 0;
|
||||||
|
|
|
@ -8,9 +8,7 @@ v8Util = process.atomBinding('v8_util');
|
||||||
|
|
||||||
frameToGuest = {};
|
frameToGuest = {};
|
||||||
|
|
||||||
|
|
||||||
// Copy attribute of |parent| to |child| if it is not defined in |child|.
|
// Copy attribute of |parent| to |child| if it is not defined in |child|.
|
||||||
|
|
||||||
mergeOptions = function(child, parent) {
|
mergeOptions = function(child, parent) {
|
||||||
var key, value;
|
var key, value;
|
||||||
for (key in parent) {
|
for (key in parent) {
|
||||||
|
@ -27,9 +25,7 @@ mergeOptions = function(child, parent) {
|
||||||
return child;
|
return child;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Merge |options| with the |embedder|'s window's options.
|
// Merge |options| with the |embedder|'s window's options.
|
||||||
|
|
||||||
mergeBrowserWindowOptions = function(embedder, options) {
|
mergeBrowserWindowOptions = function(embedder, options) {
|
||||||
if (embedder.browserWindowOptions != null) {
|
if (embedder.browserWindowOptions != null) {
|
||||||
|
|
||||||
|
@ -46,9 +42,7 @@ mergeBrowserWindowOptions = function(embedder, options) {
|
||||||
return options;
|
return options;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Create a new guest created by |embedder| with |options|.
|
// Create a new guest created by |embedder| with |options|.
|
||||||
|
|
||||||
createGuest = function(embedder, url, frameName, options) {
|
createGuest = function(embedder, url, frameName, options) {
|
||||||
var closedByEmbedder, closedByUser, guest, guestId, ref1;
|
var closedByEmbedder, closedByUser, guest, guestId, ref1;
|
||||||
guest = frameToGuest[frameName];
|
guest = frameToGuest[frameName];
|
||||||
|
@ -89,9 +83,7 @@ createGuest = function(embedder, url, frameName, options) {
|
||||||
return guest.id;
|
return guest.id;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Routed window.open messages.
|
// Routed window.open messages.
|
||||||
|
|
||||||
ipcMain.on('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_OPEN', function() {
|
ipcMain.on('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_OPEN', function() {
|
||||||
var args, event, frameName, options, url;
|
var args, event, frameName, options, url;
|
||||||
event = arguments[0], args = 2 <= arguments.length ? slice.call(arguments, 1) : [];
|
event = arguments[0], args = 2 <= arguments.length ? slice.call(arguments, 1) : [];
|
||||||
|
|
|
@ -9,12 +9,8 @@ util = require('util');
|
||||||
|
|
||||||
Module = require('module');
|
Module = require('module');
|
||||||
|
|
||||||
|
|
||||||
// We modified the original process.argv to let node.js load the atom.js,
|
// We modified the original process.argv to let node.js load the atom.js,
|
||||||
|
|
||||||
|
|
||||||
// we need to restore it here.
|
// we need to restore it here.
|
||||||
|
|
||||||
process.argv.splice(1, 1);
|
process.argv.splice(1, 1);
|
||||||
|
|
||||||
// Clear search paths.
|
// Clear search paths.
|
||||||
|
@ -62,9 +58,7 @@ if (process.platform === 'win32') {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Don't quit on fatal error.
|
// Don't quit on fatal error.
|
||||||
|
|
||||||
process.on('uncaughtException', function(error) {
|
process.on('uncaughtException', function(error) {
|
||||||
|
|
||||||
// Do nothing if the user has a custom uncaught exception handler.
|
// Do nothing if the user has a custom uncaught exception handler.
|
||||||
|
@ -80,35 +74,26 @@ process.on('uncaughtException', function(error) {
|
||||||
return dialog.showErrorBox('A JavaScript error occurred in the main process', message);
|
return dialog.showErrorBox('A JavaScript error occurred in the main process', message);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// Emit 'exit' event on quit.
|
// Emit 'exit' event on quit.
|
||||||
|
|
||||||
app = require('electron').app;
|
app = require('electron').app;
|
||||||
|
|
||||||
app.on('quit', function(event, exitCode) {
|
app.on('quit', function(event, exitCode) {
|
||||||
return process.emit('exit', exitCode);
|
return process.emit('exit', exitCode);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// Map process.exit to app.exit, which quits gracefully.
|
// Map process.exit to app.exit, which quits gracefully.
|
||||||
|
|
||||||
process.exit = app.exit;
|
process.exit = app.exit;
|
||||||
|
|
||||||
|
|
||||||
// Load the RPC server.
|
// Load the RPC server.
|
||||||
|
|
||||||
require('./rpc-server');
|
require('./rpc-server');
|
||||||
|
|
||||||
|
|
||||||
// Load the guest view manager.
|
// 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.
|
// Now we try to load app's package.json.
|
||||||
|
|
||||||
packageJson = null;
|
packageJson = null;
|
||||||
|
|
||||||
searchPaths = ['app', 'app.asar', 'default_app'];
|
searchPaths = ['app', 'app.asar', 'default_app'];
|
||||||
|
@ -132,61 +117,43 @@ if (packageJson == null) {
|
||||||
throw new Error("Unable to find a valid app");
|
throw new Error("Unable to find a valid app");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Set application's version.
|
// Set application's version.
|
||||||
|
|
||||||
if (packageJson.version != null) {
|
if (packageJson.version != null) {
|
||||||
app.setVersion(packageJson.version);
|
app.setVersion(packageJson.version);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Set application's name.
|
// Set application's name.
|
||||||
|
|
||||||
if (packageJson.productName != null) {
|
if (packageJson.productName != null) {
|
||||||
app.setName(packageJson.productName);
|
app.setName(packageJson.productName);
|
||||||
} else if (packageJson.name != null) {
|
} else if (packageJson.name != null) {
|
||||||
app.setName(packageJson.name);
|
app.setName(packageJson.name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Set application's desktop name.
|
// Set application's desktop name.
|
||||||
|
|
||||||
if (packageJson.desktopName != null) {
|
if (packageJson.desktopName != null) {
|
||||||
app.setDesktopName(packageJson.desktopName);
|
app.setDesktopName(packageJson.desktopName);
|
||||||
} else {
|
} else {
|
||||||
app.setDesktopName((app.getName()) + ".desktop");
|
app.setDesktopName((app.getName()) + ".desktop");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Chrome 42 disables NPAPI plugins by default, reenable them here
|
// 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.
|
// 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.
|
// Load the chrome extension support.
|
||||||
|
|
||||||
require('./chrome-extension');
|
require('./chrome-extension');
|
||||||
|
|
||||||
|
|
||||||
// Load internal desktop-capturer module.
|
// Load internal desktop-capturer module.
|
||||||
|
|
||||||
require('./desktop-capturer');
|
require('./desktop-capturer');
|
||||||
|
|
||||||
|
|
||||||
// Set main startup script of the app.
|
// Set main startup script of the app.
|
||||||
|
|
||||||
mainStartupScript = packageJson.main || 'index.js';
|
mainStartupScript = packageJson.main || 'index.js';
|
||||||
|
|
||||||
|
|
||||||
// Finally load app's main.js and transfer control to C++.
|
// 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);
|
||||||
|
|
|
@ -65,7 +65,6 @@ ObjectsRegistry = (function(superClass) {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Clear all references to objects refrenced by the WebContents.
|
// Clear all references to objects refrenced by the WebContents.
|
||||||
ObjectsRegistry.prototype.clear = function(webContentsId) {
|
ObjectsRegistry.prototype.clear = function(webContentsId) {
|
||||||
var count, id, ref;
|
var count, id, ref;
|
||||||
|
@ -81,7 +80,6 @@ ObjectsRegistry = (function(superClass) {
|
||||||
return delete this.owners[webContentsId];
|
return delete this.owners[webContentsId];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Private: Saves the object into storage and assigns an ID for it.
|
// Private: Saves the object into storage and assigns an ID for it.
|
||||||
ObjectsRegistry.prototype.saveToStorage = function(object) {
|
ObjectsRegistry.prototype.saveToStorage = function(object) {
|
||||||
var id;
|
var id;
|
||||||
|
@ -98,7 +96,6 @@ ObjectsRegistry = (function(superClass) {
|
||||||
return id;
|
return id;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Private: Dereference the object from store.
|
// Private: Dereference the object from store.
|
||||||
ObjectsRegistry.prototype.dereference = function(id, count) {
|
ObjectsRegistry.prototype.dereference = function(id, count) {
|
||||||
var pointer;
|
var pointer;
|
||||||
|
|
|
@ -13,9 +13,7 @@ v8Util = process.atomBinding('v8_util');
|
||||||
|
|
||||||
IDWeakMap = process.atomBinding('id_weak_map').IDWeakMap;
|
IDWeakMap = process.atomBinding('id_weak_map').IDWeakMap;
|
||||||
|
|
||||||
|
|
||||||
// Convert a real value into meta data.
|
// Convert a real value into meta data.
|
||||||
|
|
||||||
valueToMeta = function(sender, value, optimizeSimpleObject) {
|
valueToMeta = function(sender, value, optimizeSimpleObject) {
|
||||||
var el, field, i, len, meta, name;
|
var el, field, i, len, meta, name;
|
||||||
if (optimizeSimpleObject == null) {
|
if (optimizeSimpleObject == null) {
|
||||||
|
@ -98,9 +96,7 @@ valueToMeta = function(sender, value, optimizeSimpleObject) {
|
||||||
return meta;
|
return meta;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Convert object to meta by value.
|
// Convert object to meta by value.
|
||||||
|
|
||||||
plainObjectToMeta = function(obj) {
|
plainObjectToMeta = function(obj) {
|
||||||
return Object.getOwnPropertyNames(obj).map(function(name) {
|
return Object.getOwnPropertyNames(obj).map(function(name) {
|
||||||
return {
|
return {
|
||||||
|
@ -110,9 +106,7 @@ plainObjectToMeta = function(obj) {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Convert Error into meta data.
|
// Convert Error into meta data.
|
||||||
|
|
||||||
exceptionToMeta = function(error) {
|
exceptionToMeta = function(error) {
|
||||||
return {
|
return {
|
||||||
type: 'exception',
|
type: 'exception',
|
||||||
|
@ -121,9 +115,7 @@ exceptionToMeta = function(error) {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Convert array of meta data from renderer into array of real values.
|
// Convert array of meta data from renderer into array of real values.
|
||||||
|
|
||||||
unwrapArgs = function(sender, args) {
|
unwrapArgs = function(sender, args) {
|
||||||
var metaToValue;
|
var metaToValue;
|
||||||
metaToValue = function(meta) {
|
metaToValue = function(meta) {
|
||||||
|
@ -157,7 +149,6 @@ unwrapArgs = function(sender, args) {
|
||||||
return returnValue;
|
return returnValue;
|
||||||
};
|
};
|
||||||
case 'function':
|
case 'function':
|
||||||
|
|
||||||
// Cache the callbacks in renderer.
|
// Cache the callbacks in renderer.
|
||||||
if (!sender.callbacks) {
|
if (!sender.callbacks) {
|
||||||
sender.callbacks = new IDWeakMap;
|
sender.callbacks = new IDWeakMap;
|
||||||
|
@ -221,7 +212,6 @@ callFunction = function(event, func, caller, args) {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Send by BrowserWindow when its render view is deleted.
|
// Send by BrowserWindow when its render view is deleted.
|
||||||
process.on('ATOM_BROWSER_RELEASE_RENDER_VIEW', function(id) {
|
process.on('ATOM_BROWSER_RELEASE_RENDER_VIEW', function(id) {
|
||||||
return objectsRegistry.clear(id);
|
return objectsRegistry.clear(id);
|
||||||
|
|
|
@ -10,7 +10,6 @@ module.exports = CallbacksRegistry = (function() {
|
||||||
}
|
}
|
||||||
|
|
||||||
CallbacksRegistry.prototype.add = function(callback) {
|
CallbacksRegistry.prototype.add = function(callback) {
|
||||||
|
|
||||||
// The callback is already added.
|
// The callback is already added.
|
||||||
var filenameAndLine, id, location, match, ref, regexp, stackString, x;
|
var filenameAndLine, id, location, match, ref, regexp, stackString, x;
|
||||||
id = v8Util.getHiddenValue(callback, 'callbackId');
|
id = v8Util.getHiddenValue(callback, 'callbackId');
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
if (process.platform === 'linux' && process.type === 'renderer') {
|
if (process.platform === 'linux' && process.type === 'renderer') {
|
||||||
|
|
||||||
// On Linux we could not access clipboard in renderer process.
|
// On Linux we could not access clipboard in renderer process.
|
||||||
module.exports = require('electron').remote.clipboard;
|
module.exports = require('electron').remote.clipboard;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
// Deprecate a method.
|
// Deprecate a method.
|
||||||
var deprecate,
|
var deprecate,
|
||||||
slice = [].slice;
|
slice = [].slice;
|
||||||
|
@ -15,9 +14,7 @@ deprecate = function(oldName, newName, fn) {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// The method is renamed.
|
// The method is renamed.
|
||||||
|
|
||||||
deprecate.rename = function(object, oldName, newName) {
|
deprecate.rename = function(object, oldName, newName) {
|
||||||
var newMethod, warned;
|
var newMethod, warned;
|
||||||
warned = false;
|
warned = false;
|
||||||
|
@ -35,9 +32,7 @@ deprecate.rename = function(object, oldName, newName) {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Forward the method to member.
|
// Forward the method to member.
|
||||||
|
|
||||||
deprecate.member = function(object, method, member) {
|
deprecate.member = function(object, method, member) {
|
||||||
var warned;
|
var warned;
|
||||||
warned = false;
|
warned = false;
|
||||||
|
@ -50,9 +45,7 @@ deprecate.member = function(object, method, member) {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Deprecate a property.
|
// Deprecate a property.
|
||||||
|
|
||||||
deprecate.property = function(object, property, method) {
|
deprecate.property = function(object, property, method) {
|
||||||
return Object.defineProperty(object, property, {
|
return Object.defineProperty(object, property, {
|
||||||
get: function() {
|
get: function() {
|
||||||
|
@ -67,9 +60,7 @@ deprecate.property = function(object, property, method) {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Deprecate an event.
|
// Deprecate an event.
|
||||||
|
|
||||||
deprecate.event = function(emitter, oldName, newName, fn) {
|
deprecate.event = function(emitter, oldName, newName, fn) {
|
||||||
var warned;
|
var warned;
|
||||||
warned = false;
|
warned = false;
|
||||||
|
@ -92,16 +83,12 @@ deprecate.event = function(emitter, oldName, newName, fn) {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Print deprecation warning.
|
// Print deprecation warning.
|
||||||
|
|
||||||
deprecate.warn = function(oldName, newName) {
|
deprecate.warn = function(oldName, newName) {
|
||||||
return deprecate.log(oldName + " is deprecated. Use " + newName + " instead.");
|
return deprecate.log(oldName + " is deprecated. Use " + newName + " instead.");
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Print deprecation message.
|
// Print deprecation message.
|
||||||
|
|
||||||
deprecate.log = function(message) {
|
deprecate.log = function(message) {
|
||||||
if (process.throwDeprecation) {
|
if (process.throwDeprecation) {
|
||||||
throw new Error(message);
|
throw new Error(message);
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
// Do not expose the internal modules to `require`.
|
// Do not expose the internal modules to `require`.
|
||||||
exports.hideInternalModules = function() {
|
exports.hideInternalModules = function() {
|
||||||
var globalPaths;
|
var globalPaths;
|
||||||
|
@ -10,9 +9,7 @@ exports.hideInternalModules = function() {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Attaches properties to |exports|.
|
// Attaches properties to |exports|.
|
||||||
|
|
||||||
exports.defineProperties = function(exports) {
|
exports.defineProperties = function(exports) {
|
||||||
return Object.defineProperties(exports, {
|
return Object.defineProperties(exports, {
|
||||||
|
|
||||||
|
|
|
@ -4,9 +4,7 @@ deprecate = require('electron').deprecate;
|
||||||
|
|
||||||
nativeImage = process.atomBinding('native_image');
|
nativeImage = process.atomBinding('native_image');
|
||||||
|
|
||||||
|
|
||||||
// Deprecated.
|
// Deprecated.
|
||||||
|
|
||||||
deprecate.rename(nativeImage, 'createFromDataUrl', 'createFromDataURL');
|
deprecate.rename(nativeImage, 'createFromDataUrl', 'createFromDataURL');
|
||||||
|
|
||||||
module.exports = nativeImage;
|
module.exports = nativeImage;
|
||||||
|
|
|
@ -10,9 +10,7 @@ path = require('path');
|
||||||
|
|
||||||
util = require('util');
|
util = require('util');
|
||||||
|
|
||||||
|
|
||||||
// Cache asar archive objects.
|
// Cache asar archive objects.
|
||||||
|
|
||||||
cachedArchives = {};
|
cachedArchives = {};
|
||||||
|
|
||||||
getOrCreateArchive = function(p) {
|
getOrCreateArchive = function(p) {
|
||||||
|
@ -28,9 +26,7 @@ getOrCreateArchive = function(p) {
|
||||||
return cachedArchives[p] = archive;
|
return cachedArchives[p] = archive;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Clean cache on quit.
|
// Clean cache on quit.
|
||||||
|
|
||||||
process.on('exit', function() {
|
process.on('exit', function() {
|
||||||
var archive, p, results;
|
var archive, p, results;
|
||||||
results = [];
|
results = [];
|
||||||
|
@ -42,9 +38,7 @@ process.on('exit', function() {
|
||||||
return results;
|
return results;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// Separate asar package's path from full path.
|
// Separate asar package's path from full path.
|
||||||
|
|
||||||
splitPath = function(p) {
|
splitPath = function(p) {
|
||||||
|
|
||||||
// shortcut to disable asar.
|
// shortcut to disable asar.
|
||||||
|
@ -66,9 +60,7 @@ splitPath = function(p) {
|
||||||
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.
|
// Convert asar archive's Stats object to fs's Stats object.
|
||||||
|
|
||||||
nextInode = 0;
|
nextInode = 0;
|
||||||
|
|
||||||
uid = process.getuid != null ? process.getuid() : 0;
|
uid = process.getuid != null ? process.getuid() : 0;
|
||||||
|
@ -115,9 +107,7 @@ asarStatsToFsStats = function(stats) {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Create a ENOENT error.
|
// Create a ENOENT error.
|
||||||
|
|
||||||
notFoundError = function(asarPath, filePath, callback) {
|
notFoundError = function(asarPath, filePath, callback) {
|
||||||
var error;
|
var error;
|
||||||
error = new Error("ENOENT, " + filePath + " not found in " + asarPath);
|
error = new Error("ENOENT, " + filePath + " not found in " + asarPath);
|
||||||
|
@ -131,9 +121,7 @@ notFoundError = function(asarPath, filePath, callback) {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Create a ENOTDIR error.
|
// Create a ENOTDIR error.
|
||||||
|
|
||||||
notDirError = function(callback) {
|
notDirError = function(callback) {
|
||||||
var error;
|
var error;
|
||||||
error = new Error('ENOTDIR, not a directory');
|
error = new Error('ENOTDIR, not a directory');
|
||||||
|
@ -147,9 +135,7 @@ notDirError = function(callback) {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Create invalid archive error.
|
// Create invalid archive error.
|
||||||
|
|
||||||
invalidArchiveError = function(asarPath, callback) {
|
invalidArchiveError = function(asarPath, callback) {
|
||||||
var error;
|
var error;
|
||||||
error = new Error("Invalid package " + asarPath);
|
error = new Error("Invalid package " + asarPath);
|
||||||
|
@ -161,9 +147,7 @@ invalidArchiveError = function(asarPath, callback) {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Override APIs that rely on passing file path instead of content to C++.
|
// Override APIs that rely on passing file path instead of content to C++.
|
||||||
|
|
||||||
overrideAPISync = function(module, name, arg) {
|
overrideAPISync = function(module, name, arg) {
|
||||||
var old;
|
var old;
|
||||||
if (arg == null) {
|
if (arg == null) {
|
||||||
|
@ -220,9 +204,7 @@ overrideAPI = function(module, name, arg) {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Override fs APIs.
|
// Override fs APIs.
|
||||||
|
|
||||||
exports.wrapFsWithAsar = function(fs) {
|
exports.wrapFsWithAsar = function(fs) {
|
||||||
var exists, existsSync, internalModuleReadFile, internalModuleStat, lstat, lstatSync, mkdir, mkdirSync, open, openSync, readFile, readFileSync, readdir, readdirSync, realpath, realpathSync, stat, statSync, statSyncNoException;
|
var exists, existsSync, internalModuleReadFile, internalModuleStat, lstat, lstatSync, mkdir, mkdirSync, open, openSync, readFile, readFileSync, readdir, readdirSync, realpath, realpathSync, stat, statSync, statSyncNoException;
|
||||||
lstatSync = fs.lstatSync;
|
lstatSync = fs.lstatSync;
|
||||||
|
|
|
@ -21,7 +21,6 @@ process.atomBinding = function(name) {
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!process.env.ELECTRON_HIDE_INTERNAL_MODULES) {
|
if (!process.env.ELECTRON_HIDE_INTERNAL_MODULES) {
|
||||||
|
|
||||||
// Add common/api/lib to module search paths.
|
// Add common/api/lib to module search paths.
|
||||||
Module.globalPaths.push(path.resolve(__dirname, '..', 'api', 'lib'));
|
Module.globalPaths.push(path.resolve(__dirname, '..', 'api', 'lib'));
|
||||||
}
|
}
|
||||||
|
@ -47,7 +46,6 @@ global.setImmediate = wrapWithActivateUvLoop(timers.setImmediate);
|
||||||
global.clearImmediate = timers.clearImmediate;
|
global.clearImmediate = timers.clearImmediate;
|
||||||
|
|
||||||
if (process.type === 'browser') {
|
if (process.type === 'browser') {
|
||||||
|
|
||||||
// setTimeout needs to update the polling timeout of the event loop, when
|
// 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
|
// 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
|
// to update the timeout, so we have to force the node's event loop to
|
||||||
|
|
|
@ -4,21 +4,15 @@ path = require('path');
|
||||||
|
|
||||||
Module = require('module');
|
Module = require('module');
|
||||||
|
|
||||||
|
|
||||||
// Clear Node's global search paths.
|
// Clear Node's global search paths.
|
||||||
|
|
||||||
Module.globalPaths.length = 0;
|
Module.globalPaths.length = 0;
|
||||||
|
|
||||||
|
|
||||||
// Clear current and parent(init.coffee)'s search paths.
|
// 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.
|
// Prevent Node from adding paths outside this app to search paths.
|
||||||
|
|
||||||
Module._nodeModulePaths = function(from) {
|
Module._nodeModulePaths = function(from) {
|
||||||
var dir, i, part, parts, paths, skipOutsidePaths, splitRe, tip;
|
var dir, i, part, parts, paths, skipOutsidePaths, splitRe, tip;
|
||||||
from = path.resolve(from);
|
from = path.resolve(from);
|
||||||
|
|
|
@ -9,9 +9,7 @@ getNextId = function() {
|
||||||
return ++nextId;
|
return ++nextId;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// |options.type| can not be empty and has to include 'window' or 'screen'.
|
// |options.type| can not be empty and has to include 'window' or 'screen'.
|
||||||
|
|
||||||
isValid = function(options) {
|
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);
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,13 +2,10 @@ var common;
|
||||||
|
|
||||||
common = require('../../../../common/api/lib/exports/electron');
|
common = require('../../../../common/api/lib/exports/electron');
|
||||||
|
|
||||||
|
|
||||||
// Import common modules.
|
// Import common modules.
|
||||||
|
|
||||||
common.defineProperties(exports);
|
common.defineProperties(exports);
|
||||||
|
|
||||||
Object.defineProperties(exports, {
|
Object.defineProperties(exports, {
|
||||||
|
|
||||||
// Renderer side modules, please sort with alphabet order.
|
// Renderer side modules, please sort with alphabet order.
|
||||||
desktopCapturer: {
|
desktopCapturer: {
|
||||||
enumerable: true,
|
enumerable: true,
|
||||||
|
|
|
@ -7,9 +7,7 @@ binding = process.atomBinding('ipc');
|
||||||
|
|
||||||
v8Util = process.atomBinding('v8_util');
|
v8Util = process.atomBinding('v8_util');
|
||||||
|
|
||||||
|
|
||||||
// Created by init.coffee.
|
// Created by init.coffee.
|
||||||
|
|
||||||
ipcRenderer = v8Util.getHiddenValue(global, 'ipc');
|
ipcRenderer = v8Util.getHiddenValue(global, 'ipc');
|
||||||
|
|
||||||
ipcRenderer.send = function() {
|
ipcRenderer.send = function() {
|
||||||
|
|
|
@ -5,14 +5,10 @@ ref = require('electron'), ipcRenderer = ref.ipcRenderer, deprecate = ref.deprec
|
||||||
|
|
||||||
EventEmitter = require('events').EventEmitter;
|
EventEmitter = require('events').EventEmitter;
|
||||||
|
|
||||||
|
|
||||||
// This module is deprecated, we mirror everything from ipcRenderer.
|
// 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.
|
// Routes events of ipcRenderer.
|
||||||
|
|
||||||
ipc = new EventEmitter;
|
ipc = new EventEmitter;
|
||||||
|
|
||||||
ipcRenderer.emit = function() {
|
ipcRenderer.emit = function() {
|
||||||
|
@ -22,9 +18,7 @@ ipcRenderer.emit = function() {
|
||||||
return EventEmitter.prototype.emit.apply(ipcRenderer, arguments);
|
return EventEmitter.prototype.emit.apply(ipcRenderer, arguments);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Deprecated.
|
// Deprecated.
|
||||||
|
|
||||||
for (method in ipcRenderer) {
|
for (method in ipcRenderer) {
|
||||||
if (method.startsWith('send')) {
|
if (method.startsWith('send')) {
|
||||||
ipc[method] = ipcRenderer[method];
|
ipc[method] = ipcRenderer[method];
|
||||||
|
|
|
@ -7,9 +7,7 @@ v8Util = process.atomBinding('v8_util');
|
||||||
|
|
||||||
callbacksRegistry = new CallbacksRegistry;
|
callbacksRegistry = new CallbacksRegistry;
|
||||||
|
|
||||||
|
|
||||||
// Check for circular reference.
|
// Check for circular reference.
|
||||||
|
|
||||||
isCircular = function(field, visited) {
|
isCircular = function(field, visited) {
|
||||||
if (typeof field === 'object') {
|
if (typeof field === 'object') {
|
||||||
if (indexOf.call(visited, field) >= 0) {
|
if (indexOf.call(visited, field) >= 0) {
|
||||||
|
@ -20,9 +18,7 @@ isCircular = function(field, visited) {
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Convert the arguments object into an array of meta data.
|
// Convert the arguments object into an array of meta data.
|
||||||
|
|
||||||
wrapArgs = function(args, visited) {
|
wrapArgs = function(args, visited) {
|
||||||
var valueToMeta;
|
var valueToMeta;
|
||||||
if (visited == null) {
|
if (visited == null) {
|
||||||
|
@ -90,9 +86,7 @@ wrapArgs = function(args, visited) {
|
||||||
return Array.prototype.slice.call(args).map(valueToMeta);
|
return Array.prototype.slice.call(args).map(valueToMeta);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Convert meta data from browser into real value.
|
// Convert meta data from browser into real value.
|
||||||
|
|
||||||
metaToValue = function(meta) {
|
metaToValue = function(meta) {
|
||||||
var RemoteFunction, el, i, j, len, len1, member, ref1, ref2, results, ret;
|
var RemoteFunction, el, i, j, len, len1, member, ref1, ref2, results, ret;
|
||||||
switch (meta.type) {
|
switch (meta.type) {
|
||||||
|
@ -121,7 +115,6 @@ metaToValue = function(meta) {
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if (meta.type === 'function') {
|
if (meta.type === 'function') {
|
||||||
|
|
||||||
// A shadow class to represent the remote function object.
|
// A shadow class to represent the remote function object.
|
||||||
ret = RemoteFunction = (function() {
|
ret = RemoteFunction = (function() {
|
||||||
function RemoteFunction() {
|
function RemoteFunction() {
|
||||||
|
@ -163,10 +156,8 @@ metaToValue = function(meta) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
// Track delegate object's life time, and tell the browser to clean up
|
||||||
Track delegate object's life time, and tell the browser to clean up
|
// when the object is GCed.
|
||||||
when the object is GCed.
|
|
||||||
*/
|
|
||||||
v8Util.setDestructor(ret, function() {
|
v8Util.setDestructor(ret, function() {
|
||||||
return ipcRenderer.send('ATOM_BROWSER_DEREFERENCE', meta.id);
|
return ipcRenderer.send('ATOM_BROWSER_DEREFERENCE', meta.id);
|
||||||
});
|
});
|
||||||
|
@ -177,9 +168,7 @@ metaToValue = function(meta) {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Construct a plain object from the meta.
|
// Construct a plain object from the meta.
|
||||||
|
|
||||||
metaToPlainObject = function(meta) {
|
metaToPlainObject = function(meta) {
|
||||||
var i, len, name, obj, ref1, ref2, value;
|
var i, len, name, obj, ref1, ref2, value;
|
||||||
obj = (function() {
|
obj = (function() {
|
||||||
|
@ -198,13 +187,9 @@ metaToPlainObject = function(meta) {
|
||||||
return obj;
|
return obj;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Create a RemoteMemberFunction instance.
|
||||||
/*
|
// This function's content should not be inlined into metaToValue, otherwise V8
|
||||||
Create a RemoteMemberFunction instance.
|
// may consider it circular reference.
|
||||||
This function's content should not be inlined into metaToValue, otherwise V8
|
|
||||||
may consider it circular reference.
|
|
||||||
*/
|
|
||||||
|
|
||||||
createRemoteMemberFunction = function(metaId, name) {
|
createRemoteMemberFunction = function(metaId, name) {
|
||||||
var RemoteMemberFunction;
|
var RemoteMemberFunction;
|
||||||
return RemoteMemberFunction = (function() {
|
return RemoteMemberFunction = (function() {
|
||||||
|
@ -228,13 +213,9 @@ createRemoteMemberFunction = function(metaId, name) {
|
||||||
})();
|
})();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Create configuration for defineProperty.
|
||||||
/*
|
// This function's content should not be inlined into metaToValue, otherwise V8
|
||||||
Create configuration for defineProperty.
|
// may consider it circular reference.
|
||||||
This function's content should not be inlined into metaToValue, otherwise V8
|
|
||||||
may consider it circular reference.
|
|
||||||
*/
|
|
||||||
|
|
||||||
createRemoteMemberProperty = function(metaId, name) {
|
createRemoteMemberProperty = function(metaId, name) {
|
||||||
return {
|
return {
|
||||||
enumerable: true,
|
enumerable: true,
|
||||||
|
@ -253,28 +234,20 @@ createRemoteMemberProperty = function(metaId, name) {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Browser calls a callback in renderer.
|
// Browser calls a callback in renderer.
|
||||||
|
|
||||||
ipcRenderer.on('ATOM_RENDERER_CALLBACK', function(event, id, args) {
|
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.
|
// A callback in browser is released.
|
||||||
|
|
||||||
ipcRenderer.on('ATOM_RENDERER_RELEASE_CALLBACK', function(event, id) {
|
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.
|
// List all built-in modules in browser process.
|
||||||
|
|
||||||
browserModules = require('../../../browser/api/lib/exports/electron');
|
browserModules = require('../../../browser/api/lib/exports/electron');
|
||||||
|
|
||||||
|
|
||||||
// And add a helper receiver for each one.
|
// And add a helper receiver for each one.
|
||||||
|
|
||||||
fn = function(name) {
|
fn = function(name) {
|
||||||
return Object.defineProperty(exports, name, {
|
return Object.defineProperty(exports, name, {
|
||||||
get: function() {
|
get: function() {
|
||||||
|
@ -287,12 +260,9 @@ for (name in browserModules) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
// Get remote module.
|
||||||
Get remote module.
|
// (Just like node's require, the modules are cached permanently, note that this
|
||||||
(Just like node's require, the modules are cached permanently, note that this
|
// is safe leak since the object is not expected to get freed in browser)
|
||||||
is safe leak since the object is not expected to get freed in browser)
|
|
||||||
*/
|
|
||||||
|
|
||||||
moduleCache = {};
|
moduleCache = {};
|
||||||
|
|
||||||
exports.require = function(module) {
|
exports.require = function(module) {
|
||||||
|
@ -306,12 +276,10 @@ exports.require = function(module) {
|
||||||
|
|
||||||
|
|
||||||
// Optimize require('electron').
|
// Optimize require('electron').
|
||||||
|
|
||||||
moduleCache.electron = exports;
|
moduleCache.electron = exports;
|
||||||
|
|
||||||
|
|
||||||
// Alias to remote.require('electron').xxx.
|
// Alias to remote.require('electron').xxx.
|
||||||
|
|
||||||
builtinCache = {};
|
builtinCache = {};
|
||||||
|
|
||||||
exports.getBuiltin = function(module) {
|
exports.getBuiltin = function(module) {
|
||||||
|
@ -323,9 +291,7 @@ exports.getBuiltin = function(module) {
|
||||||
return builtinCache[module] = metaToValue(meta);
|
return builtinCache[module] = metaToValue(meta);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Get current BrowserWindow object.
|
// Get current BrowserWindow object.
|
||||||
|
|
||||||
windowCache = null;
|
windowCache = null;
|
||||||
|
|
||||||
exports.getCurrentWindow = function() {
|
exports.getCurrentWindow = function() {
|
||||||
|
@ -337,9 +303,7 @@ exports.getCurrentWindow = function() {
|
||||||
return windowCache = metaToValue(meta);
|
return windowCache = metaToValue(meta);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Get current WebContents object.
|
// Get current WebContents object.
|
||||||
|
|
||||||
webContentsCache = null;
|
webContentsCache = null;
|
||||||
|
|
||||||
exports.getCurrentWebContents = function() {
|
exports.getCurrentWebContents = function() {
|
||||||
|
@ -351,18 +315,14 @@ exports.getCurrentWebContents = function() {
|
||||||
return webContentsCache = metaToValue(meta);
|
return webContentsCache = metaToValue(meta);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Get a global object in browser.
|
// Get a global object in browser.
|
||||||
|
|
||||||
exports.getGlobal = function(name) {
|
exports.getGlobal = function(name) {
|
||||||
var meta;
|
var meta;
|
||||||
meta = ipcRenderer.sendSync('ATOM_BROWSER_GLOBAL', name);
|
meta = ipcRenderer.sendSync('ATOM_BROWSER_GLOBAL', name);
|
||||||
return metaToValue(meta);
|
return metaToValue(meta);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Get the process object in browser.
|
// Get the process object in browser.
|
||||||
|
|
||||||
processCache = null;
|
processCache = null;
|
||||||
|
|
||||||
exports.__defineGetter__('process', function() {
|
exports.__defineGetter__('process', function() {
|
||||||
|
@ -372,9 +332,7 @@ exports.__defineGetter__('process', function() {
|
||||||
return processCache;
|
return processCache;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// Create a funtion that will return the specifed value when called in browser.
|
// Create a funtion that will return the specifed value when called in browser.
|
||||||
|
|
||||||
exports.createFunctionWithReturnValue = function(returnValue) {
|
exports.createFunctionWithReturnValue = function(returnValue) {
|
||||||
var func;
|
var func;
|
||||||
func = function() {
|
func = function() {
|
||||||
|
@ -384,9 +342,7 @@ exports.createFunctionWithReturnValue = function(returnValue) {
|
||||||
return func;
|
return func;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Get the guest WebContents from guestInstanceId.
|
// Get the guest WebContents from guestInstanceId.
|
||||||
|
|
||||||
exports.getGuestWebContents = function(guestInstanceId) {
|
exports.getGuestWebContents = function(guestInstanceId) {
|
||||||
var meta;
|
var meta;
|
||||||
meta = ipcRenderer.sendSync('ATOM_BROWSER_GUEST_WEB_CONTENTS', guestInstanceId);
|
meta = ipcRenderer.sendSync('ATOM_BROWSER_GUEST_WEB_CONTENTS', guestInstanceId);
|
||||||
|
|
|
@ -11,21 +11,16 @@ url = require('url');
|
||||||
Module = require('module');
|
Module = require('module');
|
||||||
|
|
||||||
|
|
||||||
/*
|
// We modified the original process.argv to let node.js load the
|
||||||
We modified the original process.argv to let node.js load the
|
// atom-renderer.js, we need to restore it here.
|
||||||
atom-renderer.js, we need to restore it here.
|
|
||||||
*/
|
|
||||||
|
|
||||||
process.argv.splice(1, 1);
|
process.argv.splice(1, 1);
|
||||||
|
|
||||||
|
|
||||||
// Clear search paths.
|
// Clear search paths.
|
||||||
|
|
||||||
require(path.resolve(__dirname, '..', '..', 'common', 'lib', 'reset-search-paths'));
|
require(path.resolve(__dirname, '..', '..', 'common', 'lib', 'reset-search-paths'));
|
||||||
|
|
||||||
|
|
||||||
// Import common settings.
|
// Import common settings.
|
||||||
|
|
||||||
require(path.resolve(__dirname, '..', '..', 'common', 'lib', 'init'));
|
require(path.resolve(__dirname, '..', '..', 'common', 'lib', 'init'));
|
||||||
|
|
||||||
globalPaths = Module.globalPaths;
|
globalPaths = Module.globalPaths;
|
||||||
|
@ -34,14 +29,10 @@ if (!process.env.ELECTRON_HIDE_INTERNAL_MODULES) {
|
||||||
globalPaths.push(path.resolve(__dirname, '..', 'api', 'lib'));
|
globalPaths.push(path.resolve(__dirname, '..', 'api', 'lib'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Expose public APIs.
|
// Expose public APIs.
|
||||||
|
|
||||||
globalPaths.push(path.resolve(__dirname, '..', 'api', 'lib', 'exports'));
|
globalPaths.push(path.resolve(__dirname, '..', 'api', 'lib', 'exports'));
|
||||||
|
|
||||||
|
|
||||||
// The global variable will be used by ipc for event dispatching
|
// The global variable will be used by ipc for event dispatching
|
||||||
|
|
||||||
v8Util = process.atomBinding('v8_util');
|
v8Util = process.atomBinding('v8_util');
|
||||||
|
|
||||||
v8Util.setHiddenValue(global, 'ipc', new events.EventEmitter);
|
v8Util.setHiddenValue(global, 'ipc', new events.EventEmitter);
|
||||||
|
@ -55,18 +46,15 @@ electron.ipcRenderer.on('ELECTRON_INTERNAL_RENDERER_WEB_FRAME_METHOD', (event, m
|
||||||
});
|
});
|
||||||
|
|
||||||
// Process command line arguments.
|
// Process command line arguments.
|
||||||
|
|
||||||
nodeIntegration = 'false';
|
nodeIntegration = 'false';
|
||||||
|
|
||||||
ref = process.argv;
|
ref = process.argv;
|
||||||
for (i = 0, len = ref.length; i < len; i++) {
|
for (i = 0, len = ref.length; i < len; i++) {
|
||||||
arg = ref[i];
|
arg = ref[i];
|
||||||
if (arg.indexOf('--guest-instance-id=') === 0) {
|
if (arg.indexOf('--guest-instance-id=') === 0) {
|
||||||
|
|
||||||
// This is a guest web view.
|
// 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) {
|
} else if (arg.indexOf('--opener-id=') === 0) {
|
||||||
|
|
||||||
// This is a guest BrowserWindow.
|
// 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) {
|
} else if (arg.indexOf('--node-integration=') === 0) {
|
||||||
|
@ -77,17 +65,14 @@ for (i = 0, len = ref.length; i < len; i++) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (location.protocol === 'chrome-devtools:') {
|
if (location.protocol === 'chrome-devtools:') {
|
||||||
|
|
||||||
// Override some inspector APIs.
|
// Override some inspector APIs.
|
||||||
require('./inspector');
|
require('./inspector');
|
||||||
nodeIntegration = 'true';
|
nodeIntegration = 'true';
|
||||||
} else if (location.protocol === 'chrome-extension:') {
|
} else if (location.protocol === 'chrome-extension:') {
|
||||||
|
|
||||||
// Add implementations of chrome API.
|
// Add implementations of chrome API.
|
||||||
require('./chrome-api');
|
require('./chrome-api');
|
||||||
nodeIntegration = 'true';
|
nodeIntegration = 'true';
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
// Override default web functions.
|
// Override default web functions.
|
||||||
require('./override');
|
require('./override');
|
||||||
|
|
||||||
|
@ -99,7 +84,6 @@ if (location.protocol === 'chrome-devtools:') {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (nodeIntegration === 'true' || nodeIntegration === 'all' || nodeIntegration === 'except-iframe' || nodeIntegration === 'manual-enable-iframe') {
|
if (nodeIntegration === 'true' || nodeIntegration === 'all' || nodeIntegration === 'except-iframe' || nodeIntegration === 'manual-enable-iframe') {
|
||||||
|
|
||||||
// Export node bindings to global.
|
// Export node bindings to global.
|
||||||
global.require = require;
|
global.require = require;
|
||||||
global.module = module;
|
global.module = module;
|
||||||
|
@ -135,7 +119,6 @@ if (nodeIntegration === 'true' || nodeIntegration === 'all' || nodeIntegration =
|
||||||
return process.emit('exit');
|
return process.emit('exit');
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
// Delete Node's symbols after the Environment has been loaded.
|
// Delete Node's symbols after the Environment has been loaded.
|
||||||
process.once('loaded', function() {
|
process.once('loaded', function() {
|
||||||
delete global.process;
|
delete global.process;
|
||||||
|
@ -145,9 +128,7 @@ if (nodeIntegration === 'true' || nodeIntegration === 'all' || nodeIntegration =
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Load the script specfied by the "preload" attribute.
|
// Load the script specfied by the "preload" attribute.
|
||||||
|
|
||||||
if (preloadScript) {
|
if (preloadScript) {
|
||||||
try {
|
try {
|
||||||
require(preloadScript);
|
require(preloadScript);
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
var convertToMenuTemplate, createFileSelectorElement, createMenu, pathToHtml5FileObject, showFileChooserDialog;
|
var convertToMenuTemplate, createFileSelectorElement, createMenu, pathToHtml5FileObject, showFileChooserDialog;
|
||||||
|
|
||||||
window.onload = function() {
|
window.onload = function() {
|
||||||
|
|
||||||
// Use menu API to show context menu.
|
// Use menu API to show context menu.
|
||||||
InspectorFrontendHost.showContextMenuAtPoint = createMenu;
|
InspectorFrontendHost.showContextMenuAtPoint = createMenu;
|
||||||
|
|
||||||
|
|
|
@ -3,9 +3,7 @@ var BrowserWindowProxy, a, getHistoryOperation, ipcRenderer, ref, remote, resolv
|
||||||
|
|
||||||
ref = require('electron'), ipcRenderer = ref.ipcRenderer, remote = ref.remote;
|
ref = require('electron'), ipcRenderer = ref.ipcRenderer, remote = ref.remote;
|
||||||
|
|
||||||
|
|
||||||
// Helper function to resolve relative url.
|
// Helper function to resolve relative url.
|
||||||
|
|
||||||
a = window.top.document.createElement('a');
|
a = window.top.document.createElement('a');
|
||||||
|
|
||||||
resolveURL = function(url) {
|
resolveURL = function(url) {
|
||||||
|
@ -13,9 +11,7 @@ resolveURL = function(url) {
|
||||||
return a.href;
|
return a.href;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Window object returned by "window.open".
|
// Window object returned by "window.open".
|
||||||
|
|
||||||
BrowserWindowProxy = (function() {
|
BrowserWindowProxy = (function() {
|
||||||
BrowserWindowProxy.proxies = {};
|
BrowserWindowProxy.proxies = {};
|
||||||
|
|
||||||
|
@ -69,16 +65,13 @@ BrowserWindowProxy = (function() {
|
||||||
})();
|
})();
|
||||||
|
|
||||||
if (process.guestInstanceId == null) {
|
if (process.guestInstanceId == null) {
|
||||||
|
|
||||||
// Override default window.close.
|
// Override default window.close.
|
||||||
window.close = function() {
|
window.close = function() {
|
||||||
return remote.getCurrentWindow().close();
|
return remote.getCurrentWindow().close();
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Make the browser window or guest view emit "new-window" event.
|
// Make the browser window or guest view emit "new-window" event.
|
||||||
|
|
||||||
window.open = function(url, frameName, features) {
|
window.open = function(url, frameName, features) {
|
||||||
var feature, guestId, i, ints, j, len, len1, name, options, ref1, ref2, value;
|
var feature, guestId, i, ints, j, len, len1, name, options, ref1, ref2, value;
|
||||||
if (frameName == null) {
|
if (frameName == null) {
|
||||||
|
@ -133,9 +126,7 @@ window.open = function(url, frameName, features) {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Use the dialog API to implement alert().
|
// Use the dialog API to implement alert().
|
||||||
|
|
||||||
window.alert = function(message, title) {
|
window.alert = function(message, title) {
|
||||||
var buttons;
|
var buttons;
|
||||||
if (title == null) {
|
if (title == null) {
|
||||||
|
@ -152,9 +143,7 @@ window.alert = function(message, title) {
|
||||||
// Alert should always return undefined.
|
// Alert should always return undefined.
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// And the confirm().
|
// And the confirm().
|
||||||
|
|
||||||
window.confirm = function(message, title) {
|
window.confirm = function(message, title) {
|
||||||
var buttons, cancelId;
|
var buttons, cancelId;
|
||||||
if (title == null) {
|
if (title == null) {
|
||||||
|
@ -170,9 +159,7 @@ window.confirm = function(message, title) {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// But we do not support prompt().
|
// But we do not support prompt().
|
||||||
|
|
||||||
window.prompt = function() {
|
window.prompt = function() {
|
||||||
throw new Error('prompt() is and will not be supported.');
|
throw new Error('prompt() is and will not be supported.');
|
||||||
};
|
};
|
||||||
|
@ -182,9 +169,7 @@ if (process.openerId != null) {
|
||||||
}
|
}
|
||||||
|
|
||||||
ipcRenderer.on('ATOM_SHELL_GUEST_WINDOW_POSTMESSAGE', function(event, sourceId, message, sourceOrigin) {
|
ipcRenderer.on('ATOM_SHELL_GUEST_WINDOW_POSTMESSAGE', function(event, sourceId, message, sourceOrigin) {
|
||||||
|
|
||||||
// Manually dispatch event instead of using postMessage because we also need to
|
// Manually dispatch event instead of using postMessage because we also need to
|
||||||
|
|
||||||
// set event.source.
|
// set event.source.
|
||||||
event = document.createEvent('Event');
|
event = document.createEvent('Event');
|
||||||
event.initEvent('message', false, false);
|
event.initEvent('message', false, false);
|
||||||
|
@ -194,9 +179,7 @@ ipcRenderer.on('ATOM_SHELL_GUEST_WINDOW_POSTMESSAGE', function(event, sourceId,
|
||||||
return window.dispatchEvent(event);
|
return window.dispatchEvent(event);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// Forward history operations to browser.
|
// Forward history operations to browser.
|
||||||
|
|
||||||
sendHistoryOperation = function() {
|
sendHistoryOperation = function() {
|
||||||
var args;
|
var args;
|
||||||
args = 1 <= arguments.length ? slice.call(arguments, 0) : [];
|
args = 1 <= arguments.length ? slice.call(arguments, 0) : [];
|
||||||
|
@ -227,9 +210,7 @@ Object.defineProperty(window.history, 'length', {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// Make document.hidden and document.visibilityState return the correct value.
|
// Make document.hidden and document.visibilityState return the correct value.
|
||||||
|
|
||||||
Object.defineProperty(document, 'hidden', {
|
Object.defineProperty(document, 'hidden', {
|
||||||
get: function() {
|
get: function() {
|
||||||
var currentWindow;
|
var currentWindow;
|
||||||
|
|
|
@ -10,9 +10,7 @@ webViewConstants = require('./web-view-constants');
|
||||||
|
|
||||||
remote = require('electron').remote;
|
remote = require('electron').remote;
|
||||||
|
|
||||||
|
|
||||||
// Helper function to resolve url set in attribute.
|
// Helper function to resolve url set in attribute.
|
||||||
|
|
||||||
a = document.createElement('a');
|
a = document.createElement('a');
|
||||||
|
|
||||||
resolveURL = function(url) {
|
resolveURL = function(url) {
|
||||||
|
@ -20,12 +18,8 @@ resolveURL = function(url) {
|
||||||
return a.href;
|
return a.href;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Attribute objects.
|
||||||
/*
|
// Default implementation of a WebView attribute.
|
||||||
Attribute objects.
|
|
||||||
Default implementation of a WebView attribute.
|
|
||||||
*/
|
|
||||||
|
|
||||||
WebViewAttribute = (function() {
|
WebViewAttribute = (function() {
|
||||||
function WebViewAttribute(name, webViewImpl) {
|
function WebViewAttribute(name, webViewImpl) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
|
@ -35,32 +29,24 @@ WebViewAttribute = (function() {
|
||||||
this.defineProperty();
|
this.defineProperty();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Retrieves and returns the attribute's value.
|
// Retrieves and returns the attribute's value.
|
||||||
|
|
||||||
WebViewAttribute.prototype.getValue = function() {
|
WebViewAttribute.prototype.getValue = function() {
|
||||||
return this.webViewImpl.webviewNode.getAttribute(this.name) || this.value;
|
return this.webViewImpl.webviewNode.getAttribute(this.name) || this.value;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Sets the attribute's value.
|
// Sets the attribute's value.
|
||||||
|
|
||||||
WebViewAttribute.prototype.setValue = function(value) {
|
WebViewAttribute.prototype.setValue = function(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.
|
// Changes the attribute's value without triggering its mutation handler.
|
||||||
|
|
||||||
WebViewAttribute.prototype.setValueIgnoreMutation = function(value) {
|
WebViewAttribute.prototype.setValueIgnoreMutation = function(value) {
|
||||||
this.ignoreMutation = true;
|
this.ignoreMutation = true;
|
||||||
this.setValue(value);
|
this.setValue(value);
|
||||||
return this.ignoreMutation = false;
|
return this.ignoreMutation = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Defines this attribute as a property on the webview node.
|
// Defines this attribute as a property on the webview node.
|
||||||
|
|
||||||
WebViewAttribute.prototype.defineProperty = function() {
|
WebViewAttribute.prototype.defineProperty = function() {
|
||||||
return Object.defineProperty(this.webViewImpl.webviewNode, this.name, {
|
return Object.defineProperty(this.webViewImpl.webviewNode, this.name, {
|
||||||
get: (function(_this) {
|
get: (function(_this) {
|
||||||
|
@ -77,18 +63,14 @@ WebViewAttribute = (function() {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Called when the attribute's value changes.
|
// Called when the attribute's value changes.
|
||||||
|
|
||||||
WebViewAttribute.prototype.handleMutation = function() {};
|
WebViewAttribute.prototype.handleMutation = function() {};
|
||||||
|
|
||||||
return WebViewAttribute;
|
return WebViewAttribute;
|
||||||
|
|
||||||
})();
|
})();
|
||||||
|
|
||||||
|
|
||||||
// An attribute that is treated as a Boolean.
|
// An attribute that is treated as a Boolean.
|
||||||
|
|
||||||
BooleanAttribute = (function(superClass) {
|
BooleanAttribute = (function(superClass) {
|
||||||
extend(BooleanAttribute, superClass);
|
extend(BooleanAttribute, superClass);
|
||||||
|
|
||||||
|
@ -112,9 +94,7 @@ BooleanAttribute = (function(superClass) {
|
||||||
|
|
||||||
})(WebViewAttribute);
|
})(WebViewAttribute);
|
||||||
|
|
||||||
|
|
||||||
// Attribute that specifies whether transparency is allowed in the webview.
|
// Attribute that specifies whether transparency is allowed in the webview.
|
||||||
|
|
||||||
AllowTransparencyAttribute = (function(superClass) {
|
AllowTransparencyAttribute = (function(superClass) {
|
||||||
extend(AllowTransparencyAttribute, superClass);
|
extend(AllowTransparencyAttribute, superClass);
|
||||||
|
|
||||||
|
@ -133,9 +113,7 @@ AllowTransparencyAttribute = (function(superClass) {
|
||||||
|
|
||||||
})(BooleanAttribute);
|
})(BooleanAttribute);
|
||||||
|
|
||||||
|
|
||||||
// Attribute used to define the demension limits of autosizing.
|
// Attribute used to define the demension limits of autosizing.
|
||||||
|
|
||||||
AutosizeDimensionAttribute = (function(superClass) {
|
AutosizeDimensionAttribute = (function(superClass) {
|
||||||
extend(AutosizeDimensionAttribute, superClass);
|
extend(AutosizeDimensionAttribute, superClass);
|
||||||
|
|
||||||
|
@ -168,9 +146,7 @@ AutosizeDimensionAttribute = (function(superClass) {
|
||||||
|
|
||||||
})(WebViewAttribute);
|
})(WebViewAttribute);
|
||||||
|
|
||||||
|
|
||||||
// Attribute that specifies whether the webview should be autosized.
|
// Attribute that specifies whether the webview should be autosized.
|
||||||
|
|
||||||
AutosizeAttribute = (function(superClass) {
|
AutosizeAttribute = (function(superClass) {
|
||||||
extend(AutosizeAttribute, superClass);
|
extend(AutosizeAttribute, superClass);
|
||||||
|
|
||||||
|
@ -184,9 +160,7 @@ AutosizeAttribute = (function(superClass) {
|
||||||
|
|
||||||
})(BooleanAttribute);
|
})(BooleanAttribute);
|
||||||
|
|
||||||
|
|
||||||
// Attribute representing the state of the storage partition.
|
// Attribute representing the state of the storage partition.
|
||||||
|
|
||||||
PartitionAttribute = (function(superClass) {
|
PartitionAttribute = (function(superClass) {
|
||||||
extend(PartitionAttribute, superClass);
|
extend(PartitionAttribute, superClass);
|
||||||
|
|
||||||
|
@ -214,9 +188,7 @@ PartitionAttribute = (function(superClass) {
|
||||||
|
|
||||||
})(WebViewAttribute);
|
})(WebViewAttribute);
|
||||||
|
|
||||||
|
|
||||||
// Attribute that handles the location and navigation of the webview.
|
// Attribute that handles the location and navigation of the webview.
|
||||||
|
|
||||||
SrcAttribute = (function(superClass) {
|
SrcAttribute = (function(superClass) {
|
||||||
extend(SrcAttribute, superClass);
|
extend(SrcAttribute, superClass);
|
||||||
|
|
||||||
|
@ -236,29 +208,23 @@ SrcAttribute = (function(superClass) {
|
||||||
SrcAttribute.prototype.setValueIgnoreMutation = function(value) {
|
SrcAttribute.prototype.setValueIgnoreMutation = function(value) {
|
||||||
WebViewAttribute.prototype.setValueIgnoreMutation.call(this, value);
|
WebViewAttribute.prototype.setValueIgnoreMutation.call(this, value);
|
||||||
|
|
||||||
/*
|
// takeRecords() is needed to clear queued up src mutations. Without it, it
|
||||||
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
|
||||||
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
|
||||||
mutation observer |observer|, and then get handled even though we do not
|
// want to handle this mutation.
|
||||||
want to handle this mutation.
|
|
||||||
*/
|
|
||||||
return this.observer.takeRecords();
|
return this.observer.takeRecords();
|
||||||
};
|
};
|
||||||
|
|
||||||
SrcAttribute.prototype.handleMutation = function(oldValue, newValue) {
|
SrcAttribute.prototype.handleMutation = function(oldValue, newValue) {
|
||||||
|
|
||||||
/*
|
// Once we have navigated, we don't allow clearing the src attribute.
|
||||||
Once we have navigated, we don't allow clearing the src attribute.
|
// Once <webview> enters a navigated state, it cannot return to a
|
||||||
Once <webview> enters a navigated state, it cannot return to a
|
// placeholder state.
|
||||||
placeholder state.
|
|
||||||
*/
|
|
||||||
if (!newValue && oldValue) {
|
if (!newValue && oldValue) {
|
||||||
|
|
||||||
/*
|
// src attribute changes normally initiate a navigation. We suppress
|
||||||
src attribute changes normally initiate a navigation. We suppress
|
// the next src attribute handler call to avoid reloading the page
|
||||||
the next src attribute handler call to avoid reloading the page
|
// on every guest-initiated navigation.
|
||||||
on every guest-initiated navigation.
|
|
||||||
*/
|
|
||||||
this.setValueIgnoreMutation(oldValue);
|
this.setValueIgnoreMutation(oldValue);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -266,13 +232,10 @@ SrcAttribute = (function(superClass) {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/*
|
// The purpose of this mutation observer is to catch assignment to the src
|
||||||
The purpose of this mutation observer is to catch assignment to the src
|
// attribute without any changes to its value. This is useful in the case
|
||||||
attribute without any changes to its value. This is useful in the case
|
// where the webview guest has crashed and navigating to the same address
|
||||||
where the webview guest has crashed and navigating to the same address
|
// spawns off a new process.
|
||||||
spawns off a new process.
|
|
||||||
*/
|
|
||||||
|
|
||||||
SrcAttribute.prototype.setupMutationObserver = function() {
|
SrcAttribute.prototype.setupMutationObserver = function() {
|
||||||
var params;
|
var params;
|
||||||
this.observer = new MutationObserver((function(_this) {
|
this.observer = new MutationObserver((function(_this) {
|
||||||
|
@ -328,9 +291,7 @@ SrcAttribute = (function(superClass) {
|
||||||
|
|
||||||
})(WebViewAttribute);
|
})(WebViewAttribute);
|
||||||
|
|
||||||
|
|
||||||
// Attribute specifies HTTP referrer.
|
// Attribute specifies HTTP referrer.
|
||||||
|
|
||||||
HttpReferrerAttribute = (function(superClass) {
|
HttpReferrerAttribute = (function(superClass) {
|
||||||
extend(HttpReferrerAttribute, superClass);
|
extend(HttpReferrerAttribute, superClass);
|
||||||
|
|
||||||
|
@ -342,9 +303,7 @@ HttpReferrerAttribute = (function(superClass) {
|
||||||
|
|
||||||
})(WebViewAttribute);
|
})(WebViewAttribute);
|
||||||
|
|
||||||
|
|
||||||
// Attribute specifies user agent
|
// Attribute specifies user agent
|
||||||
|
|
||||||
UserAgentAttribute = (function(superClass) {
|
UserAgentAttribute = (function(superClass) {
|
||||||
extend(UserAgentAttribute, superClass);
|
extend(UserAgentAttribute, superClass);
|
||||||
|
|
||||||
|
@ -356,9 +315,7 @@ UserAgentAttribute = (function(superClass) {
|
||||||
|
|
||||||
})(WebViewAttribute);
|
})(WebViewAttribute);
|
||||||
|
|
||||||
|
|
||||||
// Attribute that set preload script.
|
// Attribute that set preload script.
|
||||||
|
|
||||||
PreloadAttribute = (function(superClass) {
|
PreloadAttribute = (function(superClass) {
|
||||||
extend(PreloadAttribute, superClass);
|
extend(PreloadAttribute, superClass);
|
||||||
|
|
||||||
|
@ -384,9 +341,7 @@ PreloadAttribute = (function(superClass) {
|
||||||
|
|
||||||
})(WebViewAttribute);
|
})(WebViewAttribute);
|
||||||
|
|
||||||
|
|
||||||
// Sets up all of the webview attributes.
|
// Sets up all of the webview attributes.
|
||||||
|
|
||||||
WebViewImpl.prototype.setupWebViewAttributes = function() {
|
WebViewImpl.prototype.setupWebViewAttributes = function() {
|
||||||
var attribute, autosizeAttributes, i, len, results;
|
var attribute, autosizeAttributes, i, len, results;
|
||||||
this.attributes = {};
|
this.attributes = {};
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
module.exports = {
|
module.exports = {
|
||||||
|
|
||||||
// Attributes.
|
// Attributes.
|
||||||
ATTRIBUTE_ALLOWTRANSPARENCY: 'allowtransparency',
|
ATTRIBUTE_ALLOWTRANSPARENCY: 'allowtransparency',
|
||||||
ATTRIBUTE_AUTOSIZE: 'autosize',
|
ATTRIBUTE_AUTOSIZE: 'autosize',
|
||||||
|
|
|
@ -12,18 +12,14 @@ guestViewInternal = require('./guest-view-internal');
|
||||||
|
|
||||||
webViewConstants = require('./web-view-constants');
|
webViewConstants = require('./web-view-constants');
|
||||||
|
|
||||||
|
|
||||||
// ID generator.
|
// ID generator.
|
||||||
|
|
||||||
nextId = 0;
|
nextId = 0;
|
||||||
|
|
||||||
getNextId = function() {
|
getNextId = function() {
|
||||||
return ++nextId;
|
return ++nextId;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Represents the internal state of the WebView node.
|
// Represents the internal state of the WebView node.
|
||||||
|
|
||||||
WebViewImpl = (function() {
|
WebViewImpl = (function() {
|
||||||
function WebViewImpl(webviewNode) {
|
function WebViewImpl(webviewNode) {
|
||||||
var shadowRoot;
|
var shadowRoot;
|
||||||
|
@ -50,32 +46,25 @@ WebViewImpl = (function() {
|
||||||
}
|
}
|
||||||
|
|
||||||
WebViewImpl.prototype.createBrowserPluginNode = function() {
|
WebViewImpl.prototype.createBrowserPluginNode = function() {
|
||||||
|
// We create BrowserPlugin as a custom element in order to observe changes
|
||||||
/*
|
// to attributes synchronously.
|
||||||
We create BrowserPlugin as a custom element in order to observe changes
|
|
||||||
to attributes synchronously.
|
|
||||||
*/
|
|
||||||
var browserPluginNode;
|
var browserPluginNode;
|
||||||
browserPluginNode = new WebViewImpl.BrowserPlugin();
|
browserPluginNode = new WebViewImpl.BrowserPlugin();
|
||||||
v8Util.setHiddenValue(browserPluginNode, 'internal', this);
|
v8Util.setHiddenValue(browserPluginNode, 'internal', this);
|
||||||
return browserPluginNode;
|
return browserPluginNode;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Resets some state upon reattaching <webview> element to the DOM.
|
// Resets some state upon reattaching <webview> element to the DOM.
|
||||||
|
|
||||||
WebViewImpl.prototype.reset = function() {
|
WebViewImpl.prototype.reset = function() {
|
||||||
// Unlisten the zoom-level-changed event.
|
// 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
|
||||||
If guestInstanceId is defined then the <webview> has navigated and has
|
// already picked up a partition ID. Thus, we need to reset the initialization
|
||||||
already picked up a partition ID. Thus, we need to reset the initialization
|
// state. However, it may be the case that beforeFirstNavigation is false BUT
|
||||||
state. However, it may be the case that beforeFirstNavigation is false BUT
|
// guestInstanceId has yet to be initialized. This means that we have not
|
||||||
guestInstanceId has yet to be initialized. This means that we have not
|
// heard back from createGuest yet. We will not reset the flag in this case so
|
||||||
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.
|
||||||
that we don't end up allocating a second guest.
|
|
||||||
*/
|
|
||||||
if (this.guestInstanceId) {
|
if (this.guestInstanceId) {
|
||||||
guestViewInternal.destroyGuest(this.guestInstanceId);
|
guestViewInternal.destroyGuest(this.guestInstanceId);
|
||||||
this.webContents = null;
|
this.webContents = null;
|
||||||
|
@ -86,9 +75,7 @@ WebViewImpl = (function() {
|
||||||
return this.internalInstanceId = 0;
|
return this.internalInstanceId = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Sets the <webview>.request property.
|
// Sets the <webview>.request property.
|
||||||
|
|
||||||
WebViewImpl.prototype.setRequestPropertyOnWebViewNode = function(request) {
|
WebViewImpl.prototype.setRequestPropertyOnWebViewNode = function(request) {
|
||||||
return Object.defineProperty(this.webviewNode, 'request', {
|
return Object.defineProperty(this.webviewNode, 'request', {
|
||||||
value: request,
|
value: request,
|
||||||
|
@ -99,12 +86,10 @@ WebViewImpl = (function() {
|
||||||
WebViewImpl.prototype.setupFocusPropagation = function() {
|
WebViewImpl.prototype.setupFocusPropagation = function() {
|
||||||
if (!this.webviewNode.hasAttribute('tabIndex')) {
|
if (!this.webviewNode.hasAttribute('tabIndex')) {
|
||||||
|
|
||||||
/*
|
// <webview> needs a tabIndex in order to be focusable.
|
||||||
<webview> needs a tabIndex in order to be focusable.
|
// TODO(fsamuel): It would be nice to avoid exposing a tabIndex attribute
|
||||||
TODO(fsamuel): It would be nice to avoid exposing a tabIndex attribute
|
// to allow <webview> to be focusable.
|
||||||
to allow <webview> to be focusable.
|
// See http://crbug.com/231664.
|
||||||
See http://crbug.com/231664.
|
|
||||||
*/
|
|
||||||
this.webviewNode.setAttribute('tabIndex', -1);
|
this.webviewNode.setAttribute('tabIndex', -1);
|
||||||
}
|
}
|
||||||
this.webviewNode.addEventListener('focus', (function(_this) {
|
this.webviewNode.addEventListener('focus', (function(_this) {
|
||||||
|
@ -124,14 +109,11 @@ WebViewImpl = (function() {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/*
|
// This observer monitors mutations to attributes of the <webview> and
|
||||||
This observer monitors mutations to attributes of the <webview> and
|
// updates the BrowserPlugin properties accordingly. In turn, updating
|
||||||
updates the BrowserPlugin properties accordingly. In turn, updating
|
// a BrowserPlugin property will update the corresponding BrowserPlugin
|
||||||
a BrowserPlugin property will update the corresponding BrowserPlugin
|
// attribute, if necessary. See BrowserPlugin::UpdateDOMAttribute for more
|
||||||
attribute, if necessary. See BrowserPlugin::UpdateDOMAttribute for more
|
// details.
|
||||||
details.
|
|
||||||
*/
|
|
||||||
|
|
||||||
WebViewImpl.prototype.handleWebviewAttributeMutation = function(attributeName, oldValue, newValue) {
|
WebViewImpl.prototype.handleWebviewAttributeMutation = function(attributeName, oldValue, newValue) {
|
||||||
if (!this.attributes[attributeName] || this.attributes[attributeName].ignoreMutation) {
|
if (!this.attributes[attributeName] || this.attributes[attributeName].ignoreMutation) {
|
||||||
return;
|
return;
|
||||||
|
@ -164,7 +146,6 @@ WebViewImpl = (function() {
|
||||||
height = node.offsetHeight;
|
height = node.offsetHeight;
|
||||||
|
|
||||||
// Check the current bounds to make sure we do not resize <webview>
|
// Check the current bounds to make sure we do not resize <webview>
|
||||||
|
|
||||||
// outside of current constraints.
|
// outside of current constraints.
|
||||||
maxWidth = this.attributes[webViewConstants.ATTRIBUTE_MAXWIDTH].getValue() | width;
|
maxWidth = this.attributes[webViewConstants.ATTRIBUTE_MAXWIDTH].getValue() | width;
|
||||||
maxHeight = this.attributes[webViewConstants.ATTRIBUTE_MAXHEIGHT].getValue() | width;
|
maxHeight = this.attributes[webViewConstants.ATTRIBUTE_MAXHEIGHT].getValue() | width;
|
||||||
|
@ -176,16 +157,13 @@ WebViewImpl = (function() {
|
||||||
node.style.width = newWidth + 'px';
|
node.style.width = newWidth + 'px';
|
||||||
node.style.height = newHeight + 'px';
|
node.style.height = newHeight + 'px';
|
||||||
|
|
||||||
/*
|
// Only fire the DOM event if the size of the <webview> has actually
|
||||||
Only fire the DOM event if the size of the <webview> has actually
|
// changed.
|
||||||
changed.
|
|
||||||
*/
|
|
||||||
return this.dispatchEvent(webViewEvent);
|
return this.dispatchEvent(webViewEvent);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
WebViewImpl.prototype.onElementResize = function(newSize) {
|
WebViewImpl.prototype.onElementResize = function(newSize) {
|
||||||
|
|
||||||
// Dispatch the 'resize' event.
|
// Dispatch the 'resize' event.
|
||||||
var resizeEvent;
|
var resizeEvent;
|
||||||
resizeEvent = new Event('resize', {
|
resizeEvent = new Event('resize', {
|
||||||
|
@ -213,12 +191,8 @@ WebViewImpl = (function() {
|
||||||
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
|
// Adds an 'on<event>' property on the webview, which can be used to set/unset
|
||||||
|
|
||||||
|
|
||||||
// an event handler.
|
// an event handler.
|
||||||
|
|
||||||
WebViewImpl.prototype.setupEventProperty = function(eventName) {
|
WebViewImpl.prototype.setupEventProperty = function(eventName) {
|
||||||
var propertyName;
|
var propertyName;
|
||||||
propertyName = 'on' + eventName.toLowerCase();
|
propertyName = 'on' + eventName.toLowerCase();
|
||||||
|
@ -243,20 +217,16 @@ WebViewImpl = (function() {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Updates state upon loadcommit.
|
// Updates state upon loadcommit.
|
||||||
|
|
||||||
WebViewImpl.prototype.onLoadCommit = function(webViewEvent) {
|
WebViewImpl.prototype.onLoadCommit = function(webViewEvent) {
|
||||||
var newValue, oldValue;
|
var newValue, oldValue;
|
||||||
oldValue = this.webviewNode.getAttribute(webViewConstants.ATTRIBUTE_SRC);
|
oldValue = this.webviewNode.getAttribute(webViewConstants.ATTRIBUTE_SRC);
|
||||||
newValue = webViewEvent.url;
|
newValue = webViewEvent.url;
|
||||||
if (webViewEvent.isMainFrame && (oldValue !== newValue)) {
|
if (webViewEvent.isMainFrame && (oldValue !== newValue)) {
|
||||||
|
|
||||||
/*
|
// Touching the src attribute triggers a navigation. To avoid
|
||||||
Touching the src attribute triggers a navigation. To avoid
|
// triggering a page reload on every guest-initiated navigation,
|
||||||
triggering a page reload on every guest-initiated navigation,
|
// we do not handle this mutation.
|
||||||
we do not handle this mutation.
|
|
||||||
*/
|
|
||||||
return this.attributes[webViewConstants.ATTRIBUTE_SRC].setValueIgnoreMutation(newValue);
|
return this.attributes[webViewConstants.ATTRIBUTE_SRC].setValueIgnoreMutation(newValue);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -278,13 +248,11 @@ WebViewImpl = (function() {
|
||||||
params[attributeName] = attribute.getValue();
|
params[attributeName] = attribute.getValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
// When the WebView is not participating in layout (display:none)
|
||||||
When the WebView is not participating in layout (display:none)
|
// then getBoundingClientRect() would report a width and height of 0.
|
||||||
then getBoundingClientRect() would report a width and height of 0.
|
// However, in the case where the WebView has a fixed size we can
|
||||||
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
|
||||||
use that value to initially size the guest so as to avoid a relayout of
|
// the on display:block.
|
||||||
the on display:block.
|
|
||||||
*/
|
|
||||||
css = window.getComputedStyle(this.webviewNode, null);
|
css = window.getComputedStyle(this.webviewNode, null);
|
||||||
elementRect = this.webviewNode.getBoundingClientRect();
|
elementRect = this.webviewNode.getBoundingClientRect();
|
||||||
params.elementWidth = parseInt(elementRect.width) || parseInt(css.getPropertyValue('width'));
|
params.elementWidth = parseInt(elementRect.width) || parseInt(css.getPropertyValue('width'));
|
||||||
|
@ -305,9 +273,7 @@ WebViewImpl = (function() {
|
||||||
|
|
||||||
})();
|
})();
|
||||||
|
|
||||||
|
|
||||||
// Registers browser plugin <object> custom element.
|
// Registers browser plugin <object> custom element.
|
||||||
|
|
||||||
registerBrowserPluginElement = function() {
|
registerBrowserPluginElement = function() {
|
||||||
var proto;
|
var proto;
|
||||||
proto = Object.create(HTMLObjectElement.prototype);
|
proto = Object.create(HTMLObjectElement.prototype);
|
||||||
|
@ -329,7 +295,6 @@ registerBrowserPluginElement = function() {
|
||||||
return internal.handleBrowserPluginAttributeMutation(name, oldValue, newValue);
|
return internal.handleBrowserPluginAttributeMutation(name, oldValue, newValue);
|
||||||
};
|
};
|
||||||
proto.attachedCallback = function() {
|
proto.attachedCallback = function() {
|
||||||
|
|
||||||
// Load the plugin immediately.
|
// Load the plugin immediately.
|
||||||
var unused;
|
var unused;
|
||||||
return unused = this.nonExistentAttribute;
|
return unused = this.nonExistentAttribute;
|
||||||
|
@ -344,9 +309,7 @@ registerBrowserPluginElement = function() {
|
||||||
return delete proto.attributeChangedCallback;
|
return delete proto.attributeChangedCallback;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Registers <webview> custom element.
|
// Registers <webview> custom element.
|
||||||
|
|
||||||
registerWebViewElement = function() {
|
registerWebViewElement = function() {
|
||||||
var createBlockHandler, createNonBlockHandler, i, j, len, len1, m, methods, nonblockMethods, proto;
|
var createBlockHandler, createNonBlockHandler, i, j, len, len1, m, methods, nonblockMethods, proto;
|
||||||
proto = Object.create(HTMLObjectElement.prototype);
|
proto = Object.create(HTMLObjectElement.prototype);
|
||||||
|
@ -385,7 +348,51 @@ registerWebViewElement = function() {
|
||||||
};
|
};
|
||||||
|
|
||||||
// Public-facing API methods.
|
// Public-facing API methods.
|
||||||
methods = ['getURL', 'getTitle', 'isLoading', 'isWaitingForResponse', 'stop', 'reload', 'reloadIgnoringCache', 'canGoBack', 'canGoForward', 'canGoToOffset', 'clearHistory', 'goBack', 'goForward', 'goToIndex', 'goToOffset', 'isCrashed', 'setUserAgent', 'getUserAgent', 'openDevTools', 'closeDevTools', 'isDevToolsOpened', 'isDevToolsFocused', 'inspectElement', 'setAudioMuted', 'isAudioMuted', 'undo', 'redo', 'cut', 'copy', 'paste', 'pasteAndMatchStyle', 'delete', 'selectAll', 'unselect', 'replace', 'replaceMisspelling', 'findInPage', 'stopFindInPage', 'getId', 'downloadURL', 'inspectServiceWorker', 'print', 'printToPDF'];
|
methods = [
|
||||||
|
'getURL',
|
||||||
|
'getTitle',
|
||||||
|
'isLoading',
|
||||||
|
'isWaitingForResponse',
|
||||||
|
'stop',
|
||||||
|
'reload',
|
||||||
|
'reloadIgnoringCache',
|
||||||
|
'canGoBack',
|
||||||
|
'canGoForward',
|
||||||
|
'canGoToOffset',
|
||||||
|
'clearHistory',
|
||||||
|
'goBack',
|
||||||
|
'goForward',
|
||||||
|
'goToIndex',
|
||||||
|
'goToOffset',
|
||||||
|
'isCrashed',
|
||||||
|
'setUserAgent',
|
||||||
|
'getUserAgent',
|
||||||
|
'openDevTools',
|
||||||
|
'closeDevTools',
|
||||||
|
'isDevToolsOpened',
|
||||||
|
'isDevToolsFocused',
|
||||||
|
'inspectElement',
|
||||||
|
'setAudioMuted',
|
||||||
|
'isAudioMuted',
|
||||||
|
'undo',
|
||||||
|
'redo',
|
||||||
|
'cut',
|
||||||
|
'copy',
|
||||||
|
'paste',
|
||||||
|
'pasteAndMatchStyle',
|
||||||
|
'delete',
|
||||||
|
'selectAll',
|
||||||
|
'unselect',
|
||||||
|
'replace',
|
||||||
|
'replaceMisspelling',
|
||||||
|
'findInPage',
|
||||||
|
'stopFindInPage',
|
||||||
|
'getId',
|
||||||
|
'downloadURL',
|
||||||
|
'inspectServiceWorker',
|
||||||
|
'print',
|
||||||
|
'printToPDF'
|
||||||
|
];
|
||||||
nonblockMethods = [
|
nonblockMethods = [
|
||||||
'executeJavaScript',
|
'executeJavaScript',
|
||||||
'insertCSS',
|
'insertCSS',
|
||||||
|
@ -429,10 +436,8 @@ registerWebViewElement = function() {
|
||||||
prototype: proto
|
prototype: proto
|
||||||
});
|
});
|
||||||
|
|
||||||
/*
|
// Delete the callbacks so developers cannot call them and produce unexpected
|
||||||
Delete the callbacks so developers cannot call them and produce unexpected
|
// behavior.
|
||||||
behavior.
|
|
||||||
*/
|
|
||||||
delete proto.createdCallback;
|
delete proto.createdCallback;
|
||||||
delete proto.attachedCallback;
|
delete proto.attachedCallback;
|
||||||
delete proto.detachedCallback;
|
delete proto.detachedCallback;
|
||||||
|
|
Loading…
Reference in a new issue