:apple: Fix context menus selecting first item by default.

diff --git a/atom/browser/api/atom_api_menu_mac.h b/atom/browser/api/atom_api_menu_mac.h
index 293e8ec4edae451efc623ae32eeb34a42f9d67fc..062fd9be41b6cc60ef73ee6402131db4b9ce33fb 100644 (file)
--- a/atom/browser/api/atom_api_menu_mac.h
+++ b/atom/browser/api/atom_api_menu_mac.h
@@ -19,7 +19,7 @@ class MenuMac : public Menu {
  protected:
   explicit MenuMac(v8::Isolate* isolate);
 
-  void PopupAt(Window* window, int x, int y, int positioning_item = 0) override;
+  void PopupAt(Window* window, int x, int y, int positioning_item) override;
 
   base::scoped_nsobject<AtomMenuController> menu_controller_;
 

diff --git a/atom/browser/api/atom_api_menu_views.h b/atom/browser/api/atom_api_menu_views.h
index e1daa4904028e0088397f9c77cc82d55e3558e15..9a7a740182dde0a58f8c8cd23c6f937f5780ad31 100644 (file)
--- a/atom/browser/api/atom_api_menu_views.h
+++ b/atom/browser/api/atom_api_menu_views.h
@@ -17,7 +17,7 @@ class MenuViews : public Menu {
   explicit MenuViews(v8::Isolate* isolate);
 
  protected:
-  void PopupAt(Window* window, int x, int y, int positioning_item = 0) override;
+  void PopupAt(Window* window, int x, int y, int positioning_item) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MenuViews);

diff --git a/lib/browser/api/menu.js b/lib/browser/api/menu.js
index e05637e79e7d51ee6f028b9171b924c56a9a90b2..b122fc36cf37f929ec8b1f9713df9689601154c8 100644 (file)
--- a/lib/browser/api/menu.js
+++ b/lib/browser/api/menu.js
@@ -150,10 +150,12 @@ Menu.prototype.popup = function (window, x, y, positioningItem) {
     window = BrowserWindow.getFocusedWindow()
   }
 
-  // Default parameters.
+  // Default to showing under mouse location.
   if (typeof x !== 'number') x = -1
   if (typeof y !== 'number') y = -1
-  if (typeof positioningItem !== 'number') positioningItem = 0
+
+  // Default to not highlighting any item.
+  if (typeof positioningItem !== 'number') positioningItem = -1
 
   this.popupAt(window, x, y, positioningItem)
 }