[Pkg-mozext-commits] [requestpolicy] 76/280: [refact] add `StringUtils.$str` shorthand
David Prévot
taffit at moszumanska.debian.org
Sat May 2 20:30:01 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 3e31aeb2b00404df76f425d40fdbc29b0ed91312
Author: Martin Kimmerle <dev at 256k.de>
Date: Wed Dec 31 11:30:25 2014 +0100
[refact] add `StringUtils.$str` shorthand
---
src/content/lib/string-utils.jsm | 7 +++++++
src/content/lib/xul-utils.jsm | 3 +--
src/content/settings/common.js | 4 ++--
src/content/ui/classicmenu.js | 20 ++++++++------------
src/content/ui/menu.js | 8 +++-----
src/content/ui/overlay.js | 22 ++++++++++------------
src/content/ui/request-log.interface.js | 5 ++---
src/content/ui/request-log.js | 5 ++---
8 files changed, 35 insertions(+), 39 deletions(-)
diff --git a/src/content/lib/string-utils.jsm b/src/content/lib/string-utils.jsm
index 505643c..810c936 100644
--- a/src/content/lib/string-utils.jsm
+++ b/src/content/lib/string-utils.jsm
@@ -61,5 +61,12 @@ let StringUtils = (function() {
return Services.strings.createBundle(path + "?" + Math.random());
}
+ self.$str = function() {
+ let f = arguments.length > 1 ?
+ self.strbundle.formatStringFromName :
+ self.strbundle.GetStringFromName;
+ return f.apply(null, arguments);
+ };
+
return self;
}());
diff --git a/src/content/lib/xul-utils.jsm b/src/content/lib/xul-utils.jsm
index 25a20f7..5c5da0d 100644
--- a/src/content/lib/xul-utils.jsm
+++ b/src/content/lib/xul-utils.jsm
@@ -79,8 +79,7 @@ function getAttrValue(element, attr) {
let value = element[attr];
if (value.charAt(0) == "&" && value.charAt(value.length-1) == ";") {
try {
- value = StringUtils.strbundle
- .GetStringFromName(value.substr(1, value.length-2));
+ value = StringUtils.$str(value.substr(1, value.length-2));
} catch (e) {
Logger.severe(Logger.TYPE_ERROR, e, e);
return false;
diff --git a/src/content/settings/common.js b/src/content/settings/common.js
index 4885be8..fce89e8 100644
--- a/src/content/settings/common.js
+++ b/src/content/settings/common.js
@@ -33,9 +33,9 @@ const COMMON_STRINGS = [
function _(msg, args) {
if (args) {
args = Array.prototype.slice.call(arguments, 1);
- return StringUtils.strbundle.formatStringFromName(msg, args, args.length);
+ return StringUtils.$str(msg, args, args.length);
} else {
- return StringUtils.strbundle.GetStringFromName(msg);
+ return StringUtils.$str(msg);
}
}
diff --git a/src/content/ui/classicmenu.js b/src/content/ui/classicmenu.js
index 633879e..2c2a42d 100644
--- a/src/content/ui/classicmenu.js
+++ b/src/content/ui/classicmenu.js
@@ -71,8 +71,7 @@ requestpolicy.classicmenu = (function() {
self.addMenuItemTemporarilyAllowOrigin = function(menu, originHost) {
- var label = StringUtils.strbundle.formatStringFromName("allowOriginTemporarily",
- [originHost], 1);
+ var label = StringUtils.$str("allowOriginTemporarily", [originHost], 1);
var command = "requestpolicy.overlay.temporarilyAllowOrigin('"
+ requestpolicy.menu._sanitizeJsFunctionArg(originHost) + "');";
var item = self.addMenuItem(menu, label, command);
@@ -81,8 +80,7 @@ requestpolicy.classicmenu = (function() {
};
self.addMenuItemAllowOrigin = function(menu, originHost) {
- var label = StringUtils.strbundle.formatStringFromName("allowOrigin",
- [originHost], 1);
+ var label = StringUtils.$str("allowOrigin", [originHost], 1);
var command = "requestpolicy.overlay.allowOrigin('"
+ requestpolicy.menu._sanitizeJsFunctionArg(originHost) + "');";
return self.addMenuItem(menu, label, command);
@@ -91,8 +89,8 @@ requestpolicy.classicmenu = (function() {
self.addMenuItemTemporarilyAllowOriginToDest = function(menu, originHost,
destHost) {
- var label = StringUtils.strbundle.formatStringFromName(
- "allowOriginToDestinationTemporarily", [originHost, destHost], 2);
+ var label = StringUtils.$str("allowOriginToDestinationTemporarily",
+ [originHost, destHost], 2);
var command = "requestpolicy.overlay.temporarilyAllowOriginToDestination('"
+ requestpolicy.menu._sanitizeJsFunctionArg(originHost) + "', '"
+ requestpolicy.menu._sanitizeJsFunctionArg(destHost) + "');";
@@ -102,8 +100,8 @@ requestpolicy.classicmenu = (function() {
};
self.addMenuItemAllowOriginToDest = function(menu, originHost, destHost) {
- var label = StringUtils.strbundle.formatStringFromName(
- "allowOriginToDestination", [originHost, destHost], 2);
+ var label = StringUtils.$str("allowOriginToDestination",
+ [originHost, destHost], 2);
var command = "requestpolicy.overlay.allowOriginToDestination('"
+ requestpolicy.menu._sanitizeJsFunctionArg(originHost) + "', '"
+ requestpolicy.menu._sanitizeJsFunctionArg(destHost) + "');";
@@ -114,8 +112,7 @@ requestpolicy.classicmenu = (function() {
self.addMenuItemTemporarilyAllowDest = function(menu, destHost) {
- var label = StringUtils.strbundle.formatStringFromName(
- "allowDestinationTemporarily", [destHost], 1);
+ var label = StringUtils.$str("allowDestinationTemporarily", [destHost], 1);
var command = "requestpolicy.overlay.temporarilyAllowDestination('"
+ requestpolicy.menu._sanitizeJsFunctionArg(destHost) + "');";
var item = self.addMenuItem(menu, label, command);
@@ -124,8 +121,7 @@ requestpolicy.classicmenu = (function() {
};
self.addMenuItemAllowDest = function(menu, destHost) {
- var label = StringUtils.strbundle.formatStringFromName("allowDestination",
- [destHost], 1);
+ var label = StringUtils.$str("allowDestination", [destHost], 1);
var command = "requestpolicy.overlay.allowDestination('"
+ requestpolicy.menu._sanitizeJsFunctionArg(destHost) + "');";
return self.addMenuItem(menu, label, command);
diff --git a/src/content/ui/menu.js b/src/content/ui/menu.js
index 9c7527f..1ac363a 100644
--- a/src/content/ui/menu.js
+++ b/src/content/ui/menu.js
@@ -163,8 +163,7 @@ requestpolicy.menu = (function() {
//
// if (isChromeUri) {
// self._itemUnrestrictedOrigin.setAttribute("label",
- // StringUtils.strbundle.formatStringFromName(
- // "unrestrictedOrigin", ["chrome://"]), 1);
+ // StringUtils.$str("unrestrictedOrigin", ["chrome://"]), 1);
// self._itemUnrestrictedOrigin.hidden = false;
// return;
// }
@@ -183,7 +182,7 @@ requestpolicy.menu = (function() {
self._populateMenuForUncontrollableOrigin = function() {
self._originDomainnameItem.setAttribute('value',
- StringUtils.strbundle.GetStringFromName('noOrigin'));
+ StringUtils.$str('noOrigin'));
self._originNumRequestsItem.setAttribute('value', '');
self._originItem.removeAttribute("default-policy");
self._originItem.removeAttribute("requests-blocked");
@@ -926,8 +925,7 @@ requestpolicy.menu = (function() {
self._addMenuItemHelper = function(list, ruleData, fmtStrName, fmtStrArgs,
ruleAction, cssClass) {
- var label = StringUtils.strbundle.formatStringFromName(fmtStrName, fmtStrArgs,
- fmtStrArgs.length);
+ var label = StringUtils.$str(fmtStrName, fmtStrArgs, fmtStrArgs.length);
var item = self._addListItem(list, 'rp-od-item', label);
item.requestpolicyRuleData = ruleData;
item.requestpolicyRuleAction = ruleAction;
diff --git a/src/content/ui/overlay.js b/src/content/ui/overlay.js
index b341613..1e3cc09 100644
--- a/src/content/ui/overlay.js
+++ b/src/content/ui/overlay.js
@@ -466,18 +466,16 @@ requestpolicy.overlay = (function() {
// TODO: different label when redirectNotification is specified.
// e.g. „An url redirection from X to Y has been blocked.“
- var notificationLabel = StringUtils.strbundle.formatStringFromName(
- "redirectNotification", [cropUri(redirectTargetUri)], 1);
-
- var notificationButtonOptions = StringUtils.strbundle.GetStringFromName("more");
- var notificationButtonOptionsKey = StringUtils.strbundle
- .GetStringFromName("more.accesskey");
- var notificationButtonAllow = StringUtils.strbundle.GetStringFromName("allow");
- var notificationButtonAllowKey = StringUtils.strbundle
- .GetStringFromName("allow.accesskey");
- var notificationButtonDeny = StringUtils.strbundle.GetStringFromName("deny");
- var notificationButtonDenyKey = StringUtils.strbundle
- .GetStringFromName("deny.accesskey");
+ var notificationLabel = StringUtils.$str("redirectNotification",
+ [cropUri(redirectTargetUri, 50)],
+ 1);
+
+ var notificationButtonOptions = StringUtils.$str("more");
+ var notificationButtonOptionsKey = StringUtils.$str("more.accesskey");
+ var notificationButtonAllow = StringUtils.$str("allow");
+ var notificationButtonAllowKey = StringUtils.$str("allow.accesskey");
+ var notificationButtonDeny = StringUtils.$str("deny");
+ var notificationButtonDenyKey = StringUtils.$str("deny.accesskey");
var optionsPopupName = "requestpolicyRedirectNotificationOptions";
var optionsPopup = document.getElementById(optionsPopupName);
diff --git a/src/content/ui/request-log.interface.js b/src/content/ui/request-log.interface.js
index 72af12e..c75a6e2 100644
--- a/src/content/ui/request-log.interface.js
+++ b/src/content/ui/request-log.interface.js
@@ -87,9 +87,8 @@ window.requestpolicy.requestLog = (function (self) {
}
if (forbidden) {
- var alertTitle = StringUtils.strbundle.GetStringFromName("actionForbidden");
- var alertText = StringUtils.strbundle
- .GetStringFromName("urlCanOnlyBeCopiedToClipboard");
+ var alertTitle = StringUtils.$str("actionForbidden");
+ var alertText = StringUtils.$str("urlCanOnlyBeCopiedToClipboard");
Services.prompt.alert(null, alertTitle, alertText);
return;
}
diff --git a/src/content/ui/request-log.js b/src/content/ui/request-log.js
index e076289..0ecce6f 100644
--- a/src/content/ui/request-log.js
+++ b/src/content/ui/request-log.js
@@ -62,9 +62,8 @@ window.requestpolicy.requestLog = (function (self) {
function showLogIsEmptyMessage() {
- var message = StringUtils.strbundle.GetStringFromName("requestLogIsEmpty");
- var directions = StringUtils.strbundle
- .GetStringFromName("requestLogDirections");
+ var message = StringUtils.$str("requestLogIsEmpty");
+ var directions = StringUtils.$str("requestLogDirections");
self.visibleRows.push([message, directions, false, ""]);
self.treebox.rowCountChanged(0, 1);
};
--
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