[Pkg-mozext-commits] [requestpolicy] 35/280: fix bugs
David Prévot
taffit at moszumanska.debian.org
Sat May 2 20:29:57 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository requestpolicy.
commit f0d6743b4edf082ed93ecd7d93eb4afffa8dac1d
Author: Martin Kimmerle <dev at 256k.de>
Date: Wed Nov 26 00:57:31 2014 +0100
fix bugs
---
src/content/lib/utils.jsm | 10 ++---
src/content/settings/setup.js | 4 +-
src/content/ui/classicmenu.js | 12 +++---
src/content/ui/overlay.js | 10 ++---
src/content/ui/request-log-tree-view.js | 68 +++++++++++++++++----------------
src/content/ui/request-log.js | 9 +++--
6 files changed, 59 insertions(+), 54 deletions(-)
diff --git a/src/content/lib/utils.jsm b/src/content/lib/utils.jsm
index 45b3441..0a9585e 100644
--- a/src/content/lib/utils.jsm
+++ b/src/content/lib/utils.jsm
@@ -126,12 +126,12 @@ let Utils = (function() {
Services.vc.compare(Services.appinfo.platformVersion, '29') >= 0;
self.getChromeWindow = function(aContentWindow) {
- return aContentWindow.QueryInterface(CI.nsIInterfaceRequestor)
- .getInterface(CI.nsIWebNavigation)
- .QueryInterface(CI.nsIDocShellTreeItem)
+ return aContentWindow.QueryInterface(Ci.nsIInterfaceRequestor)
+ .getInterface(Ci.nsIWebNavigation)
+ .QueryInterface(Ci.nsIDocShellTreeItem)
.rootTreeItem
- .QueryInterface(CI.nsIInterfaceRequestor)
- .getInterface(CI.nsIDOMWindow);
+ .QueryInterface(Ci.nsIInterfaceRequestor)
+ .getInterface(Ci.nsIDOMWindow);
};
return self;
diff --git a/src/content/settings/setup.js b/src/content/settings/setup.js
index b12888f..abeb2b8 100644
--- a/src/content/settings/setup.js
+++ b/src/content/settings/setup.js
@@ -116,14 +116,14 @@ function onload() {
// Skip the welcome screen.
showConfigure();
} else {
- var defaultAllow = prefs.getBoolPref('defaultPolicy.allow');
+ var defaultAllow = Prefs.prefs.getBoolPref('defaultPolicy.allow');
$('#defaultallow').prop('checked', defaultAllow);
$('#defaultdeny').prop('checked', !defaultAllow);
if (!defaultAllow) {
$('#allowsamedomainblock').css('display', 'block');
}
$('#allowsamedomain').prop('checked',
- prefs.getBoolPref('defaultPolicy.allowSameDomain'));
+ Prefs.prefs.getBoolPref('defaultPolicy.allowSameDomain'));
// Subscriptions are only simple here if we assume the user won't open the
// setup window again after changing their individual subscriptions through
// the preferences. So, let's assume that as the worst case is that the setup
diff --git a/src/content/ui/classicmenu.js b/src/content/ui/classicmenu.js
index a59ef0c..af90152 100644
--- a/src/content/ui/classicmenu.js
+++ b/src/content/ui/classicmenu.js
@@ -71,7 +71,7 @@ requestpolicy.classicmenu = (function() {
[originHost], 1);
var command = "requestpolicy.overlay.temporarilyAllowOrigin('"
+ requestpolicy.menu._sanitizeJsFunctionArg(originHost) + "');";
- var item = this.addMenuItem(menu, label, command);
+ var item = self.addMenuItem(menu, label, command);
item.setAttribute("class", "requestpolicyTemporary");
return item;
},
@@ -81,7 +81,7 @@ requestpolicy.classicmenu = (function() {
[originHost], 1);
var command = "requestpolicy.overlay.allowOrigin('"
+ requestpolicy.menu._sanitizeJsFunctionArg(originHost) + "');";
- return this.addMenuItem(menu, label, command);
+ return self.addMenuItem(menu, label, command);
},
@@ -92,7 +92,7 @@ requestpolicy.classicmenu = (function() {
var command = "requestpolicy.overlay.temporarilyAllowOriginToDestination('"
+ requestpolicy.menu._sanitizeJsFunctionArg(originHost) + "', '"
+ requestpolicy.menu._sanitizeJsFunctionArg(destHost) + "');";
- var item = this.addMenuItem(menu, label, command);
+ var item = self.addMenuItem(menu, label, command);
item.setAttribute("class", "requestpolicyTemporary");
return item;
},
@@ -103,7 +103,7 @@ requestpolicy.classicmenu = (function() {
var command = "requestpolicy.overlay.allowOriginToDestination('"
+ requestpolicy.menu._sanitizeJsFunctionArg(originHost) + "', '"
+ requestpolicy.menu._sanitizeJsFunctionArg(destHost) + "');";
- var item = this.addMenuItem(menu, label, command);
+ var item = self.addMenuItem(menu, label, command);
item.setAttribute("class", "requestpolicyAllowOriginToDest");
return item;
},
@@ -114,7 +114,7 @@ requestpolicy.classicmenu = (function() {
"allowDestinationTemporarily", [destHost], 1);
var command = "requestpolicy.overlay.temporarilyAllowDestination('"
+ requestpolicy.menu._sanitizeJsFunctionArg(destHost) + "');";
- var item = this.addMenuItem(menu, label, command);
+ var item = self.addMenuItem(menu, label, command);
item.setAttribute("class", "requestpolicyTemporary");
return item;
},
@@ -124,7 +124,7 @@ requestpolicy.classicmenu = (function() {
[destHost], 1);
var command = "requestpolicy.overlay.allowDestination('"
+ requestpolicy.menu._sanitizeJsFunctionArg(destHost) + "');";
- return this.addMenuItem(menu, label, command);
+ return self.addMenuItem(menu, label, command);
}
};
diff --git a/src/content/ui/overlay.js b/src/content/ui/overlay.js
index cc35d1c..e19e6cf 100644
--- a/src/content/ui/overlay.js
+++ b/src/content/ui/overlay.js
@@ -640,15 +640,15 @@ requestpolicy.overlay = (function() {
},
_indicateBlockedVisibleObjects: function(document) {
- if (!this._rpService.prefs.getBoolPref("indicateBlockedObjects")) {
+ if (!Prefs.prefs.getBoolPref("indicateBlockedObjects")) {
return;
}
- var indicateBlacklisted = this._rpService.prefs
+ var indicateBlacklisted = Prefs.prefs
.getBoolPref("indicateBlacklistedObjects");
var images = document.getElementsByTagName("img");
- var rejectedRequests = this._rpService._requestProcessor.
- _rejectedRequests.getOriginUri(document.location);
+ var rejectedRequests = RequestProcessor._rejectedRequests
+ .getOriginUri(document.location);
var blockedUrisToIndicate = {};
for (var destBase in rejectedRequests) {
for (var destIdent in rejectedRequests[destBase]) {
@@ -665,7 +665,7 @@ requestpolicy.overlay = (function() {
// ==> *do* indicate
let requests = rejectedRequests[destBase][destIdent][destUri];
if (indicateBlacklisted ||
- this._containsNonBlacklistedRequests(requests)) {
+ self._containsNonBlacklistedRequests(requests)) {
blockedUrisToIndicate[destUri] = true;
}
}
diff --git a/src/content/ui/request-log-tree-view.js b/src/content/ui/request-log-tree-view.js
index 7c0f433..1895a72 100644
--- a/src/content/ui/request-log-tree-view.js
+++ b/src/content/ui/request-log-tree-view.js
@@ -31,8 +31,10 @@ window.requestpolicy.requestLogTreeView = (function () {
const Cc = Components.classes;
const Cu = Components.utils;
- Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
- ScriptLoader.importModules(["utils"], this);
+ let mod = {};
+ Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
+ mod.ScriptLoader.importModules(["utils"], mod);
+ let Utils = mod.Utils;
@@ -58,63 +60,63 @@ window.requestpolicy.requestLogTreeView = (function () {
var message = Utils.strbundle.GetStringFromName("requestLogIsEmpty");
var directions = Utils.strbundle
.GetStringFromName("requestLogDirections");
- this._visibleData.push([message, directions, false, ""]);
+ self._visibleData.push([message, directions, false, ""]);
},
clear : function(e) {
- var count = this.rowCount;
+ var count = self.rowCount;
if (count == 0) {
return;
}
- this._visibleData = [];
- if (!this._treebox) {
+ self._visibleData = [];
+ if (!self._treebox) {
return;
}
- this._treebox.rowCountChanged(0, -count);
+ self._treebox.rowCountChanged(0, -count);
},
addAllowedRequest : function(originUri, destUri) {
- if (this._emptyMessageDisplayed) {
+ if (self._emptyMessageDisplayed) {
// If this were to be called in a multithreaded manner, there's probably
// a race condition here.
- this._visibleData.shift();
- this._emptyMessageDisplayed = false;
- this._treebox.rowCountChanged(0, -1);
+ self._visibleData.shift();
+ self._emptyMessageDisplayed = false;
+ self._treebox.rowCountChanged(0, -1);
}
- this._visibleData.push([
+ self._visibleData.push([
originUri,
destUri,
false,
(new Date()).toLocaleTimeString()
]);
- if (!this._treebox) {
+ if (!self._treebox) {
return;
}
- this._treebox.rowCountChanged(0, 1);
+ self._treebox.rowCountChanged(0, 1);
},
addBlockedRequest : function(originUri, destUri) {
- if (this._emptyMessageDisplayed) {
+ if (self._emptyMessageDisplayed) {
// If this were to be called in a multithreaded manner, there's probably
// a race condition here.
- this._visibleData.shift();
- this._emptyMessageDisplayed = false;
- this._treebox.rowCountChanged(0, -1);
+ self._visibleData.shift();
+ self._emptyMessageDisplayed = false;
+ self._treebox.rowCountChanged(0, -1);
}
- this._visibleData.push([
+ self._visibleData.push([
originUri,
destUri,
true,
(new Date()).toLocaleTimeString()
]);
- if (!this._treebox) {
+ if (!self._treebox) {
return;
}
- this._treebox.rowCountChanged(0, 1);
+ self._treebox.rowCountChanged(0, 1);
},
_getVisibleItemAtIndex : function(index) {
- return this._visibleData[this._visibleData.length - index - 1];
+ return self._visibleData[self._visibleData.length - index - 1];
},
// Start of interface.
@@ -125,7 +127,7 @@ window.requestpolicy.requestLogTreeView = (function () {
* (getter function)
*/
get rowCount () {
- return this._visibleData.length;
+ return self._visibleData.length;
},
/**
@@ -133,7 +135,7 @@ window.requestpolicy.requestLogTreeView = (function () {
* column."
*/
setTree : function(_treebox) {
- this._treebox = _treebox;
+ self._treebox = _treebox;
},
/**
@@ -144,9 +146,9 @@ window.requestpolicy.requestLogTreeView = (function () {
// unshift() the array and can just push().
// TODO: Do an actual speed test with push vs. unshift to see if it matters
// with this javascript array implementation, though I'm assuming it does.
- var columnIndex = this._columnNameToIndexMap[column.id];
+ var columnIndex = self._columnNameToIndexMap[column.id];
if (columnIndex != 2) {
- return this._getVisibleItemAtIndex(index)[this._columnNameToIndexMap[column.id]];
+ return self._getVisibleItemAtIndex(index)[self._columnNameToIndexMap[column.id]];
}
},
@@ -190,8 +192,8 @@ window.requestpolicy.requestLogTreeView = (function () {
},
getImageSrc : function(index, column) {
- if (this._columnNameToIndexMap[column.id] == 2) {
- if (this._getVisibleItemAtIndex(index)[2]) {
+ if (self._columnNameToIndexMap[column.id] == 2) {
+ if (self._getVisibleItemAtIndex(index)[2]) {
return "chrome://requestpolicy/skin/dot.png";
}
}
@@ -219,11 +221,11 @@ window.requestpolicy.requestLogTreeView = (function () {
},
getRowProperties : function(index, props) {
- var returnValue = (this._getVisibleItemAtIndex(index)[2]) ? "blocked" : "allowed";
+ var returnValue = (self._getVisibleItemAtIndex(index)[2]) ? "blocked" : "allowed";
if (props) {
// Gecko version < 22
- props.AppendElement(this._aserv.getAtom(returnValue));
+ props.AppendElement(self._aserv.getAtom(returnValue));
} else {
// Gecko version >= 22
return returnValue;
@@ -231,11 +233,11 @@ window.requestpolicy.requestLogTreeView = (function () {
},
getCellProperties : function(index, column, props) {
- if (this._columnNameToIndexMap[column.id] == 2) {
- if (this._getVisibleItemAtIndex(index)[2]) {
+ if (self._columnNameToIndexMap[column.id] == 2) {
+ if (self._getVisibleItemAtIndex(index)[2]) {
if (props) {
// Gecko version < 22
- props.AppendElement(this._aserv.getAtom("blocked"));
+ props.AppendElement(self._aserv.getAtom("blocked"));
} else {
// Gecko version >= 22
return "blocked";
diff --git a/src/content/ui/request-log.js b/src/content/ui/request-log.js
index 58a721d..904172c 100644
--- a/src/content/ui/request-log.js
+++ b/src/content/ui/request-log.js
@@ -28,11 +28,14 @@ window.requestpolicy.requestLog = (function () {
const Cc = Components.classes;
const Cu = Components.utils;
- Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
- ScriptLoader.importModules([
+ let mod = {};
+ Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
+ Cu.import("resource://gre/modules/Services.jsm", mod);
+ mod.ScriptLoader.importModules([
"domain-util",
"utils"
- ], this);
+ ], mod);
+ let Services = mod.Services, DomainUtil = mod.DomainUtil, Utils = mod.Utils;
let initialized = false;
--
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