aboutsummaryrefslogtreecommitdiffstats
path: root/lib/main.js
diff options
context:
space:
mode:
authorMatěj Cepl <mcepl@redhat.com>2011-03-25 01:17:49 +0100
committerMatěj Cepl <mcepl@redhat.com>2011-03-25 14:21:22 +0100
commitbcf1996cbdd2118a88226b24a4c78a08fe21749b (patch)
treeb2274c77ae97dc116675145885b335e2a8377d5f /lib/main.js
parent23fb75565611af1e85455844be1d8931efe0a0a4 (diff)
downloadbugzilla-triage-bcf1996cbdd2118a88226b24a4c78a08fe21749b.tar.gz
Working on cutting down lines from bug-page-mod.js
Diffstat (limited to 'lib/main.js')
-rw-r--r--lib/main.js16
1 files changed, 9 insertions, 7 deletions
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);
}