mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Use // for single line comments

Browse source
This commit is contained in:
Kevin Sawicki 2016-01-14 10:35:29 -08:00
parent 26350f4ccb
commit f4af744519
43 changed files with 311 additions and 310 deletions
Download patch file Download diff file Expand all files Collapse all files

14
atom/browser/api/lib/app.js
View file

@ -54,7 +54,7 @@ app.getAppPath = function() {
};
/* Routes the events to webContents. */
// Routes the events to webContents.
ref1 = ['login', 'certificate-error', 'select-client-certificate'];
fn = function(name) {
@ -70,7 +70,7 @@ for (i = 0, len = ref1.length; i < len; i++) {
}
/* Deprecated. */
// Deprecated.
app.getHomeDir = deprecate('app.getHomeDir', 'app.getPath', function() {
return this.getPath('home');
@ -92,7 +92,7 @@ deprecate.rename(app, 'terminate', 'quit');
deprecate.event(app, 'finish-launching', 'ready', function() {
/* give default app a chance to setup default menu. */
// give default app a chance to setup default menu.
return setImmediate((function(_this) {
return function() {
return _this.emit('finish-launching');
@ -109,14 +109,14 @@ deprecate.event(app, 'activate-with-no-open-windows', 'activate', function(event
deprecate.event(app, 'select-certificate', 'select-client-certificate');
/* Wrappers for native classes. */
// Wrappers for native classes.
wrapDownloadItem = function(downloadItem) {
/* downloadItem is an EventEmitter. */
// downloadItem is an EventEmitter.
downloadItem.__proto__ = EventEmitter.prototype;
/* Deprecated. */
// Deprecated.
deprecate.property(downloadItem, 'url', 'getURL');
deprecate.property(downloadItem, 'filename', 'getFilename');
deprecate.property(downloadItem, 'mimeType', 'getMimeType');
@ -126,6 +126,6 @@ wrapDownloadItem = function(downloadItem) {
downloadItemBindings._setWrapDownloadItem(wrapDownloadItem);
/* Only one App object pemitted. */
// Only one App object pemitted.
module.exports = app;

2
atom/browser/api/lib/auto-updater.js
View file

@ -5,7 +5,7 @@ deprecate = require('electron').deprecate;
autoUpdater = process.platform === 'win32' ? require('./auto-updater/auto-updater-win') : require('./auto-updater/auto-updater-native');
/* Deprecated. */
// Deprecated.
deprecate.rename(autoUpdater, 'setFeedUrl', 'setFeedURL');

2
atom/browser/api/lib/auto-updater/auto-updater-win.js
View file

@ -50,7 +50,7 @@ AutoUpdater = (function(superClass) {
}
releaseNotes = update.releaseNotes, version = update.version;
/* Following information is not available on Windows, so fake them. */
// Following information is not available on Windows, so fake them.
date = new Date;
url = _this.updateURL;
return _this.emit('update-downloaded', {}, releaseNotes, version, date, url, function() {

22
atom/browser/api/lib/auto-updater/squirrel-update-win.js
View file

@ -7,12 +7,12 @@ path = require('path');
spawn = require('child_process').spawn;
/* i.e. my-app/app-0.1.13/ */
// i.e. my-app/app-0.1.13/
appFolder = path.dirname(process.execPath);
/* i.e. my-app/Update.exe */
// i.e. my-app/Update.exe
updateExe = path.resolve(appFolder, '..', 'Update.exe');
@ -33,7 +33,7 @@ spawnUpdate = function(args, detached, callback) {
} catch (error1) {
error = error1;
/* Shouldn't happen, but still guard it. */
// Shouldn't happen, but still guard it.
process.nextTick(function() {
return callback(error);
});
@ -54,30 +54,30 @@ spawnUpdate = function(args, detached, callback) {
});
return spawnedProcess.on('exit', function(code, signal) {
/* We may have already emitted an error. */
// We may have already emitted an error.
if (errorEmitted) {
return;
}
/* Process terminated with error. */
// Process terminated with error.
if (code !== 0) {
return callback("Command failed: " + (signal != null ? signal : code) + "\n" + stderr);
}
/* Success. */
// Success.
return callback(null, stdout);
});
};
/* Start an instance of the installed app. */
// Start an instance of the installed app.
exports.processStart = function(callback) {
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) {
return spawnUpdate(['--download', updateURL], false, function(error, stdout) {
@ -87,7 +87,7 @@ exports.download = function(updateURL, callback) {
}
try {
/* Last line of output is the JSON details about the releases */
// Last line of output is the JSON details about the releases
json = stdout.trim().split('\n').pop();
update = (ref = JSON.parse(json)) != null ? (ref1 = ref.releasesToApply) != null ? typeof ref1.pop === "function" ? ref1.pop() : void 0 : void 0 : void 0;
} catch (error1) {
@ -98,14 +98,14 @@ 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) {
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() {
var error1;

22
atom/browser/api/lib/browser-window.js
View file

@ -10,11 +10,11 @@ BrowserWindow.prototype.__proto__ = EventEmitter.prototype;
BrowserWindow.prototype._init = function() {
/* avoid recursive require. */
// avoid recursive require.
var app, menu;
app = require('electron').app;
/* Simulate the application menu on platforms other than OS X. */
// Simulate the application menu on platforms other than OS X.
if (process.platform !== 'darwin') {
menu = app.getApplicationMenu();
if (menu != null) {
@ -22,7 +22,7 @@ BrowserWindow.prototype._init = function() {
}
}
/* Make new windows requested by links behave like "window.open" */
// Make new windows requested by links behave like "window.open"
this.webContents.on('-new-window', function(event, url, frameName) {
var options;
options = {
@ -43,7 +43,7 @@ BrowserWindow.prototype._init = function() {
};
})(this));
/* Hide the auto-hide menu when webContents is focused. */
// Hide the auto-hide menu when webContents is focused.
this.webContents.on('activate', (function(_this) {
return function() {
if (process.platform !== 'darwin' && _this.isMenuBarAutoHide() && _this.isMenuBarVisible()) {
@ -52,14 +52,14 @@ BrowserWindow.prototype._init = function() {
};
})(this));
/* Forward the crashed event. */
// Forward the crashed event.
this.webContents.on('crashed', (function(_this) {
return function() {
return _this.emit('crashed');
};
})(this));
/* Change window title to page title. */
// Change window title to page title.
this.webContents.on('page-title-updated', (function(_this) {
return function(event, title, explicitSet) {
_this.emit('page-title-updated', event, title);
@ -81,7 +81,7 @@ BrowserWindow.prototype._init = function() {
return this.focus();
});
/* Redirect focus/blur event to app instance too. */
// Redirect focus/blur event to app instance too.
this.on('blur', (function(_this) {
return function(event) {
return app.emit('browser-window-blur', event, _this);
@ -93,10 +93,10 @@ BrowserWindow.prototype._init = function() {
};
})(this));
/* Notify the creation of the window. */
// Notify the creation of the window.
app.emit('browser-window-created', {}, this);
/* Be compatible with old APIs. */
// Be compatible with old APIs.
this.webContents.on('devtools-focused', (function(_this) {
return function() {
return _this.emit('devtools-focused');
@ -156,7 +156,7 @@ BrowserWindow.fromDevToolsWebContents = function(webContents) {
};
/* Helpers. */
// Helpers.
BrowserWindow.prototype.loadURL = function() {
return this.webContents.loadURL.apply(this.webContents, arguments);
@ -203,7 +203,7 @@ BrowserWindow.prototype.inspectServiceWorker = function() {
};
/* Deprecated. */
// Deprecated.
deprecate.member(BrowserWindow, 'undo', 'webContents');

8
atom/browser/api/lib/dialog.js
View file

@ -24,14 +24,14 @@ messageBoxOptions = {
parseArgs = function(window, options, callback) {
if (!(window === null || (window != null ? window.constructor : void 0) === BrowserWindow)) {
/* Shift. */
// Shift.
callback = options;
options = window;
window = null;
}
if ((callback == null) && typeof options === 'function') {
/* Shift. */
// Shift.
callback = options;
options = null;
}
@ -143,7 +143,7 @@ module.exports = {
options.defaultId = -1;
}
/* Choose a default button to get selected when dialog is cancelled. */
// Choose a default button to get selected when dialog is cancelled.
if (options.cancelId == null) {
options.cancelId = 0;
ref2 = options.buttons;
@ -166,7 +166,7 @@ module.exports = {
};
/* Mark standard asynchronous functions. */
// Mark standard asynchronous functions.
ref1 = ['showMessageBox', 'showOpenDialog', 'showSaveDialog'];
for (j = 0, len = ref1.length; j < len; j++) {

6
atom/browser/api/lib/exports/electron.js
View file

@ -3,13 +3,13 @@ var common;
common = require('../../../../common/api/lib/exports/electron');
/* Import common modules. */
// Import common modules.
common.defineProperties(exports);
Object.defineProperties(exports, {
/* Browser side modules, please sort with alphabet order. */
// Browser side modules, please sort with alphabet order.
app: {
enumerable: true,
get: function() {
@ -101,7 +101,7 @@ Object.defineProperties(exports, {
}
},
/* The internal modules, invisible unless you know their names. */
// The internal modules, invisible unless you know their names.
NavigationController: {
get: function() {
return require('../navigation-controller');

2
atom/browser/api/lib/ipc.js
View file

@ -3,7 +3,7 @@ var deprecate, ipcMain, ref;
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');

6
atom/browser/api/lib/menu-item.js
View file

@ -5,7 +5,7 @@ v8Util = process.atomBinding('v8_util');
nextCommandId = 0;
/* Maps role to methods of webContents */
// Maps role to methods of webContents
rolesMap = {
undo: 'undo',
@ -19,7 +19,7 @@ rolesMap = {
};
/* Maps methods that should be called directly on the BrowserWindow instance */
// Maps methods that should be called directly on the BrowserWindow instance
methodInBrowserWindow = {
minimize: true,
@ -59,7 +59,7 @@ MenuItem = (function() {
this.click = (function(_this) {
return function(focusedWindow) {
/* Manually flip the checked flags when clicked. */
// Manually flip the checked flags when clicked.
var methodName, ref1, ref2;
if ((ref1 = _this.type) === 'checkbox' || ref1 === 'radio') {
_this.checked = !_this.checked;

32
atom/browser/api/lib/menu.js
View file

@ -9,15 +9,15 @@ v8Util = process.atomBinding('v8_util');
bindings = process.atomBinding('menu');
/* Automatically generated radio menu item's group id. */
// Automatically generated radio menu item's group id.
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) {
var i, item, j, k, ref1, ref2, ref3;
@ -46,7 +46,7 @@ generateGroupId = function(items, pos) {
};
/* Returns the index of item according to |id|. */
// Returns the index of item according to |id|.
indexOfItemById = function(items, id) {
var i, item, j, len;
@ -60,7 +60,7 @@ indexOfItemById = function(items, id) {
};
/* 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) {
var id, insertIndex, query, ref1;
@ -79,7 +79,7 @@ indexToInsertByPosition = function(items, position) {
break;
case 'endof':
/* If the |id| doesn't exist, then create a new group with the |id|. */
// If the |id| doesn't exist, then create a new group with the |id|.
if (insertIndex === -1) {
items.push({
id: id,
@ -88,7 +88,7 @@ indexToInsertByPosition = function(items, position) {
insertIndex = items.length - 1;
}
/* Find the end of the group. */
// Find the end of the group.
insertIndex++;
while (insertIndex < items.length && items[insertIndex].type !== 'separator') {
insertIndex++;
@ -145,7 +145,7 @@ Menu.prototype._init = function() {
menuWillShow: (function(_this) {
return function() {
/* Make sure radio groups have at least one menu item seleted. */
// Make sure radio groups have at least one menu item seleted.
var checked, group, id, j, len, radioItem, ref1, results;
ref1 = _this.groupsMap;
results = [];
@ -175,7 +175,7 @@ Menu.prototype._init = function() {
Menu.prototype.popup = function(window, x, y) {
if ((window != null ? window.constructor : void 0) !== BrowserWindow) {
/* Shift. */
// Shift.
y = x;
x = window;
window = BrowserWindow.getFocusedWindow();
@ -211,14 +211,14 @@ Menu.prototype.insert = function(pos, item) {
break;
case 'radio':
/* Grouping radio menu items. */
// Grouping radio menu items.
item.overrideReadOnlyProperty('groupId', generateGroupId(this.items, pos));
if ((base = this.groupsMap)[name = item.groupId] == null) {
base[name] = [];
}
this.groupsMap[item.groupId].push(item);
/* Setting a radio menu item should flip other items in the group. */
// Setting a radio menu item should flip other items in the group.
v8Util.setHiddenValue(item, 'checked', item.checked);
Object.defineProperty(item, 'checked', {
enumerable: true,
@ -251,16 +251,16 @@ Menu.prototype.insert = function(pos, item) {
this.setRole(pos, item.role);
}
/* Make menu accessable to items. */
// Make menu accessable to items.
item.overrideReadOnlyProperty('menu', this);
/* Remember the items. */
// Remember the items.
this.items.splice(pos, 0, item);
return this.commandsMap[item.commandId] = item;
};
/* Force menuWillShow to be called */
// Force menuWillShow to be called
Menu.prototype._callMenuWillShow = function() {
var item, j, len, ref1, ref2, results;
@ -286,7 +286,7 @@ Menu.setApplicationMenu = function(menu) {
throw new TypeError('Invalid menu');
}
/* Keep a reference. */
// Keep a reference.
applicationMenu = menu;
if (process.platform === 'darwin') {
if (menu === null) {
@ -324,7 +324,7 @@ Menu.buildFromTemplate = function(template) {
insertIndex = indexToInsertByPosition(positionedTemplate, item.position);
} else {
/* If no |position| is specified, insert after last item. */
// If no |position| is specified, insert after last item.
insertIndex++;
}
positionedTemplate.splice(insertIndex, 0, item);

14
atom/browser/api/lib/navigation-controller.js
View file

@ -4,7 +4,7 @@ var NavigationController, 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() {
var args, event, method, ref;
@ -32,7 +32,7 @@ NavigationController = (function() {
this.webContents = webContents;
this.clearHistory();
/* webContents may have already navigated to a page. */
// webContents may have already navigated to a page.
if (this.webContents._getURL()) {
this.currentIndex++;
this.history.push(this.webContents._getURL());
@ -42,26 +42,26 @@ NavigationController = (function() {
var currentEntry;
if (_this.inPageIndex > -1 && !inPage) {
/* Navigated to a new page, clear in-page mark. */
// Navigated to a new page, clear in-page mark.
_this.inPageIndex = -1;
} else if (_this.inPageIndex === -1 && inPage) {
/* Started in-page navigations. */
// Started in-page navigations.
_this.inPageIndex = _this.currentIndex;
}
if (_this.pendingIndex >= 0) {
/* Go to index. */
// Go to index.
_this.currentIndex = _this.pendingIndex;
_this.pendingIndex = -1;
return _this.history[_this.currentIndex] = url;
} else if (replaceEntry) {
/* Non-user initialized navigation. */
// Non-user initialized navigation.
return _this.history[_this.currentIndex] = url;
} else {
/* Normal navigation. Clear history. */
// Normal navigation. Clear history.
_this.history = _this.history.slice(0, _this.currentIndex + 1);
currentEntry = _this.history[_this.currentIndex];
if ((currentEntry != null ? currentEntry.url : void 0) !== url) {

2
atom/browser/api/lib/protocol.js
View file

@ -9,7 +9,7 @@ if (!app.isReady()) {
protocol = process.atomBinding('protocol').protocol;
/* Warn about removed APIs. */
// Warn about removed APIs.
logAndThrow = function(callback, message) {
console.error(message);

6
atom/browser/api/lib/session.js
View file

@ -7,7 +7,7 @@ bindings = process.atomBinding('session');
PERSIST_PERFIX = 'persist:';
/* Returns the Session from |partition| string. */
// Returns the Session from |partition| string.
exports.fromPartition = function(partition) {
if (partition == null) {
@ -24,7 +24,7 @@ exports.fromPartition = function(partition) {
};
/* Returns the default session. */
// Returns the default session.
Object.defineProperty(exports, 'defaultSession', {
enumerable: true,
@ -35,7 +35,7 @@ Object.defineProperty(exports, 'defaultSession', {
wrapSession = function(session) {
/* session is an EventEmitter. */
// session is an EventEmitter.
return session.__proto__ = EventEmitter.prototype;
};

4
atom/browser/api/lib/tray.js
View file

@ -10,7 +10,7 @@ Tray.prototype.__proto__ = EventEmitter.prototype;
Tray.prototype._init = function() {
/* Deprecated. */
// Deprecated.
deprecate.rename(this, 'popContextMenu', 'popUpContextMenu');
deprecate.event(this, 'clicked', 'click');
deprecate.event(this, 'double-clicked', 'double-click');
@ -21,7 +21,7 @@ Tray.prototype._init = function() {
Tray.prototype.setContextMenu = function(menu) {
this._setContextMenu(menu);
/* Keep a strong reference of menu. */
// Keep a strong reference of menu.
return this.menu = menu;
};

16
atom/browser/api/lib/web-contents.js
View file

@ -66,18 +66,18 @@ const webFrameMethods = [
wrapWebContents = function(webContents) {
/* webContents is an EventEmitter. */
// webContents is an EventEmitter.
var controller, method, name, ref1;
webContents.__proto__ = EventEmitter.prototype;
/* WebContents::send(channel, args..) */
// WebContents::send(channel, args..)
webContents.send = function() {
var args, channel;
channel = arguments[0], args = 2 <= arguments.length ? slice.call(arguments, 1) : [];
return this._send(channel, slice.call(args));
};
/* The navigation controller. */
// The navigation controller.
controller = new NavigationController(webContents);
ref1 = NavigationController.prototype;
for (name in ref1) {
@ -109,7 +109,7 @@ wrapWebContents = function(webContents) {
return this.once('did-finish-load', executeJavaScript.bind(this, code, hasUserGesture));
};
/* Dispatch IPC messages to the ipc module. */
// Dispatch IPC messages to the ipc module.
webContents.on('ipc-message', function(event, packed) {
var args, channel;
channel = packed[0], args = 2 <= packed.length ? slice.call(packed, 1) : [];
@ -126,14 +126,14 @@ wrapWebContents = function(webContents) {
return ipcMain.emit.apply(ipcMain, [channel, event].concat(slice.call(args)));
});
/* Handle context menu action request from pepper plugin. */
// Handle context menu action request from pepper plugin.
webContents.on('pepper-context-menu', function(event, params) {
var menu;
menu = Menu.buildFromTemplate(params.menu);
return menu.popup(params.x, params.y);
});
/* This error occurs when host could not be found. */
// This error occurs when host could not be found.
webContents.on('did-fail-provisional-load', function() {
var args;
args = 1 <= arguments.length ? slice.call(arguments, 0) : [];
@ -149,7 +149,7 @@ wrapWebContents = function(webContents) {
})(this));
});
/* Delays the page-title-updated event to next tick. */
// Delays the page-title-updated event to next tick.
webContents.on('-page-title-updated', function() {
var args;
args = 1 <= arguments.length ? slice.call(arguments, 0) : [];
@ -160,7 +160,7 @@ wrapWebContents = function(webContents) {
})(this));
});
/* Deprecated. */
// Deprecated.
deprecate.rename(webContents, 'loadUrl', 'loadURL');
deprecate.rename(webContents, 'getUrl', 'getURL');
deprecate.event(webContents, 'page-title-set', 'page-title-updated', function() {

18
atom/browser/lib/chrome-extension.js
View file

@ -9,7 +9,7 @@ path = require('path');
url = require('url');
/* Mapping between hostname and file path. */
// Mapping between hostname and file path.
hostPathMap = {};
@ -27,7 +27,7 @@ getPathForHost = function(host) {
};
/* Cache extensionInfo. */
// Cache extensionInfo.
extensionInfoMap = {};
@ -57,14 +57,14 @@ getExtensionInfoFromPath = function(srcDirectory) {
};
/* The loaded extensions cache and its persistent path. */
// The loaded extensions cache and its persistent path.
loadedExtensions = null;
loadedExtensionsPath = null;
/* Persistent loaded extensions. */
// Persistent loaded extensions.
app = electron.app;
@ -86,13 +86,13 @@ 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() {
var BrowserWindow, chromeExtensionHandler, e, error1, i, init, len, protocol, srcDirectory;
protocol = electron.protocol, BrowserWindow = electron.BrowserWindow;
/* Load persistented extensions. */
// Load persistented extensions.
loadedExtensionsPath = path.join(app.getPath('userData'), 'DevTools Extensions');
try {
loadedExtensions = JSON.parse(fs.readFileSync(loadedExtensionsPath));
@ -100,7 +100,7 @@ app.once('ready', function() {
loadedExtensions = [];
}
/* Preheat the extensionInfo cache. */
// Preheat the extensionInfo cache.
for (i = 0, len = loadedExtensions.length; i < len; i++) {
srcDirectory = loadedExtensions[i];
getExtensionInfoFromPath(srcDirectory);
@ -109,7 +109,7 @@ app.once('ready', function() {
e = error1;
}
/* The chrome-extension: can map a extension URL request to real file path. */
// The chrome-extension: can map a extension URL request to real file path.
chromeExtensionHandler = function(request, callback) {
var directory, parsed;
parsed = url.parse(request.url);
@ -150,7 +150,7 @@ app.once('ready', function() {
return delete extensionInfoMap[name];
};
/* Load persistented extensions when devtools is opened. */
// Load persistented extensions when devtools is opened.
init = BrowserWindow.prototype._init;
return BrowserWindow.prototype._init = function() {
init.call(this);

6
atom/browser/lib/desktop-capturer.js
View file

@ -9,7 +9,7 @@ deepEqual = function(opt1, opt2) {
};
/* A queue for holding all requests from renderer process. */
// A queue for holding all requests from renderer process.
requestsQueue = [];
@ -40,7 +40,7 @@ ipcMain.on('ATOM_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', function(event, captureW
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;
handledRequest = requestsQueue.shift(0);
result = (function() {
@ -77,7 +77,7 @@ desktopCapturer.emit = function(event, name, sources) {
}
requestsQueue = unhandledRequestsQueue;
/* If the requestsQueue is not empty, start a new request handling. */
// If the requestsQueue is not empty, start a new request handling.
if (requestsQueue.length > 0) {
ref2 = requestsQueue[0].options, captureWindow = ref2.captureWindow, captureScreen = ref2.captureScreen, thumbnailSize = ref2.thumbnailSize;
return desktopCapturer.startHandling(captureWindow, captureScreen, thumbnailSize);

30
atom/browser/lib/guest-view-manager.js
View file

@ -4,7 +4,7 @@ var attachGuest, createGuest, destroyGuest, embedderElementsMap, getNextInstance
ref = require('electron'), ipcMain = ref.ipcMain, webContents = ref.webContents;
/* Doesn't exist in early initialization. */
// Doesn't exist in early initialization.
webViewManager = null;
@ -19,21 +19,21 @@ embedderElementsMap = {};
reverseEmbedderElementsMap = {};
/* Moves the last element of array to the first one. */
// Moves the last element of array to the first one.
moveLastToFirst = function(list) {
return list.unshift(list.pop());
};
/* Generate guestInstanceId. */
// Generate guestInstanceId.
getNextInstanceId = function(webContents) {
return ++nextInstanceId;
};
/* Create a new guest instance. */
// Create a new guest instance.
createGuest = function(embedder, params) {
var destroy, destroyEvents, event, fn, guest, i, id, j, len, len1, listeners;
@ -51,7 +51,7 @@ createGuest = function(embedder, params) {
embedder: embedder
};
/* Destroy guest when the embedder is gone or navigated. */
// Destroy guest when the embedder is gone or navigated.
destroyEvents = ['will-destroy', 'crashed', 'did-navigate'];
destroy = function() {
if (guestInstances[id] != null) {
@ -82,7 +82,7 @@ createGuest = function(embedder, params) {
return results;
});
/* Init guest web view after attached. */
// Init guest web view after attached.
guest.once('did-attach', function() {
var opts;
params = this.attachParams;
@ -119,7 +119,7 @@ createGuest = function(embedder, params) {
return guest.allowPopups = params.allowpopups;
});
/* Dispatch events to embedder. */
// Dispatch events to embedder.
fn = function(event) {
return guest.on(event, function() {
var _, args;
@ -132,14 +132,14 @@ createGuest = function(embedder, params) {
fn(event);
}
/* Dispatch guest's IPC messages to embedder. */
// Dispatch guest's IPC messages to embedder.
guest.on('ipc-message-host', function(_, packed) {
var args, channel;
channel = packed[0], args = 2 <= packed.length ? slice.call(packed, 1) : [];
return embedder.send.apply(embedder, ["ATOM_SHELL_GUEST_VIEW_INTERNAL_IPC_MESSAGE-" + guest.viewInstanceId, channel].concat(slice.call(args)));
});
/* Autosize. */
// Autosize.
guest.on('size-changed', function() {
var _, args;
_ = arguments[0], args = 2 <= arguments.length ? slice.call(arguments, 1) : [];
@ -149,18 +149,18 @@ createGuest = function(embedder, params) {
};
/* Attach the guest to an element of embedder. */
// Attach the guest to an element of embedder.
attachGuest = function(embedder, elementInstanceId, guestInstanceId, params) {
var guest, key, oldGuestInstanceId, ref1, webPreferences;
guest = guestInstances[guestInstanceId].guest;
/* Destroy the old guest when attaching. */
// Destroy the old guest when attaching.
key = (embedder.getId()) + "-" + elementInstanceId;
oldGuestInstanceId = embedderElementsMap[key];
if (oldGuestInstanceId != null) {
/* Reattachment to the same guest is not currently supported. */
// Reattachment to the same guest is not currently supported.
if (oldGuestInstanceId === guestInstanceId) {
return;
}
@ -185,7 +185,7 @@ attachGuest = function(embedder, elementInstanceId, guestInstanceId, params) {
};
/* Destroy an existing guest instance. */
// Destroy an existing guest instance.
destroyGuest = function(embedder, id) {
var key;
@ -222,7 +222,7 @@ ipcMain.on('ATOM_SHELL_GUEST_VIEW_MANAGER_SET_ALLOW_TRANSPARENCY', function(even
});
/* Returns WebContents from its guest id. */
// Returns WebContents from its guest id.
exports.getGuest = function(id) {
var ref1;
@ -230,7 +230,7 @@ exports.getGuest = function(id) {
};
/* Returns the embedder of the guest. */
// Returns the embedder of the guest.
exports.getEmbedder = function(id) {
var ref1;

14
atom/browser/lib/guest-window-manager.js
View file

@ -9,7 +9,7 @@ v8Util = process.atomBinding('v8_util');
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) {
var key, value;
@ -28,16 +28,16 @@ mergeOptions = function(child, parent) {
};
/* Merge |options| with the |embedder|'s window's options. */
// Merge |options| with the |embedder|'s window's options.
mergeBrowserWindowOptions = function(embedder, options) {
if (embedder.browserWindowOptions != null) {
/* Inherit the original options if it is a BrowserWindow. */
// Inherit the original options if it is a BrowserWindow.
mergeOptions(options, embedder.browserWindowOptions);
} else {
/* Or only inherit web-preferences if it is a webview. */
// Or only inherit web-preferences if it is a webview.
if (options.webPreferences == null) {
options.webPreferences = {};
}
@ -47,7 +47,7 @@ mergeBrowserWindowOptions = function(embedder, 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) {
var closedByEmbedder, closedByUser, guest, guestId, ref1;
@ -57,7 +57,7 @@ createGuest = function(embedder, url, frameName, options) {
return guest.id;
}
/* Remember the embedder window's id. */
// Remember the embedder window's id.
if (options.webPreferences == null) {
options.webPreferences = {};
}
@ -92,7 +92,7 @@ createGuest = function(embedder, url, frameName, options) {
};
/* Routed window.open messages. */
// Routed window.open messages.
ipcMain.on('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_OPEN', function() {
var args, event, frameName, options, url;

46
atom/browser/lib/init.js
View file

@ -10,20 +10,20 @@ util = require('util');
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);
/* Clear search paths. */
// Clear search paths.
require(path.resolve(__dirname, '..', '..', 'common', 'lib', 'reset-search-paths'));
/* Import common settings. */
// Import common settings.
require(path.resolve(__dirname, '..', '..', 'common', 'lib', 'init'));
@ -34,7 +34,7 @@ if (!process.env.ELECTRON_HIDE_INTERNAL_MODULES) {
}
/* Expose public APIs. */
// Expose public APIs.
globalPaths.push(path.resolve(__dirname, '..', 'api', 'lib', 'exports'));
@ -62,7 +62,7 @@ if (process.platform === 'win32') {
console.log = console.error = console.warn = consoleLog;
process.stdout.write = process.stderr.write = streamWrite;
/* Always returns EOF for stdin stream. */
// Always returns EOF for stdin stream.
Readable = require('stream').Readable;
stdin = new Readable;
stdin.push(null);
@ -72,17 +72,17 @@ if (process.platform === 'win32') {
}
/* Don't quit on fatal error. */
// Don't quit on fatal 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.
var dialog, message, ref, stack;
if (process.listeners('uncaughtException').length > 1) {
return;
}
/* Show error in GUI. */
// Show error in GUI.
dialog = require('electron').dialog;
stack = (ref = error.stack) != null ? ref : error.name + ": " + error.message;
message = "Uncaught Exception:\n" + stack;
@ -90,7 +90,7 @@ process.on('uncaughtException', function(error) {
});
/* Emit 'exit' event on quit. */
// Emit 'exit' event on quit.
app = require('electron').app;
@ -99,24 +99,24 @@ app.on('quit', function(event, exitCode) {
});
/* Map process.exit to app.exit, which quits gracefully. */
// Map process.exit to app.exit, which quits gracefully.
process.exit = app.exit;
/* Load the RPC server. */
// Load the RPC server.
require('./rpc-server');
/* Load the guest view manager. */
// Load the guest view manager.
require('./guest-view-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;
@ -142,14 +142,14 @@ if (packageJson == null) {
}
/* Set application's version. */
// Set application's version.
if (packageJson.version != null) {
app.setVersion(packageJson.version);
}
/* Set application's name. */
// Set application's name.
if (packageJson.productName != null) {
app.setName(packageJson.productName);
@ -158,7 +158,7 @@ if (packageJson.productName != null) {
}
/* Set application's desktop name. */
// Set application's desktop name.
if (packageJson.desktopName != null) {
app.setDesktopName(packageJson.desktopName);
@ -167,12 +167,12 @@ if (packageJson.desktopName != null) {
}
/* 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');
/* 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()));
@ -181,21 +181,21 @@ app.setPath('userCache', path.join(app.getPath('cache'), app.getName()));
app.setAppPath(packagePath);
/* Load the chrome extension support. */
// Load the chrome extension support.
require('./chrome-extension');
/* Load internal desktop-capturer module. */
// Load internal desktop-capturer module.
require('./desktop-capturer');
/* Set main startup script of the app. */
// Set main startup script of the app.
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);

16
atom/browser/lib/objects-registry.js
View file

@ -36,7 +36,7 @@ ObjectsRegistry = (function(superClass) {
var base, base1, id;
id = this.saveToStorage(obj);
/* Remember the owner. */
// Remember the owner.
if ((base = this.owners)[webContentsId] == null) {
base[webContentsId] = {};
}
@ -45,12 +45,12 @@ ObjectsRegistry = (function(superClass) {
}
this.owners[webContentsId][id]++;
/* Returns object's id */
// Returns object's id
return id;
};
/* Get an object according to its ID. */
// Get an object according to its ID.
ObjectsRegistry.prototype.get = function(id) {
var ref;
@ -58,13 +58,13 @@ ObjectsRegistry = (function(superClass) {
};
/* Dereference an object according to its ID. */
// Dereference an object according to its ID.
ObjectsRegistry.prototype.remove = function(webContentsId, id) {
var pointer;
this.dereference(id, 1);
/* Also reduce the count in owner. */
// Also reduce the count in owner.
pointer = this.owners[webContentsId];
if (pointer == null) {
return;
@ -76,7 +76,7 @@ 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) {
var count, id, ref;
@ -93,7 +93,7 @@ ObjectsRegistry = (function(superClass) {
};
/* 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) {
var id;
@ -111,7 +111,7 @@ ObjectsRegistry = (function(superClass) {
};
/* Private: Dereference the object from store. */
// Private: Dereference the object from store.
ObjectsRegistry.prototype.dereference = function(id, count) {
var pointer;

20
atom/browser/lib/rpc-server.js
View file

@ -14,7 +14,7 @@ v8Util = process.atomBinding('v8_util');
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) {
var el, field, i, len, meta, name;
@ -43,12 +43,12 @@ valueToMeta = function(sender, value, optimizeSimpleObject) {
meta.type = 'promise';
}
/* Treat simple objects as value. */
// Treat simple objects as value.
if (optimizeSimpleObject && meta.type === 'object' && v8Util.getHiddenValue(value, 'simple')) {
meta.type = 'value';
}
/* Treat the arguments object as array. */
// Treat the arguments object as array.
if (meta.type === 'object' && (value.callee != null) && (value.length != null)) {
meta.type = 'array';
}
@ -86,7 +86,7 @@ valueToMeta = function(sender, value, optimizeSimpleObject) {
} else if (meta.type === 'error') {
meta.members = plainObjectToMeta(value);
/* Error.name is not part of own properties. */
// Error.name is not part of own properties.
meta.members.push({
name: 'name',
value: value.name
@ -101,7 +101,7 @@ valueToMeta = function(sender, value, optimizeSimpleObject) {
};
/* Convert object to meta by value. */
// Convert object to meta by value.
plainObjectToMeta = function(obj) {
return Object.getOwnPropertyNames(obj).map(function(name) {
@ -113,7 +113,7 @@ plainObjectToMeta = function(obj) {
};
/* Convert Error into meta data. */
// Convert Error into meta data.
exceptionToMeta = function(error) {
return {
@ -124,7 +124,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) {
var metaToValue;
@ -160,7 +160,7 @@ unwrapArgs = function(sender, args) {
};
case 'function':
/* Cache the callbacks in renderer. */
// Cache the callbacks in renderer.
if (!sender.callbacks) {
sender.callbacks = new IDWeakMap;
sender.on('render-view-deleted', function() {
@ -230,7 +230,7 @@ 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) {
return objectsRegistry.clear(id);
@ -316,7 +316,7 @@ ipcMain.on('ATOM_BROWSER_MEMBER_CONSTRUCTOR', function(event, id, method, args)
args = unwrapArgs(event.sender, args);
constructor = objectsRegistry.get(id)[method];
/* Call new with array of arguments. */
// Call new with array of arguments.
obj = new (Function.prototype.bind.apply(constructor, [null].concat(args)));
return event.returnValue = valueToMeta(event.sender, obj);
} catch (error1) {