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

Use rest parameters

Browse source
This commit is contained in:
Kevin Sawicki 2016-03-18 11:51:02 -07:00
parent e05804848f
commit 8889c29866
14 changed files with 88 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lib/renderer/web-view/guest-view-internal.js
View file

@ -1,8 +1,9 @@
'use strict';
const ipcRenderer = require('electron').ipcRenderer;
const webFrame = require('electron').webFrame;
var slice = [].slice;
var requestId = 0;
var requestId= 0;
var WEB_VIEW_EVENTS = {
'load-commit': ['url', 'isMainFrame'],
@ -41,11 +42,10 @@ var DEPRECATED_EVENTS = {
'page-title-updated': 'page-title-set'
};
var dispatchEvent = function() {
var args, domEvent, eventKey, eventName, f, i, j, len, ref1, webView;
webView = arguments[0], eventName = arguments[1], eventKey = arguments[2], args = 4 <= arguments.length ? slice.call(arguments, 3) : [];
var dispatchEvent = function(webView, eventName, eventKey, ...args) {
var domEvent, f, i, j, len, ref1;
if (DEPRECATED_EVENTS[eventName] != null) {
dispatchEvent.apply(null, [webView, DEPRECATED_EVENTS[eventName], eventKey].concat(slice.call(args)));
dispatchEvent.apply(null, [webView, DEPRECATED_EVENTS[eventName], eventKey].concat(args));
}
domEvent = new Event(eventName);
ref1 = WEB_VIEW_EVENTS[eventKey];
@ -61,22 +61,19 @@ var dispatchEvent = function() {
module.exports = {
registerEvents: function(webView, viewInstanceId) {
ipcRenderer.on("ATOM_SHELL_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-" + viewInstanceId, function() {
var eventName = arguments[1];
var args = 3 <= arguments.length ? slice.call(arguments, 2) : [];
return dispatchEvent.apply(null, [webView, eventName, eventName].concat(slice.call(args)));
ipcRenderer.on("ATOM_SHELL_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-" + viewInstanceId, function(event, eventName, ...args) {
return dispatchEvent.apply(null, [webView, eventName, eventName].concat(args));
});
ipcRenderer.on("ATOM_SHELL_GUEST_VIEW_INTERNAL_IPC_MESSAGE-" + viewInstanceId, function() {
var channel = arguments[1];
var args = 3 <= arguments.length ? slice.call(arguments, 2) : [];
ipcRenderer.on("ATOM_SHELL_GUEST_VIEW_INTERNAL_IPC_MESSAGE-" + viewInstanceId, function(event, channel, ...args) {
var domEvent = new Event('ipc-message');
domEvent.channel = channel;
domEvent.args = slice.call(args);
domEvent.args = args;
return webView.dispatchEvent(domEvent);
});
return ipcRenderer.on("ATOM_SHELL_GUEST_VIEW_INTERNAL_SIZE_CHANGED-" + viewInstanceId, function() {
var args, domEvent, f, i, j, len, ref1;
args = 2 <= arguments.length ? slice.call(arguments, 1) : [];
return ipcRenderer.on("ATOM_SHELL_GUEST_VIEW_INTERNAL_SIZE_CHANGED-" + viewInstanceId, function(event, ...args) {
var domEvent, f, i, j, len, ref1;
domEvent = new Event('size-changed');
ref1 = ['oldWidth', 'oldHeight', 'newWidth', 'newHeight'];
for (i = j = 0, len = ref1.length; j < len; i = ++j) {

14
lib/renderer/web-view/web-view.js
View file

@ -10,7 +10,6 @@ const guestViewInternal = require('./guest-view-internal');
const webViewConstants = require('./web-view-constants');
var hasProp = {}.hasOwnProperty;
var slice = [].slice;
// ID generator.
var nextId = 0;
@ -392,9 +391,8 @@ var registerWebViewElement = function() {
// Forward proto.foo* method calls to WebViewImpl.foo*.
createBlockHandler = function(m) {
return function() {
var args = 1 <= arguments.length ? slice.call(arguments, 0) : [];
var internal = v8Util.getHiddenValue(this, 'internal');
return function(...args) {
const internal = v8Util.getHiddenValue(this, 'internal');
if (internal.webContents) {
return internal.webContents[m].apply(internal.webContents, args);
} else {
@ -407,11 +405,9 @@ var registerWebViewElement = function() {
proto[m] = createBlockHandler(m);
}
createNonBlockHandler = function(m) {
return function() {
var args, internal;
args = 1 <= arguments.length ? slice.call(arguments, 0) : [];
internal = v8Util.getHiddenValue(this, 'internal');
return ipcRenderer.send.apply(ipcRenderer, ['ATOM_BROWSER_ASYNC_CALL_TO_GUEST_VIEW', null, internal.guestInstanceId, m].concat(slice.call(args)));
return function(...args) {
const internal = v8Util.getHiddenValue(this, 'internal');
return ipcRenderer.send.apply(ipcRenderer, ['ATOM_BROWSER_ASYNC_CALL_TO_GUEST_VIEW', null, internal.guestInstanceId, m].concat(args));
};
};
for (j = 0, len1 = nonblockMethods.length; j < len1; j++) {