Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 08:12:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1120957 - fix the source of searches made with paste & search, r=gijs,bwinton

Browse Source
This commit is contained in:
Vikram Jadhav 2015-03-09 12:07:00 +01:00
parent 38f4b946f2
commit 37b9df3be3
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
browser/base/content/browser.js
View File

@ -3490,6 +3490,12 @@ const BrowserSearch = {
}
},
pasteAndSearch: function (event) {
BrowserSearch.searchBar.select();
goDoCommand("cmd_paste");
BrowserSearch.searchBar.handleSearchCommand(event);
},
/**
* Returns the search bar element if it is present in the toolbar, null otherwise.
*/

8
browser/components/search/content/search.xml
View File

@ -521,6 +521,11 @@
target.parentNode.classList.contains("search-panel-header")) {
source = "header";
}
} else if (aEvent instanceof XULCommandEvent) {
if (target.getAttribute("anonid") == "paste-and-search") {
aEngine = this.currentEngine;
source = "paste";
}
}
BrowserSearch.recordOneoffSearchInTelemetry(aEngine, source, type, where);
@ -837,8 +842,7 @@
label = this._stringBundle.getString("cmd_pasteAndSearch");
element.setAttribute("label", label);
element.setAttribute("anonid", "paste-and-search");
element.setAttribute("oncommand",
"BrowserSearch.searchBar.select(); goDoCommand('cmd_paste'); BrowserSearch.searchBar.handleSearchCommand();");
element.setAttribute("oncommand", "BrowserSearch.pasteAndSearch(event)");
cxmenu.insertBefore(element, insertLocation.nextSibling);
pasteAndSearch = element;
}