gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-04-10 08:03:31 +02:00
Code Issues Projects Releases Wiki Activity

Simplify last commit.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-01 15:26:56 -05:00
parent b6bdac4b1f
commit 7a6f236e2d
1 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pentadactyl/content/disable-acr.jsm
View File

@@ -8,33 +8,24 @@ const OVERLAY_URLS = [
"chrome://mozapps/content/extensions/extensions.xul" "chrome://mozapps/content/extensions/extensions.xul"
]; ];
const Cc = Components.classes;
const Ci = Components.interfaces; const Ci = Components.interfaces;
const Cr = Components.results;
const Cu = Components.utils; const Cu = Components.utils;
Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm");
function observe(subject, topic, data) { function observe(window, topic, url) {
if (topic in observers) if (topic === "chrome-document-global-created")
observers[topic](subject, data); checkDocument(window.document);
} }
function init(disable) { function init(disable) {
for (let observer in observers) Services.obs[disable ? "removeObserver" : "addObserver"](observe, "chrome-document-global-created", false);
Services.obs[disable ? "removeObserver" : "addObserver"](observe, observer, false);
for (let doc in chromeDocuments) for (let doc in chromeDocuments)
checkDocument(doc, disable); checkDocument(doc, disable);
} }
function cleanup() { init(true); } function cleanup() { init(true); }
var observers = {
"chrome-document-global-created": function (window, uri) {
checkDocument(window.document);
}
}
function checkPopup(event) { function checkPopup(event) {
try {
let doc = event.originalTarget.ownerDocument; let doc = event.originalTarget.ownerDocument;
let binding = doc.getBindingParent(event.originalTarget); let binding = doc.getBindingParent(event.originalTarget);
if (binding && binding.addon && binding.addon.guid == ADDON_ID && !binding.addon.compatible) { if (binding && binding.addon && binding.addon.guid == ADDON_ID && !binding.addon.compatible) {
@@ -45,10 +36,6 @@ function checkPopup(event) {
} }
} }
} }
catch (e) {
Cu.reportError(e);
}
}
function checkDocument(doc, disable, force) { function checkDocument(doc, disable, force) {
if (["interactive", "complete"].indexOf(doc.readyState) >= 0 || force && doc.readyState === "uninitialized") { if (["interactive", "complete"].indexOf(doc.readyState) >= 0 || force && doc.readyState === "uninitialized") {
@@ -57,13 +44,8 @@ function checkDocument(doc, disable, force) {
} }
else { else {
doc.addEventListener("DOMContentLoaded", function listener() { doc.addEventListener("DOMContentLoaded", function listener() {
try {
doc.removeEventListener("DOMContentLoaded", listener, false); doc.removeEventListener("DOMContentLoaded", listener, false);
checkDocument(doc, disable, true); checkDocument(doc, disable, true);
}
catch (e) {
Cu.reportError(e);
}
}, false); }, false);
} }
} }