Merge branch 'bugzillatweaks' into next.

This is a horribly botched branch merged.

Conflicts:
	chip-data/chipNames.json
	data/lib/bugzillaDOMFunctions.js
	data/lib/bzpage.js
	data/lib/jumpNextBug.js
	data/lib/otherButtons.js
	data/lib/queries.js
	data/lib/util.js
	data/rhlib/addAttachmentRow.js
	data/rhlib/fixingAttMIME.js
	data/rhlib/rhbzpage.js
	data/tweaks/bug-page-mod.js
	data/tweaks/viewSource.js
	lib/libbugzilla.js
	lib/main.js
	package.json

1 files changed, 5 insertions, 26 deletions

diff --git a/data/lib/otherButtons.js b/data/lib/otherButtons.js
index 31a4dd8..6935b8e 100644
--- a/data/lib/otherButtons.js
+++ b/data/lib/otherButtons.js
@@ -3,30 +3,6 @@
 "use strict";
 
 /**
- * Set background color of all comments made by reporter in ReporterColor color
- *
- */
-function checkComments() {
-  var reporter = getReporter();
-  commentsWalker(function(x) {
-    var email = parseMailto(x.getElementsByClassName("vcard")[0]
-        .getElementsByTagName("a")[0]);
-    if (email.indexOf(reporter) != -1) {
-      x.style.backgroundColor = ReporterColor.toString();
-    }
-  });
-}
-
-function collectComments() {
-  var outStr = "";
-  commentsWalker(function(x) {
-    outStr += x.getElementsByTagName("pre")[0].textContent
-        + "\n";
-  });
-  return outStr.trim();
-}
-
-/**
  * Find default assignee based on the current component
  *
  * @return String what would be a default assignee if we haven't set it up.
@@ -119,7 +95,7 @@ function addingEmbelishments(logList) {
       && (!FillMagicDoneRE.test(getSummary()))
       && (maintCCAddr == "xgl-maint@redhat.com")) {
     // Add find chip magic button
-    fillInChipMagic(logList[0][1]);
+    fillInChipMagic(logList[0].id);
   }
 
   // Add links for creating new bug in the same product
@@ -138,10 +114,13 @@ function addingEmbelishments(logList) {
  *          String with the IsueTracker numbers
  * @return none
  */
-function setBranding(xLogAtts) {
+function setBranding(things) {
   var brandColor = {};
   var TriagedColor = {};
 
+  var atts = things.attachments;
+  var xLogAtts = atts.getXorgList();
+
   var ITbutton = document.getElementById("cf_issuetracker");
   var its = ITbutton ? ITbutton.value.trim() : "";