Merge branch 'Ehsan' into bugzillatweaks

Conflicts:
	lib/main.js
	package.json

1 files changed, 20 insertions, 1 deletions

diff --git a/lib/main.js b/lib/main.js
index 2e79e3a..3e128ac 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 // Released under the MIT/X11 license
 // http://www.opensource.org/licenses/mit-license.php
 //
@@ -17,6 +18,7 @@ var libbz = require("libbugzilla");
 var tabs = require("tabs");
 var logger = require("logger");
 var Message = require("util").Message;
+var contextMenu = require("context-menu");
 
 function isOurPage(window, matchingURLs) {
   var url = window.location.href;
@@ -112,6 +114,8 @@ 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/jumpNextBug.js"),
   self.data.url("lib/util.js"),
   self.data.url("lib/color.js"),
@@ -153,4 +157,19 @@ pageMod.PageMod({
   contentScriptFile: self.data.url("lib/skip-bug.js")
 });
 
-// tabs.open("https://bugzilla.redhat.com/show_bug.cgi?id=679515");
+
+// 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')]
+});
+
+contextMenu.Item({
+  label: "Copy Check-in Comment",
+  contentScriptFile: [self.data.url('js/urltest.js'),
+                      self.data.url('js/checkin-context.js')],
+  onMessage: function (comment) {
+      require("clipboard").set(comment);
+  }
+});