github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor: return null when passing empty menu templates (#23401)

Browse Source
This commit is contained in:
Shelley Vohr
2020-05-04 12:39:58 -07:00
committed by GitHub
parent d50fb2938b
commit 6c78c9274a
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
shell/browser/api/electron_api_top_level_window.cc
View File

@@ -684,10 +684,16 @@ void TopLevelWindow::SetMenu(v8::Isolate* isolate, v8::Local<v8::Value> value) {
gin::V8ToString(isolate, object->GetConstructorName()) == "Menu" &&
gin::ConvertFromV8(isolate, value, &menu) && !menu.IsEmpty()) {
menu_.Reset(isolate, menu.ToV8());
window_->SetMenu(menu->model());
// We only want to update the menu if the menu has a non-zero item count,
// or we risk crashes.
if (menu->model()->GetItemCount() == 0) {
RemoveMenu();
} else {
window_->SetMenu(menu->model());
}
} else if (value->IsNull()) {
menu_.Reset();
window_->SetMenu(nullptr);
RemoveMenu();
} else {
isolate->ThrowException(
v8::Exception::TypeError(gin::StringToV8(isolate, "Invalid Menu")));

6
spec-main/api-menu-spec.ts
View File

@@ -92,6 +92,12 @@ describe('Menu module', function () {
}).to.throw(/Invalid template for MenuItem: must have at least one of label, role or type/);
});
it('throws when an non-array is passed as a template', () => {
expect(() => {
Menu.buildFromTemplate('hello' as any);
}).to.throw(/Invalid template for Menu: Menu template must be an array/);
});
describe('Menu sorting and building', () => {
describe('sorts groups', () => {
it('does a simple sort', () => {