Merged in r187.

2 files changed, 12 insertions, 10 deletions

diff --git a/lib/clipboard.js b/lib/clipboard.js
index e5b4ac8..b87c477 100644
--- a/lib/clipboard.js
+++ b/lib/clipboard.js
@@ -14,9 +14,8 @@
 // https://wiki.mozilla.org/Labs/Jetpack/JEP/10
 
 function getClipboard() {
-   const kClipboardContractID = "@mozilla.org/widget/clipboard;1";
-   const kClipboardIID = Ci.nsIClipboard;
-   var clip = Cc[kClipboardContractID].getService(kClipboardIID);
+   var clip = Cc["@mozilla.org/widget/clipboard;1"].
+       getService(Ci.nsIClipboard);
    if (!clip) {
         throw new Error("No access to the clipboard!");
     }
@@ -24,9 +23,8 @@ function getClipboard() {
 }
 
 function createTransferable() {
-   const kTransferableContractID = "@mozilla.org/widget/transferable;1";
-   const kTransferableIID = Ci.nsITransferable
-   var trans = Cc[kTransferableContractID].createInstance(kTransferableIID);
+   var trans = Cc["@mozilla.org/widget/transferable;1"].
+    createInstance(Ci.nsITransferable);
    if (!trans) {
     throw new Error("No access to the transfer object during the set of clipboard!");
    }
@@ -102,6 +100,7 @@ var setMethod = exports.set = function setMethod(content, flavor) {
     trans.setTransferData(mimeType, stuff, content.length * 2);
     
     clip.setData(trans, null, clip.kGlobalClipboard);
+    return true;
 };
 
 function createSupportsWString() {
@@ -118,11 +117,13 @@ var flavorsMethod = exports.getCurrentFlavors = function flavorsMethod() {
         "text/plain": "plain",
         "text/html": "html"
     };
-    var flavourArray = createSupportsArray();
+    var flavourArray = [];
 
     for (mime in possibleTypes) {
         var kSuppString = createSupportsWString();
         kSuppString.data = mime;
-        flavourArray.AppendElement(kSuppString);
+        // FIXME Missing some kind of if (mime in flavors) ...
+        flavourArray.add(possibleTypes[mime]);
     }
+    return flavourArray;
 };
diff --git a/lib/rhbzpage.js b/lib/rhbzpage.js
index c885699..c9d9b9f 100644
--- a/lib/rhbzpage.js
+++ b/lib/rhbzpage.js
@@ -6,6 +6,7 @@
 var util = require("util");
 var xrpc = require("xmlrpc");
 var xhr = require("xhr");
+var clip = require("clipboard");
 // var TriagedDistro = 13;
 // var NumberOfFrames = 7;
 // var XMLRPCurl = "https://bugzilla.redhat.com/xmlrpc.cgi";
@@ -589,7 +590,7 @@ RHBugzillaPage.prototype.queryForSelection = function() {
     let text = jetpack.selection.text;
     console.log("selection = " + text);
     if (!text) {
-        text = jetpack.clipboard.get();
+        text = clip.get();
         console.log("clipboard = " + text);
     }
     console.log("text = " + text);
@@ -604,7 +605,7 @@ RHBugzillaPage.prototype.queryForSelection = function() {
 RHBugzillaPage.prototype.queryUpstream = function() {
     let text = jetpack.selection.text;
     if (!text) {
-        text = jetpack.clipboard.get();
+        text = clip.get();
     }    
     if (text) {
         let text = encodeURIComponent(text.trim());