Merge branch 'Ehsan' into bugzillatweaks

Conflicts:
	lib/main.js
	package.json

2 files changed, 75 insertions, 1 deletions

diff --git a/lib/cookiemanager.js b/lib/cookiemanager.js
new file mode 100644
index 0000000..087d6ab
--- /dev/null
+++ b/lib/cookiemanager.js
@@ -0,0 +1,55 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Bugzilla Tweaks.
+ *
+ * The Initial Developer of the Original Code is Ehsan Akhgari.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ehsan Akhgari <ehsan@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+exports.getHostCookies = function getHostCookies(host) {
+  var {Cc, Ci} = require("chrome");
+  var cm = Cc["@mozilla.org/cookiemanager;1"].
+           getService(Ci.nsICookieManager2);
+  var e = cm.getCookiesFromHost(host);
+  var result = [];
+  while (e.hasMoreElements()) {
+    var cookie = e.getNext();
+    cookie.QueryInterface(Ci.nsICookie2);
+    if (cookie.rawHost == host) {
+      result.push({
+        name: cookie.name,
+        value: cookie.value,
+      });
+    }
+  }
+  return result;
+}
+
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);
+  }
+});