Bug 397223 - Double-click on empty space or a twisty in the content tree should not open the selected node in the browser. r=dietrich, a=mconnor.

browser/components/places/content/places.js

@@ -296,7 +296,7 @@ var PlacesOrganizer = {
    * @param   aEvent
    *          The mouse event.
    */
-  onTreeClick: function PO_onTreeClicked(aEvent) {
+  onTreeClick: function PO_onTreeClick(aEvent) {
     var currentView = aEvent.currentTarget;
     var controller = currentView.controller;
 
@@ -319,6 +319,20 @@ var PlacesOrganizer = {
     }
   },
 
+  onTreeDblClick: function PO_onTreeDblClick(aEvent) {
+    if (aEvent.button != 0 || !this._content.hasSingleSelection ||
+        aEvent.originalTarget.localName != "treechildren")
+      return;
+
+    var row = { }, col = { }, obj = { };
+    this._content.treeBoxObject.getCellAt(aEvent.clientX, aEvent.clientY, row,
+                                         col, obj);
+    if (row.value == -1  || obj.value == "twisty")
+      return;
+
+    this._content.controller.openSelectedNodeWithEvent(aEvent);
+  },
+
   /**
    * Returns the options associated with the query currently loaded in the
    * main places pane.

browser/components/places/content/places.xul

@@ -399,7 +399,7 @@
           <vbox flex="1">
             <tree id="placeContent" class="placesTree" context="placesContext" 
                   flex="1" type="places" 
-                  ondblclick="this.controller.openSelectedNodeWithEvent(event);"
+                  ondblclick="PlacesOrganizer.onTreeDblClick(event);"
                   onclick="PlacesOrganizer.onTreeClick(event);"
                   onselect="PlacesOrganizer.onContentTreeSelect();">
               <treecols id="placeContentColumns">