diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 32bb2407c36b..3a7eab5584e5 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -2843,8 +2843,8 @@ function onViewToolbarCommand(aEvent) function displaySecurityInfo() { - window.openDialog("chrome://browser/content/pageInfo.xul", "_blank", - "dialog=no", null, "securityTab"); + window.openDialog("chrome://browser/content/pageInfo.xul", "_blank", + "dialog=no", null, "securityTab"); } function displayPageReportFirstTime() diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index dedfed53060d..a5e632dbdab6 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -201,7 +201,7 @@ onfocus="URLBarFocusHandler(event, this);" onmousedown="URLBarMouseDownHandler(event, this);" onclick="URLBarClickHandler(event, this);" - oninfoclick="displaySecurityInfo()"> + oninfoclick="displaySecurityInfo();"> - + diff --git a/toolkit/content/widgets/autocomplete.xml b/toolkit/content/widgets/autocomplete.xml index 509f013fb358..e7e6e8c61036 100644 --- a/toolkit/content/widgets/autocomplete.xml +++ b/toolkit/content/widgets/autocomplete.xml @@ -438,7 +438,7 @@ diff --git a/toolkit/content/widgets/tabbrowser.xml b/toolkit/content/widgets/tabbrowser.xml index 22e95e2a6297..50a95bcec03f 100644 --- a/toolkit/content/widgets/tabbrowser.xml +++ b/toolkit/content/widgets/tabbrowser.xml @@ -86,7 +86,7 @@ ondragdrop="nsDragAndDrop.drop(event, this.parentNode.parentNode.parentNode); event.stopPropagation();" xbl:inherits="onnewtab" - ondblclick="if (event.originalTarget.localName != 'tab') this.parentNode.parentNode.parentNode.selectedTab = this.parentNode.parentNode.parentNode.addTab();" + ondblclick="this.parentNode.parentNode.parentNode.onTabBarDblClick(event);" onclosetab="var node = this.parentNode; while (node.localName != 'tabbrowser') node = node.parentNode; @@ -983,6 +983,16 @@ + + + + + + + diff --git a/toolkit/mozapps/downloads/content/downloads.js b/toolkit/mozapps/downloads/content/downloads.js index 0fdc6535be21..7501d52ca197 100644 --- a/toolkit/mozapps/downloads/content/downloads.js +++ b/toolkit/mozapps/downloads/content/downloads.js @@ -318,6 +318,8 @@ function onDownloadShow(aEvent) function onDownloadOpen(aEvent) { + if (aEvent.type == "dblclick" && aEvent.button != 0) + return; var download = aEvent.target; if (download.localName == "download") { if (download.openable) { diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js index de503c178787..52f98f2beff7 100644 --- a/toolkit/mozapps/extensions/content/extensions.js +++ b/toolkit/mozapps/extensions/content/extensions.js @@ -383,8 +383,11 @@ XPInstallDownloadManager.prototype = { // // View Event Handlers // -function onViewDoubleClick() +function onViewDoubleClick(aEvent) { + if (aEvent.button != 0) + return; + switch (gWindowState) { case "extensions": gExtensionsViewController.doCommand('cmd_options'); diff --git a/toolkit/mozapps/extensions/content/extensions.xul b/toolkit/mozapps/extensions/content/extensions.xul index 4f4ae90509c7..48bd153161ba 100644 --- a/toolkit/mozapps/extensions/content/extensions.xul +++ b/toolkit/mozapps/extensions/content/extensions.xul @@ -136,7 +136,7 @@ datasources="rdf:null" persist="last-selected" ondragover="nsDragAndDrop.dragOver(event, gExtensionsDNDObserver);" ondragdrop="nsDragAndDrop.drop(event, gExtensionsDNDObserver);" - ondblclick="onViewDoubleClick();"> + ondblclick="onViewDoubleClick(event);">