[Pkg-mozext-commits] [requestpolicy] 183/257: [ref] manually fix some JSCS issues
David Prévot
taffit at moszumanska.debian.org
Thu Jan 28 03:20:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository requestpolicy.
commit 5f9e4ba6cfac286548fd010ede442f804aaab6d1
Author: Martin Kimmerle <dev at 256k.de>
Date: Thu Dec 3 12:25:05 2015 +0100
[ref] manually fix some JSCS issues
---
src/content/lib/request-processor.jsm | 11 ++--
src/content/lib/subscription.jsm | 22 +++++---
src/content/lib/utils/domains.jsm | 4 +-
src/content/lib/utils/files.jsm | 19 +++----
src/content/lib/utils/xul.jsm | 2 +-
src/content/main/content-policy.jsm | 6 +-
src/content/main/window-manager.jsm | 2 +-
src/content/settings/advancedprefs.js | 15 +++--
src/content/settings/basicprefs.js | 3 +-
src/content/settings/common.js | 4 +-
src/content/settings/defaultpolicy.js | 3 +-
src/content/settings/setup.js | 3 +-
src/content/settings/subscriptions.js | 5 +-
src/content/ui/frame.dom-content-loaded.js | 2 +-
src/content/ui/menu.js | 88 ++++++++++++++++++++----------
src/content/ui/overlay.js | 72 +++++++++++-------------
src/content/ui/request-log.interface.js | 4 +-
src/content/ui/request-log.tree-view.js | 3 +-
18 files changed, 152 insertions(+), 116 deletions(-)
diff --git a/src/content/lib/request-processor.jsm b/src/content/lib/request-processor.jsm
index 26a8551..e4236f1 100644
--- a/src/content/lib/request-processor.jsm
+++ b/src/content/lib/request-processor.jsm
@@ -833,7 +833,8 @@ var RequestProcessor = (function() {
if (request.aExtra !== CP_MAPPEDDESTINATION &&
internal.mappedDestinations[destURI]) {
for (let mappedDest in internal.mappedDestinations[destURI]) {
- var mappedDestUriObj = internal.mappedDestinations[destURI][mappedDest];
+ var mappedDestUriObj = internal.mappedDestinations
+ [destURI][mappedDest];
Logger.warning(Logger.TYPE_CONTENT,
"Checking mapped destination: " + mappedDest);
let mappedResult = PolicyImplementation.shouldLoad(
@@ -970,7 +971,8 @@ var RequestProcessor = (function() {
};
self.registerAllowedRedirect = function(originUrl, destinationUrl) {
- originUrl = DomainUtil.ensureUriHasPath(DomainUtil.stripFragment(originUrl));
+ originUrl = DomainUtil.ensureUriHasPath(
+ DomainUtil.stripFragment(originUrl));
destinationUrl = DomainUtil.ensureUriHasPath(
DomainUtil.stripFragment(destinationUrl));
@@ -1050,10 +1052,7 @@ var RequestProcessor = (function() {
* the most recent iframe that loaded that source uri. It may also help in
* cases where the user has multiple tabs/windows open to the same page.
*
- * @param {}
- * browser
- * @return {}
- * RequestSet
+ * @param {Browser} browser
*/
self.getAllRequestsInBrowser = function(browser) {
//var origins = {};
diff --git a/src/content/lib/subscription.jsm b/src/content/lib/subscription.jsm
index 06919da..eb74ff5 100644
--- a/src/content/lib/subscription.jsm
+++ b/src/content/lib/subscription.jsm
@@ -203,15 +203,18 @@ UserSubscriptions.prototype = {
var subCount = 0;
for (let subName in serials[listName]) {
if (!this._lists[listName].subscriptions[subName]) {
- dprint("Skipping update of unsubscribed subscription: " + listName + " " + subName);
+ dprint("Skipping update of unsubscribed subscription: " + listName +
+ " " + subName);
continue;
}
if (defaultPolicy === "allow" && subName.indexOf("allow_") === 0) {
- dprint("Skipping update of subscription that is only used with a default deny policy: " + subName);
+ dprint("Skipping update of subscription that is only used " +
+ "with a default deny policy: " + subName);
continue;
}
if (defaultPolicy === "deny" && subName.indexOf("deny_") === 0) {
- dprint("Skipping update of subscription that is only used with a default allow policy: " + subName);
+ dprint("Skipping update of subscription that is only used " +
+ "with a default allow policy: " + subName);
continue;
}
updateSubs[subName] = {"serial": serials[listName][subName]};
@@ -284,8 +287,8 @@ UserSubscriptions.prototype = {
* number. If the the user's current copy of a subscription policy has a serial
* number that is not lower than the one listed, an update isn't necessary.
*
- * @param name
- * @param url
+ * @param {string} name
+ * @param {string} url
*/
function SubscriptionList(name, url) {
// TODO: allow only ascii lower letters, digits, and hyphens in name.
@@ -378,9 +381,9 @@ SubscriptionList.prototype = {
* Represents a particular subscription policy available through a given
* subscription list.
*
- * @param listName
- * @param subName
- * @param subUrl
+ * @param {string} listName
+ * @param {string} subName
+ * @param {string} subUrl
*/
function Subscription(listName, subName, subUrl) {
// TODO: allow only ascii lower letters, digits, and hyphens in listName.
@@ -397,7 +400,8 @@ Subscription.prototype = {
_data: null,
toString: function() {
- return "[Subscription " + this._list + " " + this._name + " " + this._url + "]";
+ return "[Subscription " + this._list + " " + this._name + " " +
+ this._url + "]";
},
update: function(successCallback, errorCallback) {
diff --git a/src/content/lib/utils/domains.jsm b/src/content/lib/utils/domains.jsm
index ed49b48..bdf10d2 100644
--- a/src/content/lib/utils/domains.jsm
+++ b/src/content/lib/utils/domains.jsm
@@ -182,8 +182,8 @@ DomainUtil.isValidUri = function(uri) {
/**
* Returns the domain from a uri string.
*
- * @param {String} uri The uri.
- * @return {String} The domain of the uri.
+ * @param {string} uri The uri.
+ * @return {?string} The domain of the uri.
*/
DomainUtil.getBaseDomain = function(uri) {
var host = this.getHost(uri);
diff --git a/src/content/lib/utils/files.jsm b/src/content/lib/utils/files.jsm
index 6b4e292..8cb895c 100644
--- a/src/content/lib/utils/files.jsm
+++ b/src/content/lib/utils/files.jsm
@@ -62,15 +62,16 @@ var FileUtil = {
/**
* Returns the lines of the file in an array.
*
- * @param {nsIFile}
- * file
+ * @param {nsIFile} file
*/
fileToArray: function(file) {
var stream = Cc["@mozilla.org/network/file-input-stream;1"]
.createInstance(Ci.nsIFileInputStream);
stream.init(file, 0x01, OCTAL_444, 0);
stream.QueryInterface(Ci.nsILineInputStream);
- var line = {}, lines = [], hasmore;
+ var line = {};
+ var lines = [];
+ var hasmore;
do {
hasmore = stream.readLine(line);
lines.push(line.value);
@@ -126,10 +127,8 @@ var FileUtil = {
* Writes each element of an array to a line of a file (truncates the file if
* it exists, creates it if it doesn't).
*
- * @param {Array}
- * lines
- * @param {nsIFile}
- * file
+ * @param {Array} lines
+ * @param {nsIFile} file
*/
arrayToFile: function(lines, file) {
var stream = Cc["@mozilla.org/network/file-output-stream;1"]
@@ -152,10 +151,8 @@ var FileUtil = {
* Writes a string to a file (truncates the file if it exists, creates it if
* it doesn't).
*
- * @param {String}
- * str
- * @param {nsIFile}
- * file
+ * @param {string} str
+ * @param {nsIFile} file
*/
stringToFile: function(str, file) {
var stream = Cc["@mozilla.org/network/file-output-stream;1"]
diff --git a/src/content/lib/utils/xul.jsm b/src/content/lib/utils/xul.jsm
index cd1cdb7..9eb3dfd 100644
--- a/src/content/lib/utils/xul.jsm
+++ b/src/content/lib/utils/xul.jsm
@@ -184,7 +184,7 @@ var {addEventListeners, removeEventListeners} = (function() {
* @param {!Object} aRootObject
* @param {Array<string>} aListenerSpec
*
- * @return {Function} The listener function.
+ * @return {?Function} The listener function.
*/
function getEventListener(aRootObject, aListenerSpec) {
var object = aRootObject;
diff --git a/src/content/main/content-policy.jsm b/src/content/main/content-policy.jsm
index 6f02a1b..0ce945e 100644
--- a/src/content/main/content-policy.jsm
+++ b/src/content/main/content-policy.jsm
@@ -46,7 +46,7 @@ let {Environment, ProcessEnvironment} = importModule("lib/environment");
var PolicyImplementation = (function() {
let self = {};
- let xpcom_categories = ["content-policy"];
+ const XPCOM_CATEGORIES = ["content-policy"];
self.classDescription = "RequestPolicy ContentPolicy Implementation";
self.classID = Components.ID("{d734b30a-996c-4805-be24-25a0738249fe}");
@@ -61,7 +61,7 @@ var PolicyImplementation = (function() {
self.contractID, self);
let catMan = Utils.categoryManager;
- for (let category of xpcom_categories) {
+ for (let category of XPCOM_CATEGORIES) {
catMan.addCategoryEntry(category, self.contractID, self.contractID, false,
true);
}
@@ -135,7 +135,7 @@ var PolicyImplementation = (function() {
let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
let catMan = Utils.categoryManager;
- for (let category of xpcom_categories) {
+ for (let category of XPCOM_CATEGORIES) {
catMan.deleteCategoryEntry(category, self.contractID, false);
}
diff --git a/src/content/main/window-manager.jsm b/src/content/main/window-manager.jsm
index 5e8e168..f8aea29 100644
--- a/src/content/main/window-manager.jsm
+++ b/src/content/main/window-manager.jsm
@@ -119,7 +119,7 @@ var rpWindowManager = (function() {
window.rpcontinued.overlay.init();
} catch (e) {
Logger.warning(Logger.TYPE_ERROR,
- "An error occurred while initializing the overlay: " + e, e);
+ "An error occurred while initializing the overlay: " + e, e);
}
}
diff --git a/src/content/settings/advancedprefs.js b/src/content/settings/advancedprefs.js
index 9de6695..8aa598f 100644
--- a/src/content/settings/advancedprefs.js
+++ b/src/content/settings/advancedprefs.js
@@ -99,27 +99,31 @@
elManager.addListener(
$id("pref-prefetch.link.restoreDefaultOnUninstall"), "change",
function(event) {
- rpPrefBranch.setBoolPref("prefetch.link.restoreDefaultOnUninstall", event.target.checked);
+ rpPrefBranch.setBoolPref("prefetch.link.restoreDefaultOnUninstall",
+ event.target.checked);
Services.prefs.savePrefFile(null);
});
// DNS prefetch.
elManager.addListener($id("pref-dnsPrefetch"), "change", function(event) {
- rootPrefBranch.setBoolPref("network.dns.disablePrefetch", !event.target.checked);
+ rootPrefBranch.setBoolPref("network.dns.disablePrefetch",
+ !event.target.checked);
Services.prefs.savePrefFile(null);
});
elManager.addListener(
$id("pref-prefetch.dns.disableOnStartup"), "change",
function(event) {
- rpPrefBranch.setBoolPref("prefetch.dns.disableOnStartup", event.target.checked);
+ rpPrefBranch.setBoolPref("prefetch.dns.disableOnStartup",
+ event.target.checked);
Services.prefs.savePrefFile(null);
});
elManager.addListener(
$id("pref-prefetch.dns.restoreDefaultOnUninstall"), "change",
function(event) {
- rpPrefBranch.setBoolPref("prefetch.dns.restoreDefaultOnUninstall", event.target.checked);
+ rpPrefBranch.setBoolPref("prefetch.dns.restoreDefaultOnUninstall",
+ event.target.checked);
Services.prefs.savePrefFile(null);
});
@@ -134,7 +138,8 @@
elManager.addListener(
$id("menu.info.showNumRequests"), "change",
function(event) {
- rpPrefBranch.setBoolPref("menu.info.showNumRequests", event.target.checked);
+ rpPrefBranch.setBoolPref("menu.info.showNumRequests",
+ event.target.checked);
Services.prefs.savePrefFile(null);
});
diff --git a/src/content/settings/basicprefs.js b/src/content/settings/basicprefs.js
index fabb12b..714f293 100644
--- a/src/content/settings/basicprefs.js
+++ b/src/content/settings/basicprefs.js
@@ -55,7 +55,8 @@
elManager.addListener(
$id("pref-indicateBlockedObjects"), "change",
function(event) {
- rpPrefBranch.setBoolPref("indicateBlockedObjects", event.target.checked);
+ rpPrefBranch.setBoolPref("indicateBlockedObjects",
+ event.target.checked);
Services.prefs.savePrefFile(null);
updateDisplay();
});
diff --git a/src/content/settings/common.js b/src/content/settings/common.js
index 89e1411..6c03dec 100644
--- a/src/content/settings/common.js
+++ b/src/content/settings/common.js
@@ -53,7 +53,9 @@ var {common, WinEnv, elManager, $id, $str} = (function() {
var newDefaultPolicy = Prefs.isDefaultAllow() ? "allow" : "deny";
var oldDefaultPolicy = Prefs.isDefaultAllow() ? "deny" : "allow";
- var listName, subName, subInfo;
+ var listName;
+ var subName;
+ var subInfo;
var oldSubInfo = subscriptions.getSubscriptionInfo(oldDefaultPolicy);
for (listName in oldSubInfo) {
diff --git a/src/content/settings/defaultpolicy.js b/src/content/settings/defaultpolicy.js
index b28a357..bbea0f4 100644
--- a/src/content/settings/defaultpolicy.js
+++ b/src/content/settings/defaultpolicy.js
@@ -39,7 +39,8 @@
$id("defaultdenysetting").hidden = false;
}
- var allowsamedomain = rpPrefBranch.getBoolPref("defaultPolicy.allowSameDomain");
+ var allowsamedomain = rpPrefBranch.getBoolPref(
+ "defaultPolicy.allowSameDomain");
$id("allowsamedomain").checked = allowsamedomain;
}
diff --git a/src/content/settings/setup.js b/src/content/settings/setup.js
index 68b2187..e2cbf5e 100644
--- a/src/content/settings/setup.js
+++ b/src/content/settings/setup.js
@@ -148,7 +148,8 @@
try {
ruleCount = PolicyManager.getUserRuleCount();
} catch (e) {
- Logger.warning(Logger.TYPE_INTERNAL, "Unable to get new rule count: " + e);
+ Logger.warning(Logger.TYPE_INTERNAL,
+ "Unable to get new rule count: " + e);
ruleCount = -1;
}
Logger.dump("Rule count: " + ruleCount);
diff --git a/src/content/settings/subscriptions.js b/src/content/settings/subscriptions.js
index 0ea7041..7393416 100644
--- a/src/content/settings/subscriptions.js
+++ b/src/content/settings/subscriptions.js
@@ -63,7 +63,7 @@
}
function getInputElement(subName) {
- var elements = document.body.querySelectorAll("input[name=" + subName + "]");
+ var elements = document.body.querySelectorAll(`input[name=${subName}]`);
if (elements.length <= 0) {
return null;
}
@@ -92,7 +92,8 @@
element.input.checked = element.id in subsInfo.official;
}
- var currentPolicy, otherPolicy;
+ var currentPolicy;
+ var otherPolicy;
if (Prefs.isDefaultAllow()) {
currentPolicy = "allow";
otherPolicy = "deny";
diff --git a/src/content/ui/frame.dom-content-loaded.js b/src/content/ui/frame.dom-content-loaded.js
index 1824232..eccc5bb 100644
--- a/src/content/ui/frame.dom-content-loaded.js
+++ b/src/content/ui/frame.dom-content-loaded.js
@@ -143,7 +143,7 @@ var ManagerForDOMContentLoaded = (function() {
* Perform the actions required once the DOM is loaded. This may be being
* called for more than just the page content DOM. It seems to work for now.
*
- * @param {Event} event
+ * @param {Document} doc
*/
function onDocumentLoaded(doc) {
// Create a new Environment for this Document and shut it down when
diff --git a/src/content/ui/menu.js b/src/content/ui/menu.js
index c84b51b..fa9fa55 100644
--- a/src/content/ui/menu.js
+++ b/src/content/ui/menu.js
@@ -237,7 +237,8 @@ window.rpcontinued.menu = (function() {
if (true === guiLocations) {
// get prefs
let sorting = rpPrefBranch.getCharPref("menu.sorting");
- let showNumRequests = rpPrefBranch.getBoolPref("menu.info.showNumRequests");
+ let showNumRequests = rpPrefBranch.getBoolPref(
+ "menu.info.showNumRequests");
if (sorting === "numRequests") {
values.sort(GUILocation.sortByNumRequestsCompareFunction);
@@ -529,7 +530,8 @@ window.rpcontinued.menu = (function() {
self._currentlySelectedOrigin = self._originDomainnameItem.value;
} else if (item.parentNode.id === "rpc-other-origins-list") {
// it's an otherOrigin
- self._currentlySelectedOrigin = item.getElementsByClassName("domainname")[0].value;
+ self._currentlySelectedOrigin = item.getElementsByClassName("domainname")
+ [0].value;
}
self._currentlySelectedDest = null;
// TODO: if the document's origin (rather than an other origin) is being
@@ -542,7 +544,8 @@ window.rpcontinued.menu = (function() {
};
self._activateDestinationItem = function(item) {
- self._currentlySelectedDest = item.getElementsByClassName("domainname")[0].value;
+ self._currentlySelectedDest = item.getElementsByClassName("domainname")
+ [0].value;
if (item.parentNode.id === "rpc-blocked-destinations-list") {
self._isCurrentlySelectedDestBlocked = true;
@@ -617,7 +620,8 @@ window.rpcontinued.menu = (function() {
// TODO: does all of this get replaced with a generic rule processor that
// only cares whether it's an allow/deny and temporary and drops the ruleData
// argument straight into the ruleset?
- var origin, dest;
+ var origin;
+ var dest;
if (ruleData.o && ruleData.o.h) {
origin = ruleData.o.h;
}
@@ -815,110 +819,137 @@ window.rpcontinued.menu = (function() {
// Stop allowing
- self._addMenuItemStopAllowingOrigin = function(list, ruleData, subscriptionOverride) {
+ self._addMenuItemStopAllowingOrigin = function(list, ruleData,
+ subscriptionOverride) {
var originHost = ruleData.o.h;
var ruleAction = subscriptionOverride ? "deny" : "stop-allow";
- return self._addMenuItemHelper(list, ruleData, "stopAllowingOrigin", [originHost], ruleAction, "rpc-stop-rule rpc-stop-allow");
+ return self._addMenuItemHelper(list, ruleData, "stopAllowingOrigin",
+ [originHost], ruleAction, "rpc-stop-rule rpc-stop-allow");
};
- self._addMenuItemStopAllowingDest = function(list, ruleData, subscriptionOverride) {
+ self._addMenuItemStopAllowingDest = function(list, ruleData,
+ subscriptionOverride) {
var destHost = ruleData.d.h;
var ruleAction = subscriptionOverride ? "deny" : "stop-allow";
- return self._addMenuItemHelper(list, ruleData, "stopAllowingDestination", [destHost], ruleAction, "rpc-stop-rule rpc-stop-allow");
+ return self._addMenuItemHelper(list, ruleData, "stopAllowingDestination",
+ [destHost], ruleAction, "rpc-stop-rule rpc-stop-allow");
};
- self._addMenuItemStopAllowingOriginToDest = function(list, ruleData, subscriptionOverride) {
+ self._addMenuItemStopAllowingOriginToDest = function(list, ruleData,
+ subscriptionOverride) {
var originHost = ruleData.o.h;
var destHost = ruleData.d.h;
var ruleAction = subscriptionOverride ? "deny" : "stop-allow";
- return self._addMenuItemHelper(list, ruleData, "stopAllowingOriginToDestination", [originHost, destHost], ruleAction, "rpc-stop-rule rpc-stop-allow");
+ return self._addMenuItemHelper(list, ruleData,
+ "stopAllowingOriginToDestination", [originHost, destHost], ruleAction,
+ "rpc-stop-rule rpc-stop-allow");
};
// Allow
self._addMenuItemAllowOrigin = function(list, ruleData) {
var originHost = ruleData.o.h;
- return self._addMenuItemHelper(list, ruleData, "allowOrigin", [originHost], "allow", "rpc-start-rule rpc-allow");
+ return self._addMenuItemHelper(list, ruleData, "allowOrigin",
+ [originHost], "allow", "rpc-start-rule rpc-allow");
};
self._addMenuItemAllowDest = function(list, ruleData) {
var destHost = ruleData.d.h;
- return self._addMenuItemHelper(list, ruleData, "allowDestination", [destHost], "allow", "rpc-start-rule rpc-allow");
+ return self._addMenuItemHelper(list, ruleData, "allowDestination",
+ [destHost], "allow", "rpc-start-rule rpc-allow");
};
self._addMenuItemAllowOriginToDest = function(list, ruleData) {
var originHost = ruleData.o.h;
var destHost = ruleData.d.h;
- return self._addMenuItemHelper(list, ruleData, "allowOriginToDestination", [originHost, destHost], "allow", "rpc-start-rule rpc-allow");
+ return self._addMenuItemHelper(list, ruleData, "allowOriginToDestination",
+ [originHost, destHost], "allow", "rpc-start-rule rpc-allow");
};
// Allow temp
self._addMenuItemTempAllowOrigin = function(list, ruleData) {
var originHost = ruleData.o.h;
- return self._addMenuItemHelper(list, ruleData, "allowOriginTemporarily", [originHost], "allow-temp", "rpc-start-rule rpc-allow rpc-temporary");
+ return self._addMenuItemHelper(list, ruleData, "allowOriginTemporarily",
+ [originHost], "allow-temp", "rpc-start-rule rpc-allow rpc-temporary");
};
self._addMenuItemTempAllowDest = function(list, ruleData) {
var destHost = ruleData.d.h;
- return self._addMenuItemHelper(list, ruleData, "allowDestinationTemporarily", [destHost], "allow-temp", "rpc-start-rule rpc-allow rpc-temporary");
+ return self._addMenuItemHelper(list, ruleData,
+ "allowDestinationTemporarily", [destHost], "allow-temp",
+ "rpc-start-rule rpc-allow rpc-temporary");
};
self._addMenuItemTempAllowOriginToDest = function(list, ruleData) {
var originHost = ruleData.o.h;
var destHost = ruleData.d.h;
- return self._addMenuItemHelper(list, ruleData, "allowOriginToDestinationTemporarily", [originHost, destHost], "allow-temp", "rpc-start-rule rpc-allow rpc-temporary");
+ return self._addMenuItemHelper(list, ruleData,
+ "allowOriginToDestinationTemporarily", [originHost, destHost],
+ "allow-temp", "rpc-start-rule rpc-allow rpc-temporary");
};
// Stop denying
- self._addMenuItemStopDenyingOrigin = function(list, ruleData, subscriptionOverride) {
+ self._addMenuItemStopDenyingOrigin = function(list, ruleData,
+ subscriptionOverride) {
var originHost = ruleData.o.h;
var ruleAction = subscriptionOverride ? "allow" : "stop-deny";
- return self._addMenuItemHelper(list, ruleData, "stopDenyingOrigin", [originHost], ruleAction, "rpc-stop-rule rpc-stop-deny");
+ return self._addMenuItemHelper(list, ruleData, "stopDenyingOrigin",
+ [originHost], ruleAction, "rpc-stop-rule rpc-stop-deny");
};
- self._addMenuItemStopDenyingDest = function(list, ruleData, subscriptionOverride) {
+ self._addMenuItemStopDenyingDest = function(list, ruleData,
+ subscriptionOverride) {
var destHost = ruleData.d.h;
var ruleAction = subscriptionOverride ? "allow" : "stop-deny";
- return self._addMenuItemHelper(list, ruleData, "stopDenyingDestination", [destHost], ruleAction, "rpc-stop-rule rpc-stop-deny");
+ return self._addMenuItemHelper(list, ruleData, "stopDenyingDestination",
+ [destHost], ruleAction, "rpc-stop-rule rpc-stop-deny");
};
- self._addMenuItemStopDenyingOriginToDest = function(list, ruleData, subscriptionOverride) {
+ self._addMenuItemStopDenyingOriginToDest = function(list, ruleData,
+ subscriptionOverride) {
var originHost = ruleData.o.h;
var destHost = ruleData.d.h;
var ruleAction = subscriptionOverride ? "allow" : "stop-deny";
- return self._addMenuItemHelper(list, ruleData, "stopDenyingOriginToDestination", [originHost, destHost], ruleAction, "rpc-stop-rule rpc-stop-deny");
+ return self._addMenuItemHelper(list, ruleData,
+ "stopDenyingOriginToDestination", [originHost, destHost], ruleAction,
+ "rpc-stop-rule rpc-stop-deny");
};
// Deny
self._addMenuItemDenyOrigin = function(list, ruleData) {
var originHost = ruleData.o.h;
- return self._addMenuItemHelper(list, ruleData, "denyOrigin", [originHost], "deny", "rpc-start-rule rpc-deny");
+ return self._addMenuItemHelper(list, ruleData, "denyOrigin",
+ [originHost], "deny", "rpc-start-rule rpc-deny");
};
self._addMenuItemDenyDest = function(list, ruleData) {
var destHost = ruleData.d.h;
- return self._addMenuItemHelper(list, ruleData, "denyDestination", [destHost], "deny", "rpc-start-rule rpc-deny");
+ return self._addMenuItemHelper(list, ruleData, "denyDestination",
+ [destHost], "deny", "rpc-start-rule rpc-deny");
};
self._addMenuItemDenyOriginToDest = function(list, ruleData) {
var originHost = ruleData.o.h;
var destHost = ruleData.d.h;
- return self._addMenuItemHelper(list, ruleData, "denyOriginToDestination", [originHost, destHost], "deny", "rpc-start-rule rpc-deny");
+ return self._addMenuItemHelper(list, ruleData, "denyOriginToDestination",
+ [originHost, destHost], "deny", "rpc-start-rule rpc-deny");
};
// Deny temp
self._addMenuItemTempDenyOrigin = function(list, ruleData) {
var originHost = ruleData.o.h;
- return self._addMenuItemHelper(list, ruleData, "denyOriginTemporarily", [originHost], "deny-temp", "rpc-start-rule rpc-deny rpc-temporary");
+ return self._addMenuItemHelper(list, ruleData, "denyOriginTemporarily",
+ [originHost], "deny-temp", "rpc-start-rule rpc-deny rpc-temporary");
};
self._addMenuItemTempDenyDest = function(list, ruleData) {
var destHost = ruleData.d.h;
- return self._addMenuItemHelper(list, ruleData, "denyDestinationTemporarily", [destHost], "deny-temp", "rpc-start-rule rpc-deny rpc-temporary");
+ return self._addMenuItemHelper(list, ruleData, "denyDestinationTemporarily",
+ [destHost], "deny-temp", "rpc-start-rule rpc-deny rpc-temporary");
};
self._addMenuItemTempDenyOriginToDest = function(list, ruleData) {
@@ -1120,7 +1151,8 @@ window.rpcontinued.menu = (function() {
// TODO: we at least in default deny mode, we need to give an option
// to add a allow rule for these requests.
if (!destinations[destUri]) {
- Logger.dump("destinations[destUri] is null or undefined for destUri: " + destUri);
+ Logger.dump("destinations[destUri] is null or undefined " +
+ "for destUri: " + destUri);
continue;
}
diff --git a/src/content/ui/overlay.js b/src/content/ui/overlay.js
index c7d5fab..9f5645f 100644
--- a/src/content/ui/overlay.js
+++ b/src/content/ui/overlay.js
@@ -398,7 +398,7 @@ window.rpcontinued.overlay = (function() {
* Shows a notification that a redirect was requested by a page (meta refresh
* or with headers).
*
- * @param {<browser> element} browser
+ * @param {Browser} browser
* @param {string} redirectTargetUri
* @param {number} delay
* @param {string=} redirectOriginUri
@@ -456,7 +456,8 @@ window.rpcontinued.overlay = (function() {
var originBaseDomain = DomainUtil.getBaseDomain(redirectOriginUri);
var destBaseDomain = DomainUtil.getBaseDomain(redirectTargetUri);
- var origin = null, dest = null;
+ var origin = null;
+ var dest = null;
if (originBaseDomain !== null) {
origin = m._addWildcard(originBaseDomain);
}
@@ -650,10 +651,8 @@ window.rpcontinued.overlay = (function() {
* fast as possible because request processing blocks until this function
* returns.
*
- * @param {}
- * originUri
- * @param {}
- * destUri
+ * @param {string} originUri
+ * @param {string} destUri
*/
self.observeAllowedRequest = function(originUri, destUri) {
if (self.requestLog) {
@@ -666,10 +665,8 @@ window.rpcontinued.overlay = (function() {
* fast as possible because request processing blocks until this function
* returns.
*
- * @param {}
- * originUri
- * @param {}
- * destUri
+ * @param {string} originUri
+ * @param {string} destUri
*/
self.observeBlockedRequest = function(originUri, destUri) {
self._updateNotificationDueToBlockedContent();
@@ -749,7 +746,8 @@ window.rpcontinued.overlay = (function() {
this.linkURL);
});
- Utils.wrapFunction(window.gContextMenu, "openLinkInPrivateWindow", function() {
+ Utils.wrapFunction(window.gContextMenu, "openLinkInPrivateWindow",
+ function() {
RequestProcessor.registerLinkClicked(this.target.ownerDocument.URL,
this.linkURL);
});
@@ -874,7 +872,9 @@ window.rpcontinued.overlay = (function() {
// there seems to be a bug in Firefox ESR 24 -- the session history is
// null. After waiting a few miliseconds it's available. To be sure this
- let tries = 0, waitTime = 20, maxTries = 10;
+ let tries = 0;
+ let waitTime = 20;
+ let maxTries = 10;
let tryAddingSHistoryListener = function() {
++tries;
try {
@@ -912,8 +912,7 @@ window.rpcontinued.overlay = (function() {
/**
* Called before the popup menu is shown.
*
- * @param {Event}
- * event
+ * @param {Event} event
*/
self.onPopupShowing = function(event) {
// if (event.currentTarget != event.originalTarget) {
@@ -925,8 +924,7 @@ window.rpcontinued.overlay = (function() {
/**
* Called after the popup menu has been hidden.
*
- * @param {Event}
- * event
+ * @param {Event} event
*/
self.onPopupHidden = function(event) {
var rulesChanged = rpcontinued.menu.processQueuedRuleChanges();
@@ -967,8 +965,7 @@ window.rpcontinued.overlay = (function() {
/**
* Toggles disabling of all blocking for the current session.
*
- * @param {Event}
- * event
+ * @param {Event} event
*/
self.toggleTemporarilyAllowAll = function(event) {
var disabled = !Prefs.isBlockingDisabled();
@@ -991,8 +988,7 @@ window.rpcontinued.overlay = (function() {
* Allows the current document's origin to request from any destination for
* the duration of the browser session.
*
- * @param {Event}
- * event
+ * @param {Event} event
*/
self.temporarilyAllowCurrentOrigin = function(event) {
// Note: the available variable "content" is different than the avaialable
@@ -1005,8 +1001,7 @@ window.rpcontinued.overlay = (function() {
* Allows a destination to be requested from any origin for the duration of
* the browser session.
*
- * @param {String}
- * destHost
+ * @param {string} destHost
*/
self.temporarilyAllowDestination = function(destHost) {
PolicyManager.temporarilyAllowDestination(destHost);
@@ -1016,10 +1011,8 @@ window.rpcontinued.overlay = (function() {
* Allows a destination to be requested from a single origin for the duration
* of the browser session.
*
- * @param {String}
- * originHost
- * @param {String}
- * destHost
+ * @param {string} originHost
+ * @param {string} destHost
*/
self.temporarilyAllowOriginToDestination = function(originHost, destHost) {
PolicyManager.temporarilyAllowOriginToDestination(originHost, destHost);
@@ -1036,8 +1029,7 @@ window.rpcontinued.overlay = (function() {
* Allows the current document's origin to request from any destination,
* including in future browser sessions.
*
- * @param {Event}
- * event
+ * @param {Event} event
*/
self.allowCurrentOrigin = function(event) {
var host = self.getTopLevelDocumentUriIdentifier();
@@ -1047,8 +1039,7 @@ window.rpcontinued.overlay = (function() {
/**
* Allows requests to a destination, including in future browser sessions.
*
- * @param {String}
- * destHost
+ * @param {String} destHost
*/
self.allowDestination = function(destHost) {
PolicyManager.allowDestination(destHost);
@@ -1058,10 +1049,8 @@ window.rpcontinued.overlay = (function() {
* Allows requests to a destination from a single origin, including in future
* browser sessions.
*
- * @param {String}
- * originHost
- * @param {String}
- * destHost
+ * @param {String} originHost
+ * @param {String} destHost
*/
self.allowOriginToDestination = function(originHost, destHost) {
PolicyManager.allowOriginToDestination(originHost, destHost);
@@ -1070,8 +1059,7 @@ window.rpcontinued.overlay = (function() {
/**
* Revokes all temporary permissions granted during the current session.
*
- * @param {Event}
- * event
+ * @param {Event} event
*/
self.revokeTemporaryPermissions = function(event) {
PolicyManager.revokeTemporaryRules();
@@ -1131,8 +1119,8 @@ window.rpcontinued.overlay = (function() {
self.openPrefs = openLinkInNewTab.bind(this, "about:requestpolicy", true);
self.openPolicyManager = openLinkInNewTab.bind(this,
"about:requestpolicy?yourpolicy", true);
- self.openHelp = openLinkInNewTab.bind(this,
- "https://github.com/RequestPolicyContinued/requestpolicy/wiki/Help-and-Support");
+ self.openHelp = openLinkInNewTab.bind(this, "https://github.com/" +
+ "RequestPolicyContinued/requestpolicy/wiki/Help-and-Support");
self.clearRequestLog = function() {
self.requestLog.clear();
@@ -1151,11 +1139,15 @@ window.rpcontinued.overlay = (function() {
if (requestLog.hidden) {
requestLogFrame.setAttribute("src",
"chrome://rpcontinued/content/ui/request-log.xul");
- requestLog.hidden = requestLogSplitter.hidden = closeRequestLog.hidden = false;
+ requestLog.hidden = false;
+ requestLogSplitter.hidden = false;
+ closeRequestLog.hidden = false;
//openRequestLog.hidden = true;
} else {
requestLogFrame.setAttribute("src", "about:blank");
- requestLog.hidden = requestLogSplitter.hidden = closeRequestLog.hidden = true;
+ requestLog.hidden = true;
+ requestLogSplitter.hidden = true;
+ closeRequestLog.hidden = true;
//openRequestLog.hidden = false;
self.requestLog = null;
}
diff --git a/src/content/ui/request-log.interface.js b/src/content/ui/request-log.interface.js
index d753b09..2722a6d 100644
--- a/src/content/ui/request-log.interface.js
+++ b/src/content/ui/request-log.interface.js
@@ -27,7 +27,7 @@ window.rpcontinued = window.rpcontinued || {};
window.rpcontinued.requestLog = (function(self) {
/* global Components */
- const {utils: Cu} = Components;
+ const {classes: Cc, utils: Cu} = Components;
let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
@@ -59,7 +59,7 @@ window.rpcontinued.requestLog = (function(self) {
var content = self.treeView.getCellText(self.tree.currentIndex,
self.tree.columns.getNamedColumn(columnName));
- const clipboardHelper = Components.classes["@mozilla.org/widget/clipboardhelper;1"]
+ const clipboardHelper = Cc["@mozilla.org/widget/clipboardhelper;1"]
.getService(Components.interfaces.nsIClipboardHelper);
clipboardHelper.copyString(content);
};
diff --git a/src/content/ui/request-log.tree-view.js b/src/content/ui/request-log.tree-view.js
index 349721b..59eba3c 100644
--- a/src/content/ui/request-log.tree-view.js
+++ b/src/content/ui/request-log.tree-view.js
@@ -74,7 +74,8 @@ window.rpcontinued.requestLog = (function(self) {
// with this javascript array implementation, though I'm assuming it does.
var columnIndex = self.columnNameToIndexMap[aColumn.id];
if (columnIndex !== 2) {
- return getVisibleRowAtIndex(aIndex)[self.columnNameToIndexMap[aColumn.id]];
+ return getVisibleRowAtIndex(aIndex)
+ [self.columnNameToIndexMap[aColumn.id]];
}
},
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git
More information about the Pkg-mozext-commits
mailing list