gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 12:42:26 +01:00
Code Issues Projects Releases Wiki Activity

fix focus problem for Paul :)

Browse Source
This commit is contained in:
Martin Stubenschrott
2008-06-11 22:48:32 +00:00
parent 3e11d296c2
commit 8589c22226
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
content/events.js
View File

@@ -270,6 +270,7 @@ liberator.Events = function () //{{{
liberator.statusline.updateTabCount(); liberator.statusline.updateTabCount();
liberator.tabs.updateSelectionHistory(); liberator.tabs.updateSelectionHistory();
if (liberator.options["focuscontent"])
setTimeout(function () { liberator.focusContent(true); }, 10); // just make sure, that no widget has focus setTimeout(function () { liberator.focusContent(true); }, 10); // just make sure, that no widget has focus
}, false); }, false);
} }
@@ -943,13 +944,12 @@ liberator.Events = function () //{{{
if (liberator.mode == liberator.modes.COMMAND_LINE) if (liberator.mode == liberator.modes.COMMAND_LINE)
return; return;
// liberator.log("onFocusChange: " + liberator.buffer.loaded);
var win = window.document.commandDispatcher.focusedWindow; var win = window.document.commandDispatcher.focusedWindow;
var elem = window.document.commandDispatcher.focusedElement; var elem = window.document.commandDispatcher.focusedElement;
if (elem && elem.readOnly) if (elem && elem.readOnly)
return; return;
// liberator.log("onFocusChange: " + elem);
// dump("=+++++++++=\n" + liberator.util.objectToString(event.target) + "\n") // dump("=+++++++++=\n" + liberator.util.objectToString(event.target) + "\n")
// dump (elem + ": " + win + "\n");//" - target: " + event.target + " - origtarget: " + event.originalTarget + " - expltarget: " + event.explicitOriginalTarget + "\n"); // dump (elem + ": " + win + "\n");//" - target: " + event.target + " - origtarget: " + event.originalTarget + " - expltarget: " + event.explicitOriginalTarget + "\n");
@@ -1405,9 +1405,15 @@ liberator.Events = function () //{{{
{ {
liberator.buffer.loaded = 0; liberator.buffer.loaded = 0;
liberator.statusline.updateProgress(0); liberator.statusline.updateProgress(0);
// don't reset mode if a frame of the frameset gets reloaded which
// is not the focused frame
if (document.commandDispatcher.focusedWindow == webProgress.DOMWindow)
{
setTimeout (function () { liberator.modes.reset(false); }, setTimeout (function () { liberator.modes.reset(false); },
liberator.mode == liberator.modes.HINTS ? 500 : 0); liberator.mode == liberator.modes.HINTS ? 500 : 0);
} }
}
else if (flags & Components.interfaces.nsIWebProgressListener.STATE_STOP) else if (flags & Components.interfaces.nsIWebProgressListener.STATE_STOP)
{ {
liberator.buffer.loaded = (status == 0 ? 1 : 2); liberator.buffer.loaded = (status == 0 ? 1 : 2);

1
content/liberator.js
View File

@@ -559,6 +559,7 @@ const liberator = (function () //{{{
if (window == ww.activeWindow && document.commandDispatcher.focusedElement && clearFocusedElement) if (window == ww.activeWindow && document.commandDispatcher.focusedElement && clearFocusedElement)
document.commandDispatcher.focusedElement.blur(); document.commandDispatcher.focusedElement.blur();
liberator.log("focusContent: " + clearFocusedElement);
// TODO: make more generic // TODO: make more generic
try try
{ {

3
content/modes.js
View File

@@ -98,7 +98,7 @@ liberator.modes = (function () //{{{
function handleModeChange(oldMode, newMode) function handleModeChange(oldMode, newMode)
{ {
// TODO: fix v.log() to work with verbosity level // TODO: fix v.log() to work with verbosity level
// liberator.log("switching from mode " + oldMode + " to mode " + newMode, 7); liberator.log("switching from mode " + oldMode + " to mode " + newMode, 7);
// dump("switching from mode " + oldMode + " to mode " + newMode + "\n"); // dump("switching from mode " + oldMode + " to mode " + newMode + "\n");
switch (oldMode) switch (oldMode)
@@ -248,7 +248,6 @@ liberator.modes = (function () //{{{
// keeps recording state // keeps recording state
reset: function (silent) reset: function (silent)
{ {
//if (window.wintype == "msgcompose")
if (liberator.config.isComposeWindow) if (liberator.config.isComposeWindow)
this.set(liberator.modes.COMPOSE, liberator.modes.NONE, silent); this.set(liberator.modes.COMPOSE, liberator.modes.NONE, silent);
else else