From a3d5225b37753e940ddcdb8da289a2acfcc0802c Mon Sep 17 00:00:00 2001 From: John Foerch Date: Mon, 7 Nov 2011 13:25:01 -0500 Subject: [PATCH] noscript.js: whitespace and style --- modules/extensions/noscript.js | 103 +++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 51 deletions(-) diff --git a/modules/extensions/noscript.js b/modules/extensions/noscript.js index 97bd895..d6814ac 100644 --- a/modules/extensions/noscript.js +++ b/modules/extensions/noscript.js @@ -4,19 +4,21 @@ in_module(null); var noscript_service = Cc["@maone.net/noscript-service;1"] .createInstance().wrappedJSObject; -function unique(a) { +function unique (a) { var r = new Array(); - o:for(var i = 0, n = a.length; i < n; i++) { - for(var x = 0, y = r.length; x < y; x++) { - if(r[x]==a[i]) continue o; + o:for (var i = 0, n = a.length; i < n; i++) { + for (var x = 0, y = r.length; x < y; x++) { + if (r[x]==a[i]) + continue o; } r[r.length] = a[i]; } return r; } -function hideObject(p, o) { - if (!p.mimeRx.test(o.type)) return; +function hideObject (p, o) { + if (!p.mimeRx.test(o.type)) + return; var r = p.document.createElement("object"); r.style.width = o.offsetWidth + "px"; r.style.height = o.offsetHeight + "px"; @@ -25,57 +27,53 @@ function hideObject(p, o) { o.parentNode.insertBefore(r, o); } -function showObject(p, o) { +function showObject (p, o) { var cs = o.className; cs = cs.replace(p.classRx, ''); if (cs != o.className) { o.className = cs; var r = o.previousSibling; - if (r instanceof HTMLObjectElement) { + if (r instanceof HTMLObjectElement) r.parentNode.removeChild(r); - } } } -function setObjectVisibility(document, callback) { +function setObjectVisibility (document, callback) { var tags = ["object", "embed"]; - const ns = noscript_service; + var ns = noscript_service; var rx = ns.hideOnUnloadRegExp; - if (!rx) return; + if (!rx) + return; var params = { document: document, mimeRx: rx, classRx: ns.hideObjClassNameRx, className: ns.hideObjClassName }; - var objects = null; - var local_objects, count; - - for each(var tag in tags) { - local_objects = document.getElementsByTagName(tag); - count = local_objects.count; + for each (var tag in tags) { + var local_objects = document.getElementsByTagName(tag); + var count = local_objects.count; if (count) { objects = objects || [local_objects[--count]]; - while(count-- > 0) { + while (count-- > 0) { objects.push(local_objects[count]); } } } - if(objects) { - for (counter = objects.length; counter-- > 0;) { + if (objects) { + for (var counter = objects.length; counter-- > 0;) { callback(params, objects[counter]); } } } -function ns_allow_temp(url, buffer, P, allow) { - var enabled, temp; - const ns = noscript_service; +function ns_allow_temp (url, buffer, P, allow) { + var ns = noscript_service; if (allow) { - enabled = true; - temp = ns.getPref("toggle.temp"); + var enabled = true; + var temp = ns.getPref("toggle.temp"); ns.setTemp(url, enabled && temp); ns.setJSEnabled(url, enabled, false, ns.mustCascadeTrust(url, temp)); setObjectVisibility(buffer.document,showObject); @@ -88,33 +86,36 @@ function ns_allow_temp(url, buffer, P, allow) { } } -interactive("ns-toggle-temp", "Allow a site temporary access to javascript", function(I) { - const ns = noscript_service; - var urls = new Array(); - var level = ns.getPref("toolbarToggle", 3); - if (!level) level = 3; - const url = ns.getQuickSite(I.buffer.document.documentURI, level); - if (url){ - urls.push(url); - var scripts = I.buffer.document.getElementsByTagName("script"); - for(i = 0;i < scripts.length;i++) { - if (scripts[i].getAttribute("src")) { - matches = scripts[i].getAttribute("src").split("/"); - if (matches[0] == "http:") { - urls.push(matches[2]); +interactive("ns-toggle-temp", + "Allow a site temporary access to javascript", + function (I) { + var ns = noscript_service; + var urls = []; + var level = ns.getPref("toolbarToggle", 3); + if (! level) + level = 3; + var url = ns.getQuickSite(I.buffer.document.documentURI, level); + var url2; + if (url) { + urls.push(url); + var scripts = I.buffer.document.getElementsByTagName("script"); + for (var i = 0, n = scripts.length; i < n; i++) { + if (scripts[i].getAttribute("src")) { + var matches = scripts[i].getAttribute("src").split("/"); + if (matches[0] == "http:") + urls.push(matches[2]); } } + urls = unique(urls); + urls = urls.filter(function (u) { return !ns.isJSEnabled(u); }); + while ((url2 = urls.pop())) { + ns_allow_temp(url2, I.buffer, I.P, + "y" == (yield I.minibuffer.read_single_character_option( + $prompt = "Allow " + url2 + "? [y/[n]]", + $options = ["y", "n"]))); + } + reload(I.buffer, I.P); } - urls = unique(urls); - urls = urls.filter(function (u) { return !ns.isJSEnabled(u); }); - while ((url2 = urls.pop())) { - ns_allow_temp(url2, I.buffer, I.P, - (yield I.minibuffer.read_single_character_option( - $prompt = "Allow " + url2 + "? [y/[n]]", - $options = ["y", "n"])) == "y"); - } - reload(I.buffer, I.P); - } -}); + }); provide("noscript"); -- 2.11.4.GIT