refactor: no longer require submenu for services menuitem (electron#15656)

codebytere · web-flow · commit 9fd98bb27bbc · 2018-11-10T12:47:55.000-05:00
diff --git a/atom/browser/ui/cocoa/atom_menu_controller.mm b/atom/browser/ui/cocoa/atom_menu_controller.mm
@@ -208,7 +208,17 @@ - (void)addItemToMenu:(NSMenu*)menu
 
   base::string16 role = model->GetRoleAt(index);
   atom::AtomMenuModel::ItemType type = model->GetTypeAt(index);
-  if (type == atom::AtomMenuModel::TYPE_SUBMENU) {
+
+  if (role == base::ASCIIToUTF16("services")) {
+    base::string16 title = base::ASCIIToUTF16("Services");
+    NSString* label = l10n_util::FixUpWindowsStyleLabel(title);
+
+    [item setTarget:nil];
+    [item setAction:nil];
+    NSMenu* submenu = [[NSMenu alloc] initWithTitle:label];
+    [item setSubmenu:submenu];
+    [NSApp setServicesMenu:submenu];
+  } else if (type == atom::AtomMenuModel::TYPE_SUBMENU) {
     // Recursively build a submenu from the sub-model at this index.
     [item setTarget:nil];
     [item setAction:nil];
@@ -223,8 +233,6 @@ - (void)addItemToMenu:(NSMenu*)menu
       [NSApp setWindowsMenu:submenu];
     else if (role == base::ASCIIToUTF16("help"))
       [NSApp setHelpMenu:submenu];
-    else if (role == base::ASCIIToUTF16("services"))
-      [NSApp setServicesMenu:submenu];
     else if (role == base::ASCIIToUTF16("recentdocuments"))
       [self replaceSubmenuShowingRecentDocuments:item];
   } else {
diff --git a/default_app/menu.js b/default_app/menu.js
@@ -123,8 +123,7 @@ const setDefaultApplicationMenu = () => {
           type: 'separator'
         },
         {
-          role: 'services',
-          submenu: []
+          role: 'services'
         },
         {
           type: 'separator'
diff --git a/docs/api/menu.md b/docs/api/menu.md
@@ -210,7 +210,7 @@ if (process.platform === 'darwin') {
     submenu: [
       { role: 'about' },
       { type: 'separator' },
-      { role: 'services', submenu: [] },
+      { role: 'services' },
       { type: 'separator' },
       { role: 'hide' },
       { role: 'hideothers' },

Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,7 @@ const setDefaultApplicationMenu = () => {`
`123`	`123`	`type: 'separator'`
`124`	`124`	`},`
`125`	`125`	`{`
`126`		`- role: 'services',`
`127`		`- submenu: []`
	`126`	`+ role: 'services'`
`128`	`127`	`},`
`129`	`128`	`{`
`130`	`129`	`type: 'separator'`