[Pkg-mozext-commits] [requestpolicy] 27/80: Rename many request log IDs
David Prévot
taffit at moszumanska.debian.org
Sun Jul 5 15:02:26 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 69ef9857005e82634e01fcc886208e430e4181a3
Author: Martin Kimmerle <dev at 256k.de>
Date: Tue May 12 02:58:57 2015 +0200
Rename many request log IDs
---
src/content/ui/overlay.js | 8 ++++----
src/content/ui/request-log.filtering.js | 4 ++--
src/content/ui/request-log.js | 2 +-
src/content/ui/request-log.tree-view.js | 8 ++++----
src/content/ui/request-log.xul | 24 ++++++++++++------------
src/content/ui/xul-trees.js | 18 +++++++++---------
src/skin/request-log.css | 2 +-
src/skin/requestpolicy.css | 4 ++--
tests/mozmill/lib/request-log-utils.js | 16 ++++++++--------
9 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/src/content/ui/overlay.js b/src/content/ui/overlay.js
index 67528a3..522a9e6 100644
--- a/src/content/ui/overlay.js
+++ b/src/content/ui/overlay.js
@@ -177,7 +177,7 @@ requestpolicy.overlay = (function() {
OverlayEnvironment.addShutdownFunction(
Environment.LEVELS.UI,
function() {
- let requestLog = $id("requestpolicy-requestLog");
+ let requestLog = $id("rpcontinued-requestLog");
// If the request log is found and is opened.
// The XUL elements of the request log might have already
@@ -1198,9 +1198,9 @@ requestpolicy.overlay = (function() {
};
self.toggleRequestLog = function() {
- var requestLog = $id("requestpolicy-requestLog");
- var requestLogSplitter = $id("requestpolicy-requestLog-splitter");
- var requestLogFrame = $id("requestpolicy-requestLog-frame");
+ var requestLog = $id("rpcontinued-requestLog");
+ var requestLogSplitter = $id("rpcontinued-requestLog-splitter");
+ var requestLogFrame = $id("rpcontinued-requestLog-frame");
//var openRequestLog = $id("requestpolicyOpenRequestLog");
// TODO: figure out how this should interact with the new menu.
diff --git a/src/content/ui/request-log.filtering.js b/src/content/ui/request-log.filtering.js
index 9e7bcec..d3afc3a 100644
--- a/src/content/ui/request-log.filtering.js
+++ b/src/content/ui/request-log.filtering.js
@@ -40,8 +40,8 @@ window.requestpolicy.requestLog = (function (self) {
// TODO: use the Window Environment instead
let elements = WindowUtils.getElementsByIdOnLoad(window, {
- filterTextbox: "requestpolicy-requestLog-requestFilter",
- clearFilterButton: "requestpolicy-requestLog-clearFilter"
+ filterTextbox: "rpcontinued-requestLog-requestFilter",
+ clearFilterButton: "rpcontinued-requestLog-clearFilter"
});
self.filterChanged = function() {
diff --git a/src/content/ui/request-log.js b/src/content/ui/request-log.js
index 3eb3705..ea3c1c1 100644
--- a/src/content/ui/request-log.js
+++ b/src/content/ui/request-log.js
@@ -56,7 +56,7 @@ window.requestpolicy.requestLog = (function (self) {
function init() {
- self.tree = $id("requestpolicy-requestLog-tree")
+ self.tree = $id("rpcontinued-requestLog-tree")
self.tree.view = self.treeView;
diff --git a/src/content/ui/request-log.tree-view.js b/src/content/ui/request-log.tree-view.js
index c093e8a..8ccb5ba 100644
--- a/src/content/ui/request-log.tree-view.js
+++ b/src/content/ui/request-log.tree-view.js
@@ -43,10 +43,10 @@ window.requestpolicy.requestLog = (function (self) {
self.treebox = null;
self.columnNameToIndexMap = {
- "requestpolicy-requestLog-origin" : 0,
- "requestpolicy-requestLog-destination" : 1,
- "requestpolicy-requestLog-blocked" : 2,
- "requestpolicy-requestLog-time" : 3
+ "rpcontinued-requestLog-origin" : 0,
+ "rpcontinued-requestLog-destination" : 1,
+ "rpcontinued-requestLog-blocked" : 2,
+ "rpcontinued-requestLog-time" : 3
};
let aserv = Cc["@mozilla.org/atom-service;1"].getService(Ci.nsIAtomService);
diff --git a/src/content/ui/request-log.xul b/src/content/ui/request-log.xul
index c5bd4ca..79aed7f 100644
--- a/src/content/ui/request-log.xul
+++ b/src/content/ui/request-log.xul
@@ -38,38 +38,38 @@
<menuitem
id="requestpolicyRequestLogCopyOrigin"
label="&rp.requestLog.copyOriginToClipboard;"
- oncommand="requestpolicy.requestLog.copyToClipboard('requestpolicy-requestLog-origin');" />
+ oncommand="requestpolicy.requestLog.copyToClipboard('rpcontinued-requestLog-origin');" />
<menuitem
id="requestpolicyRequestLogOpenOriginNewTab"
label="&rp.requestLog.openOriginInNewTab;"
- oncommand="requestpolicy.requestLog.openInNewTab('requestpolicy-requestLog-origin');" />
+ oncommand="requestpolicy.requestLog.openInNewTab('rpcontinued-requestLog-origin');" />
<menuitem
id="requestpolicyRequestLogCopyDestination"
label="&rp.requestLog.copyDestinationToClipboard;"
- oncommand="requestpolicy.requestLog.copyToClipboard('requestpolicy-requestLog-destination');" />
+ oncommand="requestpolicy.requestLog.copyToClipboard('rpcontinued-requestLog-destination');" />
<menuitem
id="requestpolicyRequestLogDestinationOriginNewTab"
label="&rp.requestLog.openDestinationInNewTab;"
- oncommand="requestpolicy.requestLog.openInNewTab('requestpolicy-requestLog-destination');" />
+ oncommand="requestpolicy.requestLog.openInNewTab('rpcontinued-requestLog-destination');" />
</menupopup>
</popupset>
- <tree id="requestpolicy-requestLog-tree" flex="1" flags="dont-build-content"
+ <tree id="rpcontinued-requestLog-tree" flex="1" flags="dont-build-content"
seltype="single" context="requestpolicyRequestLogContext">
<treecols>
- <treecol id="requestpolicy-requestLog-origin"
+ <treecol id="rpcontinued-requestLog-origin"
label="&rp.requestLog.origin;" flex="1" crop="center"
persist="width ordinal hidden"/>
<splitter class="tree-splitter"/>
- <treecol id="requestpolicy-requestLog-destination"
+ <treecol id="rpcontinued-requestLog-destination"
label="&rp.requestLog.destination;" flex="1" crop="center"
persist="width ordinal hidden"/>
<splitter class="tree-splitter"/>
- <treecol id="requestpolicy-requestLog-blocked"
+ <treecol id="rpcontinued-requestLog-blocked"
label="&rp.requestLog.blocked;" width="80"
persist="width ordinal hidden"/>
<splitter class="tree-splitter"/>
- <treecol id="requestpolicy-requestLog-time" label="&rp.requestLog.time;"
+ <treecol id="rpcontinued-requestLog-time" label="&rp.requestLog.time;"
width="120" persist="width ordinal hidden"/>
</treecols>
@@ -78,11 +78,11 @@
<hbox align="center" id="search-box">
<label accesskey="&rp.requestLog.filterRequests.accesskey;"
- control="requestpolicy-requestLog-requestFilter"
+ control="rpcontinued-requestLog-requestFilter"
value="&rp.requestLog.filterRequests;"/>
- <textbox id="requestpolicy-requestLog-requestFilter"
+ <textbox id="rpcontinued-requestLog-requestFilter"
oninput="requestpolicy.requestLog.filterChanged(event)" flex="1"/>
- <button id="requestpolicy-requestLog-clearFilter"
+ <button id="rpcontinued-requestLog-clearFilter"
oncommand="requestpolicy.requestLog.clearFilter()"
label="&rp.requestLog.clearFilter;"
accesskey="&rp.requestLog.clearFilter.accesskey;" disabled="true"/>
diff --git a/src/content/ui/xul-trees.js b/src/content/ui/xul-trees.js
index ba74dab..a8c2c81 100644
--- a/src/content/ui/xul-trees.js
+++ b/src/content/ui/xul-trees.js
@@ -153,32 +153,32 @@ exports.mainTree = [
{parent: {id: "appcontent"},
- tag: "splitter", id: "requestpolicy-requestLog-splitter", hidden: "true"},
+ tag: "splitter", id: "rpcontinued-requestLog-splitter", hidden: "true"},
{parent: {id: "appcontent"},
- tag: "vbox", id: "requestpolicy-requestLog", height: "300",
+ tag: "vbox", id: "rpcontinued-requestLog", height: "300",
hidden: "true", persist: "height",
children: [
- {tag: "toolbox", id: "requestpolicy-requestLog-header",
+ {tag: "toolbox", id: "rpcontinued-requestLog-header",
children: [
- {tag: "toolbar", id: "requestpolicy-requestLog-toolbar",
+ {tag: "toolbar", id: "rpcontinued-requestLog-toolbar",
align: "center",
children: [
- {tag: "label", id: "requestpolicy-requestLog-title",
- control: "requestpolicy-requestLog-frame",
+ {tag: "label", id: "rpcontinued-requestLog-title",
+ control: "rpcontinued-requestLog-frame",
value: "&rp.requestLog.title;", crop: "end"},
- {tag: "button", id: "requestpolicy-requestLog-clear",
+ {tag: "button", id: "rpcontinued-requestLog-clear",
label: "&rp.requestLog.clear;",
oncommand: "requestpolicy.overlay.clearRequestLog();"},
{tag: "vbox", flex: "1"},
- {tag: "toolbarbutton", id: "requestpolicy-requestLog-close",
+ {tag: "toolbarbutton", id: "rpcontinued-requestLog-close",
align: "right",
oncommand: "requestpolicy.overlay.toggleRequestLog()"}
]}
]},
// The src of this iframe is set to
// chrome://rpcontinued/content/ui/request-log.xul in overlay.js
- {tag: "iframe", id: "requestpolicy-requestLog-frame", type: "chrome",
+ {tag: "iframe", id: "rpcontinued-requestLog-frame", type: "chrome",
flex: "1"}
]}
];
diff --git a/src/skin/request-log.css b/src/skin/request-log.css
index 79d1d76..b4b5c6e 100644
--- a/src/skin/request-log.css
+++ b/src/skin/request-log.css
@@ -22,7 +22,7 @@ treechildren::-moz-tree-row(blocked, hover) {
background-color: #fcc;
}
-#requestpolicy-requestLog-blocked {
+#rpcontinued-requestLog-blocked {
text-align: center;
}
diff --git a/src/skin/requestpolicy.css b/src/skin/requestpolicy.css
index e548b4f..9666fda 100644
--- a/src/skin/requestpolicy.css
+++ b/src/skin/requestpolicy.css
@@ -270,7 +270,7 @@
/*********************************************
* Request Log
*********************************************/
-#requestpolicy-requestLog-close {
+#rpcontinued-requestLog-close {
-moz-appearance: none;
padding: 0 !important;
margin-right: 4px;
@@ -281,6 +281,6 @@
-moz-box-align: end;
}
-#requestpolicy-requestLog-close :hover {
+#rpcontinued-requestLog-close :hover {
-moz-image-region: rect(0px, 32px, 16px, 16px);
}
diff --git a/tests/mozmill/lib/request-log-utils.js b/tests/mozmill/lib/request-log-utils.js
index de1ede0..aab3039 100644
--- a/tests/mozmill/lib/request-log-utils.js
+++ b/tests/mozmill/lib/request-log-utils.js
@@ -31,29 +31,29 @@ RequestLog.prototype.open = function () {
menu.close();
}
- let iframe = this.windowDoc.getElementById("requestpolicy-requestLog-frame");
+ let iframe = this.windowDoc.getElementById("rpcontinued-requestLog-frame");
this.requestLogDoc = iframe.contentDocument;
this.controller.waitForPageLoad(this.requestLogDoc);
- var tree = this.requestLogDoc.getElementById("requestpolicy-requestLog-tree");
+ var tree = this.requestLogDoc.getElementById("rpcontinued-requestLog-tree");
this.treeView = tree.view;
this.originCol = tree.columns
- .getNamedColumn("requestpolicy-requestLog-origin");
+ .getNamedColumn("rpcontinued-requestLog-origin");
this.destCol = tree.columns
- .getNamedColumn("requestpolicy-requestLog-destination");
+ .getNamedColumn("rpcontinued-requestLog-destination");
this.blockedCol = tree.columns
- .getNamedColumn("requestpolicy-requestLog-blocked");
+ .getNamedColumn("rpcontinued-requestLog-blocked");
this.timeCol = tree.columns
- .getNamedColumn("requestpolicy-requestLog-time");
+ .getNamedColumn("rpcontinued-requestLog-time");
};
RequestLog.prototype.close = function () {
- findElement.ID(this.windowDoc, "requestpolicy-requestLog-close").click();
+ findElement.ID(this.windowDoc, "rpcontinued-requestLog-close").click();
};
RequestLog.prototype.clear = function () {
- findElement.ID(this.windowDoc, "requestpolicy-requestLog-clear").click();
+ findElement.ID(this.windowDoc, "rpcontinued-requestLog-clear").click();
};
--
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