aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/bzpage.js5
-rw-r--r--lib/main.js7
-rw-r--r--lib/rhbzpage.js13
3 files changed, 14 insertions, 11 deletions
diff --git a/lib/bzpage.js b/lib/bzpage.js
index 6d04f52..9e4af63 100644
--- a/lib/bzpage.js
+++ b/lib/bzpage.js
@@ -65,14 +65,15 @@ var BZPage = function BZPage(win, config) {
this.commentStrings = config.gJSONData.commentStrings;
}
+ this.constantData = {};
if ("constantData" in config.gJSONData) {
this.constantData = config.gJSONData.constantData;
this.constantData.queryUpstreamBug = JSON.parse(
selfMod.data.load("queryUpstreamBug.json"));
}
- if ("CCmaintainer" in config.gJSONData.constantData) {
- this.defBugzillaMaintainerArr = config.gJSONData.constantData.CCmaintainer;
+ if ("CCmaintainer" in this.constantData) {
+ this.defBugzillaMaintainerArr = this.constantData.CCmaintainer;
}
if ("suspiciousComponents" in config.gJSONData.configData) {
diff --git a/lib/main.js b/lib/main.js
index c5df73d..73ff206 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -78,11 +78,6 @@ function initialize(callback) {
onComplete: function () {
config.gJSONData = this.response.json;
- var keys = "", key = "";
- for (key in config.gJSONData) {
- keys += key + " ";
- }
-
// Get additional tables
if ("downloadJSON" in config.gJSONData.configData) {
var URLsList = config.gJSONData.configData.downloadJSON;
@@ -93,7 +88,7 @@ function initialize(callback) {
Request({
url: url,
onComplete: function() {
- config[title] = this.response.json;
+ config.gJSONData.constantData[title] = this.response.json;
}
}).get();
}, this);
diff --git a/lib/rhbzpage.js b/lib/rhbzpage.js
index 84ca094..eceef2b 100644
--- a/lib/rhbzpage.js
+++ b/lib/rhbzpage.js
@@ -111,7 +111,13 @@ var RHBugzillaPage = function RHBugzillaPage(win, config) {
this.addCheckXorgLogLink();
// TODO Get compiz bugs as well
- if (config.PCI_ID_Array &&
+ var keys = "";
+ for (var key in config) {
+ keys += key + ", ";
+ }
+ console.log("keys = " + keys);
+
+ if (this.constantData.PCI_ID_Array &&
(this.maintCCAddr == "xgl-maint@redhat.com")) {
// Add find chip magic button
var whiteboard_string = this.doc.getElementById("status_whiteboard").value;
@@ -456,7 +462,8 @@ RHBugzillaPage.prototype.fillInWhiteBoard = function(iLine, driverStr) {
var that = this;
function groupIDs(manStr, cardStrID) {
- var outStr = util.filterByRegexp(config.chipIDsGroupings, manStr + "," + cardStrID);
+ var outStr = util.filterByRegexp(that.constantData.chipIDsGroupings,
+ manStr + "," + cardStrID);
if (outStr.length === 0) {
outStr = "UNGROUPED_" + manStr + "/" + cardStrID;
}
@@ -472,7 +479,7 @@ RHBugzillaPage.prototype.fillInWhiteBoard = function(iLine, driverStr) {
*/
function checkChipStringFromID(manufacturerNo, cardNo) {
var soughtID = (manufacturerNo + "," + cardNo).toUpperCase();
- var outList = config.PCI_ID_Array[soughtID];
+ var outList = that.constantData.PCI_ID_Array[soughtID];
if (outList) {
return outList;
} else {