Fix for 12056: ctrl+click on a link should open in new window, alt+click should save it. r=jst sr=brendan, alecf

2000-10-28 14:30:48 +00:00 · 2000-10-28 14:30:48 +00:00 · 027eeadcc1
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@ -1148,20 +1148,16 @@ nsGenericHTMLElement::HandleDOMEventForAnchors(nsIContent* aOuter,
          //Click or return key
          if (aEvent->message == NS_MOUSE_LEFT_CLICK || keyEvent->keyCode == NS_VK_RETURN) {
            nsAutoString target;
-            nsIURI* baseURL = nsnull;
-            GetBaseURL(baseURL);
+            nsCOMPtr<nsIURI> baseURL;
+            GetBaseURL(*getter_AddRefs(baseURL));
            GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::target, target);
            if (target.Length() == 0) {
              GetBaseTarget(target);
            }
-            // if meta (cmd on mac) is down, open in new window.
-            if ( inputEvent->isMeta )
-              ret = TriggerLink(aPresContext, eLinkVerb_New,
-                                       baseURL, href, target, PR_TRUE);
-            else
-              ret = TriggerLink(aPresContext, eLinkVerb_Replace,
-                                      baseURL, href, target, PR_TRUE);
-            NS_IF_RELEASE(baseURL);
+            if (inputEvent->isControl || inputEvent->isMeta || inputEvent->isAlt ||inputEvent->isShift)
+              break;  // let the click go through so we can handle it in JS/XUL
+            ret = TriggerLink(aPresContext, eLinkVerb_Replace, baseURL, href,
+                              target, PR_TRUE);
            *aEventStatus = nsEventStatus_eConsumeDoDefault;
          }
        }
@ -1185,15 +1181,14 @@ nsGenericHTMLElement::HandleDOMEventForAnchors(nsIContent* aOuter,
      case NS_FOCUS_CONTENT:
      {
        nsAutoString target;
-        nsIURI* baseURL = nsnull;
-        GetBaseURL(baseURL);
+        nsCOMPtr<nsIURI> baseURL;
+        GetBaseURL(*getter_AddRefs(baseURL));
        GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::target, target);
        if (target.Length() == 0) {
          GetBaseTarget(target);
        }
        ret = TriggerLink(aPresContext, eLinkVerb_Replace,
                          baseURL, href, target, PR_FALSE);
-        NS_IF_RELEASE(baseURL);
      }
      break;

--- a/layout/html/content/src/nsGenericHTMLElement.cpp
+++ b/layout/html/content/src/nsGenericHTMLElement.cpp
@ -1148,20 +1148,16 @@ nsGenericHTMLElement::HandleDOMEventForAnchors(nsIContent* aOuter,
          //Click or return key
          if (aEvent->message == NS_MOUSE_LEFT_CLICK || keyEvent->keyCode == NS_VK_RETURN) {
            nsAutoString target;
-            nsIURI* baseURL = nsnull;
-            GetBaseURL(baseURL);
+            nsCOMPtr<nsIURI> baseURL;
+            GetBaseURL(*getter_AddRefs(baseURL));
            GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::target, target);
            if (target.Length() == 0) {
              GetBaseTarget(target);
            }
-            // if meta (cmd on mac) is down, open in new window.
-            if ( inputEvent->isMeta )
-              ret = TriggerLink(aPresContext, eLinkVerb_New,
-                                       baseURL, href, target, PR_TRUE);
-            else
-              ret = TriggerLink(aPresContext, eLinkVerb_Replace,
-                                      baseURL, href, target, PR_TRUE);
-            NS_IF_RELEASE(baseURL);
+            if (inputEvent->isControl || inputEvent->isMeta || inputEvent->isAlt ||inputEvent->isShift)
+              break;  // let the click go through so we can handle it in JS/XUL
+            ret = TriggerLink(aPresContext, eLinkVerb_Replace, baseURL, href,
+                              target, PR_TRUE);
            *aEventStatus = nsEventStatus_eConsumeDoDefault;
          }
        }
@ -1185,15 +1181,14 @@ nsGenericHTMLElement::HandleDOMEventForAnchors(nsIContent* aOuter,
      case NS_FOCUS_CONTENT:
      {
        nsAutoString target;
-        nsIURI* baseURL = nsnull;
-        GetBaseURL(baseURL);
+        nsCOMPtr<nsIURI> baseURL;
+        GetBaseURL(*getter_AddRefs(baseURL));
        GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::target, target);
        if (target.Length() == 0) {
          GetBaseTarget(target);
        }
        ret = TriggerLink(aPresContext, eLinkVerb_Replace,
                          baseURL, href, target, PR_FALSE);
-        NS_IF_RELEASE(baseURL);
      }
      break;

--- a/xpfe/browser/resources/content/navigator.js
+++ b/xpfe/browser/resources/content/navigator.js
@ -18,7 +18,7 @@
 * Rights Reserved.
 *
 * Contributor(s): 
- *  Blake Ross <BlakeR1234@aol.com>
+ *  Blake Ross <blakeross@telocity.com>
 *  Peter Annema <disttsc@bart.nl>
 */

@ -87,9 +87,11 @@ function savePage( url )
    // Save; use page in cache if possible.
    var postData = appCore.postData;
    xfer.SelectFileAndTransferLocationSpec( url, window, "", "", true, postData );
+    return true;
  } 
  catch( exception ) { 
    // suppress NS_ERROR_ABORT exceptions for cancellation 
+    return false;
  }
 }

@ -1556,33 +1558,21 @@ function BrowserEditBookmarks()
    {
      var nodeName = node.localName;
      if (nodeName == "")
-	  {
-	  dump('****** returning null 1\n');
        return null;
-	}
      nodeName = nodeName.toLowerCase();
      if (nodeName == "" || nodeName == "body"
          || nodeName == "html" || nodeName == "#document")
-		  {
-	  dump('****** returning null 2\n');
        return null;
-		}
-      var href = node.href;
-      if (nodeName == "a" && href != "")
-	  {
-	  dump('****** returning :'+node+'\n');
+      if (nodeName == "a")
        return node;
-		}
      node = node.parentNode;
    }
-	  dump('****** returning null 3\n');
    return null;
  }

-   function isScrollbar(node)
-   {
-     while (node)
-     {
+  function isScrollbar(node)
+  {
+     while (node) {
       var nodeName = node.localName;
       if (nodeName == "")
         return false;
@ -1593,43 +1583,52 @@ function BrowserEditBookmarks()
     return false;
  }

-  function browserHandleMiddleClick(event)
+  function browserHandleMiddleClick(event, linkURL)
  {
-    var target = event.originalTarget;
-    if (pref.GetBoolPref("middlemouse.openNewWindow"))
-    {
-      var node = enclosingLink(target);
-      var href ="";
-      if (node)
-        href = node.href;
-      if (href != "")
-      {
-        openNewWindowWith(href);
-        event.preventBubble();
-        return;
-      }
+    if (pref.GetBoolPref("middlemouse.openNewWindow")) {
+      openNewWindowWith(linkURL);
+      event.preventBubble();
+      return true;
    }

-    if (pref.GetBoolPref("middlemouse.paste"))
-    {
-      if (isScrollbar(target)) {
-         return;
-	  }
+    if (pref.GetBoolPref("middlemouse.paste")) {
+      if (isScrollbar(target))
+         return false;
      var tagName = target.tagName;
-      if (tagName) tagName = tagName.toLowerCase();
+      if (tagName)
+        tagName = tagName.toLowerCase();
      var type = target.type;
      if (type) type = type.toLowerCase();

      var url = readFromClipboard();
      //dump ("Loading URL on clipboard: '" + url + "'; length = " + url.length + "\n");
-      if (url && url.length > 0)
-      {
+      if (url) {
        var urlBar = document.getElementById("urlbar");
        urlBar.value = url;
        BrowserLoadURL();
        event.preventBubble();
+        return true;
      }
    }
+    return false;
+  }
+
+  function linkClick(event) 
+  {
+    var node = enclosingLink(event.originalTarget);
+    if (node) {
+      if (event.button == 1) {
+        if (event.metaKey || event.ctrlKey) {               // if meta+ or ctrl+click
+          openNewWindowWith(node.href);                     // open link in new window
+          event.preventBubble();
+          return true;
+        } 
+        if (event.altKey)                                   // if alt+click
+          return savePage(node.href);                       // save the link    
+      } else if (event.button == 2)                         // if middle button clicked
+        return browserHandleMiddleClick(event, node.href);  // handle it separately
+    }
+    return true; // already handled in nsGenericHTMLElement::HandleDOMEventForAnchors
  }

  function OpenMessenger()
--- a/xpfe/browser/resources/content/navigator.xul
+++ b/xpfe/browser/resources/content/navigator.xul
@ -438,7 +438,7 @@ Contributor(s): ______________________________________. -->
    <splitter id="sidebar-splitter" class="chromeclass-extrachrome" />
  
    <box id="appcontent" align="vertical" flex="100%"
-      onclick="if (event.button==2) browserHandleMiddleClick(event);"
+      onclick="return linkClick(event);"
      ondragover="nsDragAndDrop.dragOver(event, contentAreaDNDObserver);"
      ondragdrop="nsDragAndDrop.drop(event, contentAreaDNDObserver);"
      ondraggesture="nsDragAndDrop.startDrag(event, contentAreaDNDObserver);">