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

Try not to reset dactylFocusAllowed on hash tag change. Closes issue #237.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-05 14:42:39 -05:00
parent 557e8fc0c1
commit 20d978bf63
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/content/buffer.js
View File

@@ -288,9 +288,17 @@ var Buffer = Module("buffer", {
onLocationChange: function onLocationChange(webProgress, request, uri) { onLocationChange: function onLocationChange(webProgress, request, uri) {
onLocationChange.superapply(this, arguments); onLocationChange.superapply(this, arguments);
statusline.updateUrl(); statusline.updateUrl();
statusline.updateProgress(webProgress.DOMWindow || content); if (webProgress.DOMWindow && uri) {
for (let frame in values(buffer.allFrames(webProgress.DOMWindow || content))) statusline.updateProgress(webProgress.DOMWindow);
let oldURI = webProgress.document.dactylURI;
if (webProgress.document.dactylLoadIdx === webProgress.loadedTransIndex
|| !oldURI || uri.spec.replace(/#.*/, "") !== oldURI.replace(/#.*/, ""))
for (let frame in values(buffer.allFrames(webProgress.DOMWindow)))
frame.document.dactylFocusAllowed = false; frame.document.dactylFocusAllowed = false;
webProgress.document.dactylURI = uri.spec;
webProgress.document.dactylLoadIdx = webProgress.loadedTransIndex;
}
// Workaround for bugs 591425 and 606877, dactyl bug #81 // Workaround for bugs 591425 and 606877, dactyl bug #81
let collapse = uri && uri.scheme === "dactyl" && webProgress.isLoadingDocument; let collapse = uri && uri.scheme === "dactyl" && webProgress.isLoadingDocument;

1
common/content/events.js
View File

@@ -996,6 +996,7 @@ var Events = Module("events", {
onMouseDown: function onMouseDown(event) { onMouseDown: function onMouseDown(event) {
let elem = event.target; let elem = event.target;
let win = elem.ownerDocument && elem.ownerDocument.defaultView || elem; let win = elem.ownerDocument && elem.ownerDocument.defaultView || elem;
for (; win; win = win != win.parent && win.parent) for (; win; win = win != win.parent && win.parent)
win.document.dactylFocusAllowed = true; win.document.dactylFocusAllowed = true;
}, },

2
common/modules/util.jsm
View File

@@ -796,7 +796,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
* @returns {nsIURI} * @returns {nsIURI}
*/ */
// FIXME: createURI needed too? // FIXME: createURI needed too?
newURI: function (uri, charset, base) services.io.newURI(uri.replace(/.* -> /, ""), charset, base), newURI: function (uri, charset, base) services.io.newURI(String.replace(uri, /.* -> /, ""), charset, base),
/** /**
* Pretty print a JavaScript object. Use HTML markup to color certain items * Pretty print a JavaScript object. Use HTML markup to color certain items