gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-08 23:24:14 +01:00
Code Issues Projects Releases Wiki Activity

Fix some smallish focus issued.

Browse Source
This commit is contained in:
Kris Maglione
2010-12-30 00:17:01 -05:00
parent 6b41435f30
commit 5f1c47ee20
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/content/buffer.js
View File

@@ -258,7 +258,7 @@ var Buffer = Module("buffer", {
else if (flags & Ci.nsIWebProgressListener.STATE_STOP) {
// Workaround for bugs 591425 and 606877, dactyl bug #81
config.browser.mCurrentBrowser.collapsed = false;
if (!dactyl.focusedElement)
if (!dactyl.focusedElement || dactyl.focusedElement === document.documentElement)
dactyl.focusContent();
statusline.updateUrl();
}

5
common/content/events.js
View File

@@ -719,6 +719,7 @@ var Events = Module("events", {
let rect = dactyl.focusedElement.getBoundingClientRect();
if (!rect.width || !rect.height) {
services.focus.clearFocus(window);
document.commandDispatcher.focusedWindow = content;
// onFocusChange needs to die.
this.onFocusChange();
}
@@ -726,12 +727,14 @@ var Events = Module("events", {
},
onBlur: function onFocus(event) {
if (event.originalTarget instanceof Window && services.focus.activeWindow == null)
if (event.originalTarget instanceof Window && services.focus.activeWindow == null) {
// Deals with circumstances where, after the main window
// blurs while a collapsed frame has focus, re-activating
// the main window does not restore focus and we lose key
// input.
services.focus.clearFocus(window);
document.commandDispatcher.focusedWindow = content;
}
},
// TODO: Merge with onFocusChange

6
common/content/tabs.js
View File

@@ -976,9 +976,9 @@ var Tabs = Module("tabs", {
return value;
},
completer: function (context) [
["never", "Never show tab bar"],
["multitab", "Show tab bar when there are multiple tabs"],
["always", "Always show tab bar"]
["never", "Never show the tab bar"],
["multitab", "Show the tab bar when there are multiple tabs"],
["always", "Always show the tab bar"]
]
});