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

Don't collect results in Menu.setApplicationMenu

Browse source
This commit is contained in:
Kevin Sawicki 2016-03-10 13:26:14 -08:00
parent 3a1e837f8b
commit 93939089ec
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/browser/api/menu.js
View file

@ -267,7 +267,6 @@ Menu.prototype._callMenuWillShow = function() {
var applicationMenu = null; var applicationMenu = null;
Menu.setApplicationMenu = function(menu) { Menu.setApplicationMenu = function(menu) {
var j, len, results, w, windows;
if (!(menu === null || menu.constructor === Menu)) { if (!(menu === null || menu.constructor === Menu)) {
throw new TypeError('Invalid menu'); throw new TypeError('Invalid menu');
} }
@ -279,15 +278,11 @@ Menu.setApplicationMenu = function(menu) {
return; return;
} }
menu._callMenuWillShow(); menu._callMenuWillShow();
return bindings.setApplicationMenu(menu); bindings.setApplicationMenu(menu);
} else { } else {
windows = BrowserWindow.getAllWindows(); BrowserWindow.getAllWindows().forEach(function(window) {
results = []; window.setMenu(menu);
for (j = 0, len = windows.length; j < len; j++) { });
w = windows[j];
results.push(w.setMenu(menu));
}
return results;
} }
}; };