From 24dfd9146adbb441aa4aff1a5ea5c898504a9525 Mon Sep 17 00:00:00 2001
From: "hyatt%mozilla.org"
 <hyatt%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 5 Aug 2003 09:31:32 +0000
Subject: [PATCH] Make cmd+click work to open new tabs.  Make cmd+number work
 to switch tabs.  Mac OS X only.

git-svn-id: svn://10.0.0.236/trunk@145609 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/base/content/browser.js            | 14 +++++++++++++-
 .../components/bookmarks/content/bookmarks.js      |  4 ++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js
index 1e38d8d5757..455ad2bec70 100644
--- a/mozilla/browser/base/content/browser.js
+++ b/mozilla/browser/base/content/browser.js
@@ -559,7 +559,11 @@ function ctrlNumberTabSelection(event)
     return;
   } 
 
+#ifdef XP_MACOSX
+  if (!event.metaKey)
+#else
   if (!event.ctrlKey)
+#endif
     return;
 
   var index = event.charCode - 49;
@@ -3878,8 +3882,12 @@ function asyncOpenWebPanel(event)
 function handleLinkClick(event, href, linkNode)
 {
   switch (event.button) {                                   
-    case 0:  
+    case 0:
+#ifdef XP_MACOSX
+      if (event.metaKey) {
+#else
       if (event.ctrlKey) {
+#endif
         openNewTabWith(href, linkNode, event, true);
         event.preventBubble();
         return true;
@@ -3925,7 +3933,11 @@ function middleMousePaste(event)
     return false;
 
   // On ctrl-middleclick, open in new tab.
+#ifdef XP_MACOSX
+  if (event.metaKey)
+#else
   if (event.ctrlKey)
+#endif
     openNewTabWith(url, null, event, true);
 
   // If ctrl wasn't down, then just load the url in the current win/tab.
diff --git a/mozilla/browser/components/bookmarks/content/bookmarks.js b/mozilla/browser/components/bookmarks/content/bookmarks.js
index 43588c0f57a..ce14246e6e1 100644
--- a/mozilla/browser/components/bookmarks/content/bookmarks.js
+++ b/mozilla/browser/components/bookmarks/content/bookmarks.js
@@ -1478,7 +1478,11 @@ var BookmarksUtils = {
       return PREF.getBoolPref("browser.tabs.opentabfor.middleclick")? "tab":"window"
     else if (aEvent.shiftKey)      
       return "window";
+#ifdef XP_MACOSX
+    else if (aEvent.metaKey)
+#else
     else if (aEvent.ctrlKey)
+#endif
       return "tab";
     else if (aEvent.altKey)
       return "save"