Working on cutting down lines from bug-page-mod.js

3 files changed, 11 insertions, 10 deletions

diff --git a/lib/libbugzilla.js b/lib/libbugzilla.js
index 45a1fc4..613dbb3 100644
--- a/lib/libbugzilla.js
+++ b/lib/libbugzilla.js
@@ -170,7 +170,7 @@ exports.getInstalledPackages = function getInstalledPackages(locationLoginObj, c
     var allIdx = null;
     if ((allIdx = enabledPackages.indexOf("all")) != -1) {
       enabledPackages = enabledPackages.splice(allIdx,
-        config.gJSONData.commentPackages.keys());
+        Object.keys(config.gJSONData.commentPackages));
     }
 
     // TODO To be decided, whether we cannot just eliminate packages in
diff --git a/lib/logger.js b/lib/logger.js
index 4411a72..19fabb5 100644
--- a/lib/logger.js
+++ b/lib/logger.js
@@ -1,5 +1,4 @@
-/
-Released under the MIT/X11 license
+// Released under the MIT/X11 license
 // http://www.opensource.org/licenses/mit-license.php
 "use strict";
 var urlMod = require("url");
diff --git a/lib/main.js b/lib/main.js
index 3e128ac..62c064a 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 // Released under the MIT/X11 license
 // http://www.opensource.org/licenses/mit-license.php
 //
@@ -114,12 +113,15 @@ var messageHandler = exports.messageHandler = function messageHandler(worker, ms
 };
 
 var contentScriptLibraries = [
-  self.data.url('js/urltest.js'),
-  self.data.url('js/bug-page-mod.js'),
+  self.data.url('lib/urltest.js'),
   self.data.url("lib/jumpNextBug.js"),
   self.data.url("lib/util.js"),
+  self.data.url("lib/preprocessDuplicates.js"),
+  self.data.url("lib/viewSource.js"),
   self.data.url("lib/color.js"),
+  self.data.url("lib/addNewLinks.js"),
   self.data.url("lib/logging-front.js"),
+  self.data.url('lib/bug-page-mod.js'),
   self.data.url("lib/rhbzpage.js"),
   self.data.url("lib/bzpage.js")
 ];
@@ -161,14 +163,14 @@ pageMod.PageMod({
 // Allow toggling of CC event displays using a context menu entry
 contextMenu.Item({
   label: "Toggle CC History",
-  contentScriptFile: [self.data.url('js/urltest.js'),
-                      self.data.url('js/cc-context.js')]
+  contentScriptFile: [self.data.url('lib/urltest.js'),
+                      self.data.url('lib/cc-context.js')]
 });
 
 contextMenu.Item({
   label: "Copy Check-in Comment",
-  contentScriptFile: [self.data.url('js/urltest.js'),
-                      self.data.url('js/checkin-context.js')],
+  contentScriptFile: [self.data.url('lib/urltest.js'),
+                      self.data.url('lib/checkin-context.js')],
   onMessage: function (comment) {
       require("clipboard").set(comment);
   }