wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-28 18:17:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Bug 1100291 - Make getShortcutOrURIAndPostData() async by calling the passed callback off a zero timeout

Browse source 
Issue #112
This commit is contained in:
janekptacijarabaci 2018-04-15 09:48:39 +02:00 • committed by Roy Tam
commit f124289e28
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
application/palemoon/base/content/browser.js
View file

@ -1905,6 +1905,12 @@ function getShortcutOrURIAndPostData(aURL, aCallback) {
let keyword = aURL; let keyword = aURL;
let param = ""; let param = "";
// XXX Bug 1100294 will remove this little hack by using an async version of
// PlacesUtils.getURLAndPostDataForKeyword(). For now we simulate an async
// execution with at least a setTimeout(fn, 0).
let originalCallback = aCallback;
aCallback = data => setTimeout(() => originalCallback(data));
let offset = aURL.indexOf(" "); let offset = aURL.indexOf(" ");
if (offset > 0) { if (offset > 0) {
keyword = aURL.substr(0, offset); keyword = aURL.substr(0, offset);

12
application/palemoon/base/content/urlbarBindings.xml
View file

@ -324,18 +324,10 @@
gBrowser.selectedBrowser.focus(); gBrowser.selectedBrowser.focus();
let isMouseEvent = aTriggeringEvent instanceof MouseEvent; let isMouseEvent = aTriggeringEvent instanceof MouseEvent;
let altEnter = !isMouseEvent && aTriggeringEvent && aTriggeringEvent.altKey;
if (altEnter) {
// XXX This was added a long time ago, and I'm not sure why it is
// necessary. Alt+Enter's default action might cause a system beep,
// or something like that?
aTriggeringEvent.preventDefault();
aTriggeringEvent.stopPropagation();
}
// If the current tab is empty, ignore Alt+Enter (just reuse this tab) // If the current tab is empty, ignore Alt+Enter (just reuse this tab)
altEnter = altEnter && !isTabEmpty(gBrowser.selectedTab); let altEnter = !isMouseEvent && aTriggeringEvent &&
aTriggeringEvent.altKey && !isTabEmpty(gBrowser.selectedTab);
if (isMouseEvent || altEnter) { if (isMouseEvent || altEnter) {
// Use the standard UI link behaviors for clicks or Alt+Enter // Use the standard UI link behaviors for clicks or Alt+Enter