From 61432c0d96b40993c27ec4fa3350532f6ae2cf34 Mon Sep 17 00:00:00 2001 From: Heather Arthur Date: Tue, 15 Feb 2011 11:29:46 -0800 Subject: Move main.js to bug-page-mod.js --- data/js/bug-page-mod.js | 1148 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1148 insertions(+) create mode 100644 data/js/bug-page-mod.js (limited to 'data/js/bug-page-mod.js') diff --git a/data/js/bug-page-mod.js b/data/js/bug-page-mod.js new file mode 100644 index 0000000..540ae2f --- /dev/null +++ b/data/js/bug-page-mod.js @@ -0,0 +1,1148 @@ +/* ***** 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 Mozilla Foundation. + * Portions created by the Initial Developer are Copyright (C) 2010 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Johnathan Nightingale + * Ehsan Akhgari + * + * 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.main = function(options, callback) { + require("tab-browser").whenContentLoaded( + function(window) { + if (onBugzillaPage(window)) { + tweakBugzilla(window.document); + } + } + ); + + // Allow toggling of CC event displays using a context menu entry + var contextMenu = require("context-menu"); + var ccMenuItem = contextMenu.Item({ + label: "Toggle CC History", + context: function(context) onBugzillaPage(context.window), + onClick: function(context) { + var style = context.document.getElementById("bztw_cc"); + style.disabled = !style.disabled; + } + }); + contextMenu.add(ccMenuItem); + + var copyCheckinCommentItem = contextMenu.Item({ + label: "Copy Check-in Comment", + context: function(context) { + if (!onBugzillaPage(context.window)) + return false; + var d = context.document; + var message = d.getElementById("__bz_tw_checkin_comment"); + return !!message; + }, + onClick: function(context) { + var d = context.document; + var message = d.getElementById("__bz_tw_checkin_comment"); + require("clipboard").set(message.textContent); + } + }); + contextMenu.add(copyCheckinCommentItem); +}; + +function onBugzillaPage(window) { + if ("window" in window) { + window = window.window; + } + return window.location.protocol == "https:" && + /bugzilla(-[a-zA-Z]+)*\.mozilla\.org/.test(window.location.href); +} + +function tweakBugzilla(d) { + // run on both bugzilla.m.o and bugzilla-stage-tip.m.o + if (!/bugzilla(-[a-zA-Z]+)*\.mozilla\.org/.test(d.location.href)) + return; + + // Put the quicksearch text in the quicksearch boxes + quicksearchHandler(d); + + if (!d.getElementById("comments")) // don't process the mid-air collision pages + return; + + // Strip "Bug " from titles for better tab readability + if (/^Bug /.test(d.title)) + d.title = d.title.slice(4); + + // Make the comment box bigger + var commentBox = d.querySelector("#comment"); + if (commentBox) + commentBox.rows=20; + + addAssignToSelfButton(d); + + attachmentDiffLinkify(d); + + // Mark up history along right hand edge + var historyLink = d.querySelector("link[title='Bug Activity']"); + if (!historyLink) + return; + + // Add our own style for bugzilla-tweaks + var style = d.createElement("style"); + style.setAttribute("type", "text/css"); + style.appendChild(d.createTextNode( + ".bztw_history { border: none; font-weight: normal; width: 58em; margin-left: 5em; }" + + ".bztw_inlinehistory { font-weight: normal; width: 56em; }" + + ".bztw_history .old, .bztw_inlinehistory .old { text-decoration: line-through; }" + + ".bztw_history .sep:before { content: \" \"; }" + + ".bztw_unconfirmed { font-style: italic; }" + + "tr.bz_tr_obsolete.bztw_plusflag { display: table-row !important; }" + + '.bztw_historyitem + .bztw_historyitem:before { content: "; "; }' + )); + d.getElementsByTagName("head")[0].appendChild(style); + style = d.createElement("style"); + style.setAttribute("type", "text/css"); + style.id = "bztw_cc"; + style.appendChild(d.createTextNode( + ".bztw_cc { display: none; }" + + '.bztw_historyitem.bztw_cc + .bztw_historyitem:before { content: ""; }' + + '.bztw_historyitem:not([class~="bztw_cc"]) ~ .bztw_historyitem.bztw_cc + .bztw_historyitem:before { content: "; "; }' + )); + d.getElementsByTagName("head")[0].appendChild(style); + + var userNameCache = {}; + function getUserName(email) { + if (email in userNameCache) { + return userNameCache[email]; + } + var emailLink = d.querySelectorAll("a.email"); + for (var i = 0; i < emailLink.length; ++i) { + if (emailLink[i].href == "mailto:" + email) { + return userNameCache[email] = htmlEncode(trimContent(emailLink[i])); + } + } + return email; + } + + // collect the flag names + var flagNames = [], flags = {}, flagOccurrences = {}; + var flagRows = d.querySelectorAll("#flags tr"); + for (var i = 0; i < flagRows.length; ++i) { + var item = flagRows[i].querySelectorAll("td"); + if (!item[1]) + continue; + var name = trimContent(item[1]).replace('\u2011', '-', 'g'); + flagNames.push(name); + flags[name] = item[1]; + } + flagRows = d.querySelectorAll(".field_label[id^=field_label_cf_]"); + for (var i = 0; i < flagRows.length; ++i) { + var name = trimContent(flagRows[i]).replace(/\:$/, '') + .replace('\u2011', '-', 'g'); + flagNames.push(name); + flags[name] = flagRows[i]; + } + var flagCounter = 1; + function findFlag(item) { + function lookup(name) { + name = name.replace('\u2011', '-', 'g'); + for (var i = 0; i < flagNames.length; ++i) { + var quotedFlagName = flagNames[i].replace('.', '\\.', 'g') + .replace('\u2011', '-', 'g'); + if ((new RegExp('^' + quotedFlagName)).test(name)) { + return [flagNames[i]]; + } + } + return []; + } + var base = item[4] ? 2 : 0; + // handle normal flags + if (trimContent(item[base]) == 'Flag') { + var result = []; + var tmp = lookup(trimContent(item[base + 1])); + if (tmp.length) { + result.push(tmp[0]); + } + tmp = lookup(trimContent(item[base + 2])); + if (tmp.length) { + result.push(tmp[0]); + } + return result; + } + // handle special pseudo-flags + return lookup(trimContent(item[base])); + } + + var DataStore = new DataStoreCtor(d); + + var AttachmentFlagHandler = new AttachmentFlagHandlerCtor(); + AttachmentFlagHandler.determineInterestingFlags(d); + + var CheckinComment = new CheckinCommentCtor(); + CheckinComment.initialize(d, AttachmentFlagHandler._interestingFlags); + + var iframe = d.createElement('iframe'); + iframe.src = historyLink.href; + iframe.style.display = "none"; + iframe.addEventListener("load", function() { + preprocessDuplicateMarkers(d, iframe.contentDocument); + + var historyItems = iframe.contentDocument.querySelectorAll('#bugzilla-body tr'); + var commentTimes = d.querySelectorAll('.bz_comment_time'); + + // Sometimes the history will stack several changes together, + // and we'll want to append the data from the Nth item to the + // div created in N-1 + var i=0, j=0, flagsFound; + for (; i < historyItems.length; i++) { + var item = historyItems[i].querySelectorAll("td"); + if (!item[1]) + continue; + + var reachedEnd = false; + for (; j < commentTimes.length; j++) { + if (trimContent(item[1]) > trimContent(commentTimes[j])) { + if (j < commentTimes.length - 1) { + continue; + } else { + reachedEnd = true; + } + } + + var commentHead = commentTimes[j].parentNode; + + var mainUser = commentHead.querySelector(".bz_comment_user a.email") + .href + .substr(7); + var user = trimContent(item[0]); + var mainTime = trimContent(commentTimes[j]); + var time = trimContent(item[1]); + var inline = (mainUser == user && time == mainTime); + + var currentDiv = d.createElement("div"); + var userPrefix = ''; + if (inline) { + // assume that the change was made by the same user + commentHead.appendChild(currentDiv); + currentDiv.setAttribute("class", "bztw_inlinehistory"); + } else { + // the change was made by another user + if (!reachedEnd) { + var parentDiv = commentHead.parentNode; + if (parentDiv.previousElementSibling && + parentDiv.previousElementSibling.className.indexOf("bztw_history") >= 0) { + currentDiv = parentDiv.previousElementSibling; + } else { + parentDiv.parentNode.insertBefore(currentDiv, parentDiv); + } + } else { + var parentDiv = commentHead.parentNode; + if (parentDiv.nextElementSibling && + parentDiv.nextElementSibling.className.indexOf("bztw_history") >= 0) { + currentDiv = parentDiv.nextElementSibling; + } else { + parentDiv.parentNode.appendChild(currentDiv); + } + } + currentDiv.setAttribute("class", "bz_comment bztw_history"); + userPrefix += "" + + getUserName(trimContent(item[0])) + ": "; + } + // check to see if this is a flag setting + flagsFound = findFlag(item); + for (var idx = 0; idx < flagsFound.length; ++idx) { + var flag = flagsFound[idx]; + flagOccurrences[flag] = 'flag' + flagCounter; + if (inline) { + var anchor = d.createElement("a"); + anchor.setAttribute("name", "flag" + flagCounter); + commentHead.insertBefore(anchor, commentHead.firstChild); + } else { + userPrefix += ''; + } + ++flagCounter; + } + + var attachmentFlagAnchors = AttachmentFlagHandler.handleItem(user, item); + if (inline) { + for (var idx = 0; idx < attachmentFlagAnchors.length; ++idx) { + var anchor = d.createElement("a"); + anchor.setAttribute("name", attachmentFlagAnchors[idx]); + commentHead.insertBefore(anchor, commentHead.firstChild); + } + } else { + userPrefix += attachmentFlagAnchors.map(function(name) '').join(""); + } + + var ccOnly = (trimContent(item[2]) == 'CC'); + var ccPrefix = ccOnly ? '' : + '', + ccSuffix = ''; + var html = userPrefix + + ccPrefix + + transformType(trimContent(item[2]), d, trimContent(item[3]), + trimContent(item[4])) + ": " + + formatTransition(trimContent(item[3]), trimContent(item[4]), + trimContent(item[2]), d, iframe.contentDocument); + + var nextItemsCount = item[0].rowSpan; + for (var k = 1; k < nextItemsCount; ++k) { + ccOnly = false; + item = historyItems[++i].querySelectorAll("td") + ccPrefix = (trimContent(item[0]) == 'CC') ? + '' : ''; + // avoid showing a trailing semicolon if the previous entry wasn't a CC and this one is + var prefix = ccSuffix + ccPrefix; + // check to see if this is a flag setting + flagsFound = findFlag(item); + for (var idx = 0; idx < flagsFound.length; ++idx) { + var flag = flagsFound[idx]; + flagOccurrences[flag] = 'flag' + flagCounter; + if (inline) { + var anchor = d.createElement("a"); + anchor.setAttribute("name", "flag" + flagCounter); + commentHead.insertBefore(anchor, commentHead.firstChild); + } else { + prefix += ''; + } + ++flagCounter; + } + + var attachmentFlagAnchors = AttachmentFlagHandler.handleItem(user, item); + if (inline) { + for (var idx = 0; idx < attachmentFlagAnchors.length; ++idx) { + var anchor = d.createElement("a"); + anchor.setAttribute("name", attachmentFlagAnchors[idx]); + commentHead.insertBefore(anchor, commentHead.firstChild); + } + } else { + prefix += attachmentFlagAnchors.map(function(name) '').join(""); + } + + html += prefix + + transformType(trimContent(item[0]), d, trimContent(item[1]), + trimContent(item[2])) + ": " + + formatTransition(trimContent(item[1]), trimContent(item[2]), + trimContent(item[0]), d, iframe.contentDocument); + } + html += ccSuffix; + if (ccOnly) { + html = '
' + html + '
'; + } else { + html = '
' + html + '
'; + } + currentDiv.innerHTML += html; + break; + } + } + + handleEmptyCollapsedBoxes(d); + + // Set the latest flag links if necessary + for (var flagName in flagOccurrences) { + flags[flagName].innerHTML = '' + + flags[flagName].innerHTML + ''; + } + + AttachmentFlagHandler.setupLinks(d); + },true); + d.body.appendChild(iframe); + + tbplbotSpamCollapser(d); +} + +var TransformValues = { + linkifyURLs: function (str) { + return str.replace(/((https?|ftp)\:\/\/[\S]+)/g, '$1'); + }, + linkifyBugAndCommentNumbers: function (str) { + return str.replace(/(bug )(\d+) (comment )(\d+)/gi, '$1\n$2 $3\n$4'); + }, + linkifyCommentNumbers: function (str) { + return str.replace(/(comment (\d+))/gi, '$1'); + }, + linkifyBugNumbers: function (str) { + return str.replace(/(bug (\d+))/gi, '$1'); + }, + linkifyDependencies: function (str, type, doc, histDoc) { + switch (type) { + case "Blocks": + case "Depends on": + case "Duplicate": + str = str.replace(/\d+/g, function(str) { + var link = histDoc.querySelector("a[href='show_bug.cgi?id=" + str + "']"); + if (link) { + var class_ = ''; + if (/bz_closed/i.test(link.className)) { + class_ += 'bz_closed '; + } else if (/bztw_unconfirmed/i.test(link.className)) { + class_ += 'bztw_unconfirmed '; + } + var parent = link.parentNode; + if (parent) { + if (parent.tagName.toLowerCase() == "i") { + class_ += 'bztw_unconfirmed '; + } + if (/bz_closed/i.test(parent.className)) { + class_ += 'bz_closed '; + } + } + str = applyClass(class_, + '' + htmlEncode(str) + ''); + } + return str; + }); + } + return str; + } +}; + +function transform(str, type, doc, histDoc) { + for (var funcname in TransformValues) { + var func = TransformValues[funcname]; + str = func.call(null, str, type, doc, histDoc); + } + return str +} + +var TransformTypes = { + linkifyAttachments: function (str, doc) { + return str.replace(/(Attachment #(\d+))/g, function (str, x, id) { + var link = doc.querySelector("a[href='attachment.cgi?id=" + id + "']"); + if (link) { + var class_ = ''; + if (/bz_obsolete/i.test(link.className)) { + class_ += 'bz_obsolete '; + } + var parent = link.parentNode; + if (parent && /bz_obsolete/i.test(parent.className)) { + class_ += 'bz_obsolete '; + } + if (link.querySelector(".bz_obsolete")) { + class_ += 'bz_obsolete '; + } + str = applyClass(class_, + '' + htmlEncode(str) + ''); + } + return str; + }); + }, + changeDependencyLinkTitles: function (str, doc, old, new_) { + switch (str) { + case "Blocks": + case "Depends on": + if (old.length && !new_.length) { // if the dependency was removed + str = "No longer " + str[0].toLowerCase() + str.substr(1); + } + break; + } + return str; + } +}; + +function transformType(str, doc, old, new_) { + for (var funcname in TransformTypes) { + var func = TransformTypes[funcname]; + str = func.call(null, str, doc, old, new_); + } + return str; +} + +// new is a keyword, which makes this function uglier than I'd like +function formatTransition(old, new_, type, doc, histDoc) { + if (old.length) { + old = transform(htmlEncode(old), type, doc, histDoc); + var setOldStyle = true; + switch (type) { + case "Blocks": + case "Depends on": + setOldStyle = false; + break; + } + if (setOldStyle) { + old = '' + old + ''; + } + } + if (new_.length) { + new_ = '' + transform(htmlEncode(new_), type, doc, histDoc) + ''; + } + var mid = ''; + if (old.length && new_.length) { + mid = ' ⇒ '; + } + return old + mid + new_; +} + +function trimContent(el) { + return el.textContent.trim(); +} + +function AttachmentFlag(flag) { + for (var name in flag) + this[name] = flag[name]; +} +AttachmentFlag.prototype = { + equals: function(flag) { + if (this.type != flag.type || + this.name != flag.name || + this.setter != flag.setter || + ("requestee" in this && !("requestee" in flag)) || + ("requestee" in flag && !("requestee" in this))) + return false; + return this.requestee == flag.requestee; + } +}; + +var reAttachmentDiff = /attachment\.cgi\?id=(\d+)&action=diff$/i; +var reviewBoardUrlBase = "http://reviews.visophyte.org/"; +/** + * Whenever we find a patch with a diff, insert an additional link to asuth's + * review board magic. + */ +function attachmentDiffLinkify(doc) { + var bug_id = getBugNumber(doc); + + var table = doc.getElementById("attachment_table"); + if (!table) + return; + var rows = table.querySelectorAll("tr"); + for (var i = 0; i < rows.length; ++i) { + var item = rows[i].querySelectorAll("td"); + if (item.length != 3) + continue; + // get the ID of the attachment + var links = item[2].querySelectorAll("a"); + if (links.length != 2) + continue; + var match = reAttachmentDiff.exec(links[1].href); + if (match) { + var attach_id = match[1]; + var parentNode = links[1].parentNode; + parentNode.appendChild(doc.createTextNode(" | ")); + var linkNode = doc.createElement("a"); + linkNode.href = reviewBoardUrlBase + "r/bzpatch/bug" + bug_id + "/attach" + attach_id + "/"; + linkNode.textContent = "Review"; + parentNode.appendChild(linkNode); + } + } +} + +function quicksearchHandler(doc) { + var win = doc.defaultView; + var match = /quicksearch=([^&]+)/i.exec(win.location.search); + if (match) { + var quicksearch = unescape(match[1].replace('+', ' ')); + var quicksearchBox = doc.querySelectorAll("input[name=quicksearch]"); + if (quicksearchBox) { + for (var i = 0; i < quicksearchBox.length; ++i) { + quicksearchBox[i].value = quicksearch; + } + } + } +} + +function AttachmentFlagHandlerCtor() { + this._db = {}; + this._interestingFlags = {}; +} +AttachmentFlagHandlerCtor.prototype = { + determineInterestingFlags: function (doc) { + var table = doc.getElementById("attachment_table"); + if (!table) + return; + var rows = table.querySelectorAll("tr"); + for (var i = 0; i < rows.length; ++i) { + var item = rows[i].querySelectorAll("td"); + if (item.length != 3 || + item[1].className.indexOf("bz_attach_flags") < 0 || + trimContent(item[1]) == "no flags") + continue; + // get the ID of the attachment + var link = item[0].querySelector("a"); + if (!link) + continue; + var match = this._reAttachmentHref.exec(link.href); + if (match) { + var attachmentID = match[1]; + if (!(attachmentID in this._interestingFlags)) { + this._interestingFlags[attachmentID] = []; + } + for (var el = item[1].firstChild; el.nextSibling; el = el.nextSibling) { + if (el.nodeType != el.TEXT_NODE) + continue; + var text = trimContent(el).replace('\u2011', '-', 'g'); + if (!text) + continue; + match = this._reParseInterestingFlag.exec(text); + if (match) { + var flag = {}; + flag.setter = match[1]; + flag.name = match[2]; + if (match[4] == "+" || match[4] == "-") { + flag.type = match[4]; + } else { + flag.type = "?"; + if (match[7]) { + flag.requestee = match[7]; + } + } + + // always show the obsolete attachments with a + flag + if (flag.type == "+") { + var parent = link.parentNode; + while (parent) { + if (parent.tagName.toLowerCase() == "tr") { + if (/bz_tr_obsolete/i.test(parent.className)) { + parent.className += " bztw_plusflag"; + } + break; + } + parent = parent.parentNode; + } + } + + // try to put the flag name and type part in a span which we will + // use in setupLinks to inject links into. + match = this._reLinkifyInterestingFlag.exec(text); + if (match) { + el.textContent = match[1]; + if (match[3]) { + var textNode = doc.createTextNode(match[3]); + el.parentNode.insertBefore(textNode, el.nextSibling); + } + var span = doc.createElement("span"); + span.textContent = match[2]; + el.parentNode.insertBefore(span, el.nextSibling); + + flag.placeholder = span; + } + + this._interestingFlags[attachmentID].push(new AttachmentFlag(flag)); + } + } + } + } + }, + handleItem: function (name, item) { + var anchorsCreated = []; + var base = item[4] ? 2 : 0; + var what = trimContent(item[base]); + var match = this._reAttachmentFlagName.exec(what); + if (match) { + var id = match[1]; + if (!(id in this._db)) { + this._db[id] = []; + } + name = name.split('@')[0]; // convert the name to the fraction before the @ + var added = this._parseData(name, trimContent(item[base + 2])); + for (var i = 0; i < added.length; ++i) { + var flag = added[i]; + if (!(id in this._interestingFlags)) + continue; + for (var j = 0; j < this._interestingFlags[id].length; ++j) { + if (flag.equals(this._interestingFlags[id][j])) { + // found an interesting flag + this._interestingFlags[id][j].anchor = this.anchorName; + anchorsCreated.push(this.anchorName); + this._counter++; + break; + } + } + } + } + return anchorsCreated; + }, + setupLinks: function (doc) { + for (var id in this._interestingFlags) { + for (var i = 0; i < this._interestingFlags[id].length; ++i) { + var flag = this._interestingFlags[id][i]; + if ("placeholder" in flag && + "anchor" in flag) { + var link = doc.createElement("a"); + link.href = "#" + flag.anchor; + link.textContent = flag.placeholder.textContent; + flag.placeholder.replaceChild(link, flag.placeholder.firstChild); + } + } + } + }, + _parseData: function (name, str) { + var items = str.replace('\u2011', '-', 'g').split(', '), flags = []; + for (var i = 0; i < items.length; ++i) { + if (!items[i].length) + continue; + + var match = this._reParseRequest.exec(items[i]); + if (match) { + var flag = {}; + flag.name = match[1]; + flag.setter = name; + if (match[4]) { + flag.requestee = match[4]; + } + flag.type = match[2]; + flags.push(new AttachmentFlag(flag)); + } + } + return flags; + }, + _counter: 1, + get anchorName() { + return "attachflag" + this._counter; + }, + _reParseRequest: /^(.+)([\?\-\+])(\((.+)@.+\))?$/, + _reParseInterestingFlag: /^(.+):\s+(.+)(([\-\+])|\?(\s+(\((.+)\)))?)$/, + _reLinkifyInterestingFlag: /^(.+:\s+)(.+[\-\+\?])(\s+\(.+\))?$/, + _reAttachmentHref: /attachment\.cgi\?id=(\d+)$/i, + _reAttachmentFlagName: /^Attachment\s+#(\d+)\s+Flags$/i +}; + +function CheckinCommentCtor() { + this.bugNumber = null; + this.summarySpan = null; + this.checkinFlags = ""; +} +CheckinCommentCtor.prototype = { + initialize: function(doc, flags) { + this.bugNumber = getBugNumber(doc); + var summarySpan = doc.getElementById("short_desc_nonedit_display"); + if (summarySpan) { + this.summary = summarySpan.textContent; + } + var checkinFlagsMap = {}; + for (var id in flags) { + for (var i = 0; i < flags[id].length; ++i) { + var flag = flags[id][i]; + if (flag.type == "+") { + var name = flag.name; + if (name == "review") { + name = "r"; + } else if (name == "superreview") { + name = "sr"; + } else if (name == "ui-review") { + name = "ui-r"; + } else if (name == "feedback") { + name = "f"; + } + if (!(name in checkinFlagsMap)) { + checkinFlagsMap[name] = {}; + } + checkinFlagsMap[name][flag.setter]++; + } + } + } + var flagsOrdered = []; + for (var name in checkinFlagsMap) { + flagsOrdered.push(name); + } + flagsOrdered.sort(function (a, b) { + function convertToNumber(x) { + switch (x) { + case "f": + return -4; + case "r": + return -3; + case "sr": + return -2; + case "ui-r": + return -1; + default: + return 0; + } + } + var an = convertToNumber(a); + var bn = convertToNumber(b); + if (an == 0 && bn == 0) { + return a < b ? -1 : (a = b ? 0 : 1); + } else { + return an - bn; + } + }); + var checkinFlags = []; + for (var i = 0; i < flagsOrdered.length; ++i) { + var name = flagsOrdered[i]; + var flag = name + "="; + var setters = []; + for (var setter in checkinFlagsMap[name]) { + setters.push(setter); + } + flag += setters.join(","); + checkinFlags.push(flag); + } + this.checkinFlags = checkinFlags.join(" "); + if (this.isValid()) { + var div = doc.createElement("div"); + div.setAttribute("style", "display: none;"); + div.id = "__bz_tw_checkin_comment"; + div.appendChild(doc.createTextNode(this.toString())); + doc.body.appendChild(div); + } + }, + isValid: function() { + return this.bugNumber != null && + this.summary != null; + }, + toString: function() { + if (!this.isValid()) { + return ""; + } + var message = "Bug " + this.bugNumber + " - " + this.summary; + if (this.checkinFlags.length) { + message += "; " + this.checkinFlags; + } + return message; + } +}; + +function DataStoreCtor(doc) { + this.storage = doc.defaultView.localStorage; + this.data = {}; + this.bugNumber = null; + function visualizeStoredData() { + var data = ""; + for (var i = 0; i < window.localStorage.length; ++i) { + var key = window.localStorage.key(i); + data += key + ": " + JSON.parse(window.localStorage.getItem(key).toString()).toSource() + "\n"; + } + open("data:text/html,
" + escape(htmlEncode(data)) + "
"); + } + function clearStoredData() { + var count = window.localStorage.length; + if (count > 0) { + if (window.confirm("You currently have data stored for " + count + " bugs.\n\n" + + "Are you sure you want to clear this data? This action cannot be undone.")) { + window.localStorage.clear(); + } + } else { + alert("You don't have any data stored about your bugs"); + } + } + var script = doc.createElement("script"); + script.appendChild(doc.createTextNode(visualizeStoredData.toSource() + + clearStoredData.toSource() + + htmlEncode.toSource())); + doc.body.appendChild(script); + this.initialize(doc); +} + +DataStoreCtor.prototype = { + initialize: function(doc) { + this.bugNumber = getBugNumber(doc); + var data = this._ensureEntry(this.bugNumber, this.data); + // last visited date + data.visitedTime = (new Date()).getTime(); + // last comment count + data.commentCount = doc.querySelectorAll(".bz_comment").length; + // last status of bug flags + var flags = this._ensureEntry("flags", data); + var flagRows = doc.querySelectorAll("#flags tr"); + for (var i = 0; i < flagRows.length; ++i) { + var flagCols = flagRows[i].querySelectorAll("td"); + if (flagCols.length != 3) { + continue; + } + var flagName = trimContent(flagCols[1]); + var flagValue = flagCols[2].querySelector("select"); + if (flagValue) { + flagValue = flagValue.value; + } else { + continue; + } + flags[flagName] = flagValue; + } + flagRows = doc.querySelectorAll(".field_label[id^=field_label_cf_]"); + for (var i = 0; i < flagRows.length; ++i) { + var flagName = trimContent(flagRows[i]).replace(/:$/, ""); + var flagValue = flagRows[i].parentNode.querySelector("select"); + if (flagValue) { + flagValue = flagValue.value; + } else { + continue; + } + flags[flagName] = flagValue; + } + // last attachments + var attachmentTable = doc.getElementById("attachment_table"); + var attachmentRows = attachmentTable.querySelectorAll("tr"); + for (var i = 0; i < attachmentRows.length; ++i) { + var attachmentCells = attachmentRows[i].querySelectorAll("td"); + if (attachmentCells.length != 3) { + continue; + } + var link = attachmentCells[0].querySelector("a"); + var match = this._reAttachmentHref.exec(link.href); + if (match) { + var attachmentID = match[1]; + var attachment = this._ensureEntry("attachments", data); + var attachmentFlags = this._ensureArray(attachmentID, attachment); + for (var el = attachmentCells[1].firstChild; el.nextSibling; el = el.nextSibling) { + if (el.nodeType != el.TEXT_NODE) { + continue; + } + var text = trimContent(el); + if (!text) { + continue; + } + match = this._reParseInterestingFlag.exec(text); + if (match) { + var flag = {}; + flag.setter = match[1]; + flag.name = match[2]; + if (match[4] == "+" || match[4] == "-") { + flag.type = match[4]; + } else { + flag.type = "?"; + if (match[7]) { + flag.requestee = match[7]; + } + } + attachmentFlags.push(flag); + } + } + } + } + // Write data to storage + for (var key in this.data) { + this._ensure(key, this.storage, JSON.stringify(this.data[key])); + } + }, + _ensure: function(entry, obj, val) { + if (obj.toString().indexOf("[object Storage") >= 0) { + obj.setItem(entry, val); + } else { + if (typeof obj[entry] == "undefined") + obj[entry] = val; + return obj[entry]; + } + }, + _ensureEntry: function(entry, obj) { + return this._ensure(entry, obj, {}); + }, + _ensureArray: function(entry, obj) { + return this._ensure(entry, obj, []); + }, + _reParseInterestingFlag: /^(.+):\s+(.+)(([\-\+])|\?(\s+(\((.+)\)))?)$/, + _reAttachmentHref: /attachment\.cgi\?id=(\d+)$/i +}; + +function getBugNumber(doc) { + var idField = doc.querySelector("form[name=changeform] input[name=id]"); + if (idField) { + return idField.value; + } + return null; +} + +function getUserName(doc) { + var links = doc.querySelectorAll("#header .links li"); + var last = links[links.length - 1]; + if (last.innerHTML.indexOf("logout") >= 0) { + return trimContent(last.lastChild); + } + return null; +} + +function preprocessDuplicateMarkers(mainDoc, histDoc) { + var comments = mainDoc.querySelectorAll(".bz_comment"); + var reDuplicate = /^\s*\*\*\*\s+Bug\s+(\d+)\s+has\s+been\s+marked\s+as\s+a\s+duplicate\s+of\s+this\s+bug.\s+\*\*\*\s*$/i; + var row = 0; + var rows = histDoc.querySelectorAll("#bugzilla-body tr"); + for (var i = 1 /* comment 0 can never be a duplicate marker */; + i < comments.length; ++i) { + var textHolder = comments[i].querySelector(".bz_comment_text"); + var match = reDuplicate.exec(trimContent(textHolder)); + if (match) { + // construct the table row to be injected in histDoc + var bugID = match[1]; + var email = comments[i].querySelector(".bz_comment_user .email") + .href + .substr(7); + var link = textHolder.querySelector("a"); + var title = link.title; + var time = trimContent(comments[i].querySelector(".bz_comment_time")); + var what = 'Duplicate'; + var removed = ''; + var number = trimContent(comments[i].querySelector(".bz_comment_number")). + replace(/[^\d]+/g, ''); + var class_ = ''; + if (/bz_closed/i.test(link.className + " " + link.parentNode.className)) { + class_ += 'bz_closed '; + } + if (link.parentNode.tagName.toLowerCase() == 'i') { + class_ += 'bztw_unconfirmed '; + } + var added = '' + bugID + ''; + + // inject the table row + var reachedEnd = false; + for (; row < rows.length; ++row) { + var cells = rows[row].querySelectorAll("td"); + if (cells.length != 5) + continue; + if (time > trimContent(cells[1])) { + if (row < rows.length - 1) { + continue; + } else { + reachedEnd = true; + } + } + if (time == trimContent(cells[1])) { + cells[0].rowSpan++; + cells[1].rowSpan++; + var rowContents = [what, removed, added]; + var tr = histDoc.createElement("tr"); + rowContents.forEach(function (cellContents) { + var td = histDoc.createElement("td"); + td.innerHTML = cellContents; + tr.appendChild(td); + }); + if (row != rows.length - 1) { + rows[row].parentNode.insertBefore(tr, rows[row+1]); + } else { + rows[row].parentNode.appendChild(tr); + } + } else { + var rowContents = [email, time, what, removed, added]; + var tr = histDoc.createElement("tr"); + rowContents.forEach(function (cellContents) { + var td = histDoc.createElement("td"); + td.innerHTML = cellContents; + tr.appendChild(td); + }); + if (reachedEnd) { + rows[row].parentNode.appendChild(tr); + } else { + rows[row].parentNode.insertBefore(tr, rows[row]); + } + } + break; + } + + // remove the comment from the main doc + comments[i].parentNode.removeChild(comments[i]); + } + } +} + +function handleEmptyCollapsedBoxes(doc) { + // first, try to get the display style of a CC field (any would do) + var historyBoxes = doc.querySelectorAll(".bztw_history"); + for (var i = 0; i < historyBoxes.length; ++i) { + var box = historyBoxes[i]; + for (var j = 0; j < box.childNodes.length; ++j) { + var child = box.childNodes[j], found = true; + if (child.nodeType != child.ELEMENT_NODE) + continue; + if (child.className == "sep") { + // separators are insignificant + continue; + } else if (!/bztw_cc/.test(child.className)) { + found = false; + break; + } + } + if (found) { + box.className += " bztw_cc"; + } + } +} + +function applyClass(class_, html) { + return '' + html + ''; +} + +function htmlEncode(str) { + return str.replace('&', '&', 'g') + .replace('<', '<', 'g') + .replace('>', '>', 'g') + .replace('"', '"', 'g'); +} + +function addAssignToSelfButton(d) { + var userName = getUserName(d); + if (userName) { + // see if the bug is already assigned to the user + var assignee = d.getElementById("assigned_to"); + if (assignee && assignee.value != userName) { + var button = d.createElement("input"); + button.type = "button"; + button.value = "Assign To Me"; + button.addEventListener("click", function(e) { + e.preventDefault(); + assignee.value = userName; + var reset = d.getElementById("set_default_assignee"); + if (reset) { + reset.checked = false; + } + container.classList.add("bz_default_hidden"); + d.getElementById("bz_assignee_input").classList.remove("bz_default_hidden"); + assignee.focus(); + button.removeEventListener("click", arguments.callee, false); + }, false); + var container = d.getElementById("bz_assignee_edit_container"); + container.appendChild(button); + } + } +} + +function tbplbotSpamCollapser(d) { + var collapseExpandBox = d.querySelector(".bz_collapse_expand_comments"); + if (!collapseExpandBox) { + return; + } + var a = d.createElement("a"); + a.href = "#"; + a.addEventListener("click", function(e) { + e.preventDefault(); + var win = d.defaultView.wrappedJSObject; + var comments = d.querySelectorAll(".bz_comment"); + for (var i = 0; i < comments.length; ++i) { + var comment = comments[i]; + try { + if (comment.querySelector(".bz_comment_user a.email").href.substr(7) == + "tbplbot@gmail.com") { + win.collapse_comment(comment.querySelector(".bz_collapse_comment"), + comment.querySelector(".bz_comment_text")); + } + } catch (e) { + continue; + } + } + return false; + }, false); + a.appendChild(d.createTextNode("Collapse All tbplbot Comments")); + var li = d.createElement("li"); + li.appendChild(a); + collapseExpandBox.appendChild(li); +} -- cgit From 09842a06c5ff1fa1795877836c21ea928a8a7fcf Mon Sep 17 00:00:00 2001 From: Heather Arthur Date: Tue, 15 Feb 2011 11:59:54 -0800 Subject: Update to new Addon SDK page-mod and context-menu modules --- data/js/bug-page-mod.js | 52 ++++--------------------------------------------- 1 file changed, 4 insertions(+), 48 deletions(-) (limited to 'data/js/bug-page-mod.js') diff --git a/data/js/bug-page-mod.js b/data/js/bug-page-mod.js index 540ae2f..1e4341a 100644 --- a/data/js/bug-page-mod.js +++ b/data/js/bug-page-mod.js @@ -35,56 +35,9 @@ * * ***** END LICENSE BLOCK ***** */ -exports.main = function(options, callback) { - require("tab-browser").whenContentLoaded( - function(window) { - if (onBugzillaPage(window)) { - tweakBugzilla(window.document); - } - } - ); - - // Allow toggling of CC event displays using a context menu entry - var contextMenu = require("context-menu"); - var ccMenuItem = contextMenu.Item({ - label: "Toggle CC History", - context: function(context) onBugzillaPage(context.window), - onClick: function(context) { - var style = context.document.getElementById("bztw_cc"); - style.disabled = !style.disabled; - } - }); - contextMenu.add(ccMenuItem); - - var copyCheckinCommentItem = contextMenu.Item({ - label: "Copy Check-in Comment", - context: function(context) { - if (!onBugzillaPage(context.window)) - return false; - var d = context.document; - var message = d.getElementById("__bz_tw_checkin_comment"); - return !!message; - }, - onClick: function(context) { - var d = context.document; - var message = d.getElementById("__bz_tw_checkin_comment"); - require("clipboard").set(message.textContent); - } - }); - contextMenu.add(copyCheckinCommentItem); -}; - -function onBugzillaPage(window) { - if ("window" in window) { - window = window.window; - } - return window.location.protocol == "https:" && - /bugzilla(-[a-zA-Z]+)*\.mozilla\.org/.test(window.location.href); -} - function tweakBugzilla(d) { // run on both bugzilla.m.o and bugzilla-stage-tip.m.o - if (!/bugzilla(-[a-zA-Z]+)*\.mozilla\.org/.test(d.location.href)) + if (!onBugzillaPage(d.URL)) return; // Put the quicksearch text in the quicksearch boxes @@ -524,6 +477,7 @@ AttachmentFlag.prototype = { var reAttachmentDiff = /attachment\.cgi\?id=(\d+)&action=diff$/i; var reviewBoardUrlBase = "http://reviews.visophyte.org/"; + /** * Whenever we find a patch with a diff, insert an additional link to asuth's * review board magic. @@ -1146,3 +1100,5 @@ function tbplbotSpamCollapser(d) { li.appendChild(a); collapseExpandBox.appendChild(li); } + +tweakBugzilla(document); -- cgit From 0d8f850effd1a0d0460160d8bbe4dccb8f5f1462 Mon Sep 17 00:00:00 2001 From: Steve Fink Date: Thu, 17 Feb 2011 13:40:13 -0800 Subject: After submitting changes, redirect to a GET link to allow reloads, session restores, better titles in tab list --- data/js/bug-page-mod.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'data/js/bug-page-mod.js') diff --git a/data/js/bug-page-mod.js b/data/js/bug-page-mod.js index 1e4341a..f800b0a 100644 --- a/data/js/bug-page-mod.js +++ b/data/js/bug-page-mod.js @@ -50,6 +50,19 @@ function tweakBugzilla(d) { if (/^Bug /.test(d.title)) d.title = d.title.slice(4); + // After POSTing, redirect with a GET back to the same bug + if (/\/(process_bug|attachment).cgi$/.test(d.location.href)) { + var bug = getBugId(d); + if (bug) { + d.body.innerHTML = "Changes submitted; reloading bug " + bug; + var url = d.location.href; + url = url.replace("process_bug.cgi", "show_bug.cgi"); + url = url.replace("attachment.cgi", "show_bug.cgi"); + url += "?id=" + bug; + d.location.href = url; + } + } + // Make the comment box bigger var commentBox = d.querySelector("#comment"); if (commentBox) @@ -430,6 +443,15 @@ function transformType(str, doc, old, new_) { return str; } +function getBugId(d) { + var classes = d.body.classList; + for (var i = 0; i < classes.length; i++) { + var m = /^bz_bug_(\d+)$/.exec(classes[i]); + return m[1]; + } + return undefined; +} + // new is a keyword, which makes this function uglier than I'd like function formatTransition(old, new_, type, doc, histDoc) { if (old.length) { -- cgit From 0406fd5804e4c4303408f59c0df42d215bc0644e Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Thu, 17 Feb 2011 20:44:22 -0500 Subject: Use the existing getBugNumber function --- data/js/bug-page-mod.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'data/js/bug-page-mod.js') diff --git a/data/js/bug-page-mod.js b/data/js/bug-page-mod.js index f800b0a..fcddcbd 100644 --- a/data/js/bug-page-mod.js +++ b/data/js/bug-page-mod.js @@ -52,7 +52,7 @@ function tweakBugzilla(d) { // After POSTing, redirect with a GET back to the same bug if (/\/(process_bug|attachment).cgi$/.test(d.location.href)) { - var bug = getBugId(d); + var bug = getBugNumber(d); if (bug) { d.body.innerHTML = "Changes submitted; reloading bug " + bug; var url = d.location.href; @@ -443,15 +443,6 @@ function transformType(str, doc, old, new_) { return str; } -function getBugId(d) { - var classes = d.body.classList; - for (var i = 0; i < classes.length; i++) { - var m = /^bz_bug_(\d+)$/.exec(classes[i]); - return m[1]; - } - return undefined; -} - // new is a keyword, which makes this function uglier than I'd like function formatTransition(old, new_, type, doc, histDoc) { if (old.length) { -- cgit From f2e448b3c1ba270526f8a188eec6a565046c786b Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Thu, 17 Feb 2011 21:13:44 -0500 Subject: Make the redirection a bit more graceful (allow canceling and redirect after 2 seconds) --- data/js/bug-page-mod.js | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'data/js/bug-page-mod.js') diff --git a/data/js/bug-page-mod.js b/data/js/bug-page-mod.js index fcddcbd..f511c7c 100644 --- a/data/js/bug-page-mod.js +++ b/data/js/bug-page-mod.js @@ -54,12 +54,29 @@ function tweakBugzilla(d) { if (/\/(process_bug|attachment).cgi$/.test(d.location.href)) { var bug = getBugNumber(d); if (bug) { - d.body.innerHTML = "Changes submitted; reloading bug " + bug; var url = d.location.href; url = url.replace("process_bug.cgi", "show_bug.cgi"); url = url.replace("attachment.cgi", "show_bug.cgi"); url += "?id=" + bug; - d.location.href = url; + var timer = d.defaultView.setTimeout(function() { + d.location.href = url; + }, 2000); + var redirectMsg = d.createElement("div"); + redirectMsg.setAttribute("style", "font-weight: bold; text-align: center; border: 1px solid gray; margin: 10px 0; color: gray;"); + redirectMsg.appendChild(d.createTextNode("Changes submitted, reloading bug " + bug + " in 2 seconds... (")); + var cancelLink = d.createElement("a"); + cancelLink.setAttribute("href", "javascript:void(0)"); + cancelLink.setAttribute("style", "color: black;"); + cancelLink.addEventListener("click", function(event) { + event.preventDefault = true; + d.defaultView.clearTimeout(timer); + redirectMsg.parentNode.removeChild(redirectMsg); + }, false); + cancelLink.appendChild(d.createTextNode("Cancel")); + redirectMsg.appendChild(cancelLink); + redirectMsg.appendChild(d.createTextNode(")")); + var header = d.getElementById("header"); + header.insertBefore(redirectMsg, header.firstChild); } } -- cgit From 50fd52c2d4ca91bb2f2503e31629f4e13b1df868 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Thu, 17 Feb 2011 21:14:47 -0500 Subject: Remove the 'Assign to me' button as BMO now has a 'take' link for the same purpose --- data/js/bug-page-mod.js | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'data/js/bug-page-mod.js') diff --git a/data/js/bug-page-mod.js b/data/js/bug-page-mod.js index f511c7c..b56d857 100644 --- a/data/js/bug-page-mod.js +++ b/data/js/bug-page-mod.js @@ -85,8 +85,6 @@ function tweakBugzilla(d) { if (commentBox) commentBox.rows=20; - addAssignToSelfButton(d); - attachmentDiffLinkify(d); // Mark up history along right hand edge @@ -1073,33 +1071,6 @@ function htmlEncode(str) { .replace('"', '"', 'g'); } -function addAssignToSelfButton(d) { - var userName = getUserName(d); - if (userName) { - // see if the bug is already assigned to the user - var assignee = d.getElementById("assigned_to"); - if (assignee && assignee.value != userName) { - var button = d.createElement("input"); - button.type = "button"; - button.value = "Assign To Me"; - button.addEventListener("click", function(e) { - e.preventDefault(); - assignee.value = userName; - var reset = d.getElementById("set_default_assignee"); - if (reset) { - reset.checked = false; - } - container.classList.add("bz_default_hidden"); - d.getElementById("bz_assignee_input").classList.remove("bz_default_hidden"); - assignee.focus(); - button.removeEventListener("click", arguments.callee, false); - }, false); - var container = d.getElementById("bz_assignee_edit_container"); - container.appendChild(button); - } - } -} - function tbplbotSpamCollapser(d) { var collapseExpandBox = d.querySelector(".bz_collapse_expand_comments"); if (!collapseExpandBox) { -- cgit From da6e9ab201b55e15ddb2097fa1e40e9b08f2e9c5 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Thu, 17 Feb 2011 23:23:35 -0500 Subject: Import the functionality of Jesse's view-attachment-source script into Bugzilla Tweaks original source: https://www.squarefree.com/userscripts/bug-attachment-source.user.js --- data/js/bug-page-mod.js | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) (limited to 'data/js/bug-page-mod.js') diff --git a/data/js/bug-page-mod.js b/data/js/bug-page-mod.js index b56d857..740ba1f 100644 --- a/data/js/bug-page-mod.js +++ b/data/js/bug-page-mod.js @@ -87,6 +87,8 @@ function tweakBugzilla(d) { attachmentDiffLinkify(d); + viewAttachmentSource(d); + // Mark up history along right hand edge var historyLink = d.querySelector("link[title='Bug Activity']"); if (!historyLink) @@ -538,6 +540,70 @@ function attachmentDiffLinkify(doc) { } } +var reAttachmentType = /,\s+([^ )]*)[;)]/; + +function viewAttachmentSource(doc) { + function addLink(elem, title, href) { + if (elem.textContent.match(/[\S]/)) { + elem.appendChild(doc.createTextNode(" | ")); + } + var link = doc.createElement("a"); + link.href = href; + link.textContent = title; + elem.appendChild(link); + } + var table = doc.getElementById("attachment_table"); + if (!table) + return; + var rows = table.querySelectorAll("tr"); + for (var i = 0; i < rows.length; ++i) { + var items = rows[i].querySelectorAll("td"); + if (items.length != 3) + continue; + var links = items[0].querySelectorAll("a"); + if (links.length == 0) + continue; + var attachHref = links[0].href; + // get the type of the attachment + var span = items[0].querySelector(".bz_attach_extra_info"); + if (!span) + continue; + var typeName = null; + try { + // Match mime type followed by ";" (charset) or ")" (no charset) + typeName = span.textContent.match(reAttachmentType)[1]; + typeName = typeName.split(";")[0]; // ignore charset following type + } catch (e) {} + if (typeName == "application/java-archive" || + typeName == "application/x-jar") { + // Due to the fix for bug 369814, only zip files with this special + // mime type can be used with the jar: protocol. + // http://hg.mozilla.org/mozilla-central/rev/be54f6bb9e1e + addLink(items[2], "JAR Contents", "jar:" + attachHref + "!/"); + // https://bugzilla.mozilla.org/show_bug.cgi?id=369814#c5 has more possible mime types for zips? + } else if (typeName == "application/zip" || + typeName == "application/x-zip-compressed" || + typeName == "application/x-xpinstall") { + addLink(items[2], "Static ZIP Contents", "jar:" + attachHref + "!/"); + } else if (typeName != "text/plain" && + typeName != "patch" && + // Other types that Gecko displays like text/plain + // http://mxr.mozilla.org/mozilla-central/source/parser/htmlparser/public/nsIParser.h + typeName != "text/css" && + typeName != "text/javascript" && + typeName != "text/ecmascript" && + typeName != "application/javascript" && + typeName != "application/ecmascript" && + typeName != "application/x-javascript" && + // Binary image types for which the "source" is not useful + typeName != "image/gif" && + typeName != "image/png" && + typeName != "image/jpeg") { + addLink(items[2], "Source", "view-source:" + attachHref); + } + } +} + function quicksearchHandler(doc) { var win = doc.defaultView; var match = /quicksearch=([^&]+)/i.exec(win.location.search); -- cgit From 19a64b3dfb86045dcb99593f5da8d66eb6556de9 Mon Sep 17 00:00:00 2001 From: Steve Fink Date: Fri, 18 Feb 2011 14:13:48 -0800 Subject: Add new bug links next to product, component to create bug in same area --- data/js/bug-page-mod.js | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'data/js/bug-page-mod.js') diff --git a/data/js/bug-page-mod.js b/data/js/bug-page-mod.js index 740ba1f..1fb70e8 100644 --- a/data/js/bug-page-mod.js +++ b/data/js/bug-page-mod.js @@ -85,6 +85,8 @@ function tweakBugzilla(d) { if (commentBox) commentBox.rows=20; + addNewLinks(d); + attachmentDiffLinkify(d); viewAttachmentSource(d); @@ -1137,6 +1139,31 @@ function htmlEncode(str) { .replace('"', '"', 'g'); } +function addNewLinks(d) { + var product = d.querySelector("#field_container_product option[selected]"); + var component = d.querySelector("#component option[selected]"); + + if (product) { + var label = d.getElementById('field_container_product'); + var span = d.createElement('span'); + var url = 'enter_bug.cgi?product=' + product.value; + span.innerHTML = "(new)"; + if (label && span) { + label.appendChild(span); + } + } + + if (product && component) { + var select = d.querySelector("select#component"); + var span = d.createElement('span'); + var url = 'enter_bug.cgi?product=' + product.value + '&component=' + component.value; + span.innerHTML = "(new)"; + if (select && span) { + select.parentNode.appendChild(span); + } + } +} + function tbplbotSpamCollapser(d) { var collapseExpandBox = d.querySelector(".bz_collapse_expand_comments"); if (!collapseExpandBox) { -- cgit From 056179ee4acf5d9a389fa72211f4aa2b4aa716d2 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Fri, 18 Feb 2011 19:31:33 -0500 Subject: Don't redirect if the user has interacted with the page by scrolling --- data/js/bug-page-mod.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'data/js/bug-page-mod.js') diff --git a/data/js/bug-page-mod.js b/data/js/bug-page-mod.js index 740ba1f..a7d952b 100644 --- a/data/js/bug-page-mod.js +++ b/data/js/bug-page-mod.js @@ -58,8 +58,19 @@ function tweakBugzilla(d) { url = url.replace("process_bug.cgi", "show_bug.cgi"); url = url.replace("attachment.cgi", "show_bug.cgi"); url += "?id=" + bug; + function cancelRedirection() { + d.defaultView.clearTimeout(timer); + redirectMsg.parentNode.removeChild(redirectMsg); + } var timer = d.defaultView.setTimeout(function() { - d.location.href = url; + // don't redirect if the user is using the page (for now, we just see + // if they have scrolled the page, in which case we assume that they + // are using the page.) + if (d.defaultView.scrollY > 0) { + cancelRedirection(); + } else { + d.location.href = url; + } }, 2000); var redirectMsg = d.createElement("div"); redirectMsg.setAttribute("style", "font-weight: bold; text-align: center; border: 1px solid gray; margin: 10px 0; color: gray;"); @@ -69,8 +80,7 @@ function tweakBugzilla(d) { cancelLink.setAttribute("style", "color: black;"); cancelLink.addEventListener("click", function(event) { event.preventDefault = true; - d.defaultView.clearTimeout(timer); - redirectMsg.parentNode.removeChild(redirectMsg); + cancelRedirection(); }, false); cancelLink.appendChild(d.createTextNode("Cancel")); redirectMsg.appendChild(cancelLink); -- cgit From 10482a82157c9ee4e9b84473254a4676ec913110 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Fri, 18 Feb 2011 19:32:37 -0500 Subject: Don't redirect if the user has interacted with the page by selecting something --- data/js/bug-page-mod.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'data/js/bug-page-mod.js') diff --git a/data/js/bug-page-mod.js b/data/js/bug-page-mod.js index a7d952b..afb1e1a 100644 --- a/data/js/bug-page-mod.js +++ b/data/js/bug-page-mod.js @@ -65,8 +65,9 @@ function tweakBugzilla(d) { var timer = d.defaultView.setTimeout(function() { // don't redirect if the user is using the page (for now, we just see // if they have scrolled the page, in which case we assume that they - // are using the page.) - if (d.defaultView.scrollY > 0) { + // are using the page, or if they've selected anything on the page.) + if (d.defaultView.scrollY > 0 || + d.defaultView.getSelection() == "") { cancelRedirection(); } else { d.location.href = url; -- cgit From 284cc142f9bae029bc0feb42e90ce3408f497e6a Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Fri, 18 Feb 2011 19:33:22 -0500 Subject: Use the range count instead of the selection text --- data/js/bug-page-mod.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/js/bug-page-mod.js') diff --git a/data/js/bug-page-mod.js b/data/js/bug-page-mod.js index afb1e1a..3c9b410 100644 --- a/data/js/bug-page-mod.js +++ b/data/js/bug-page-mod.js @@ -67,7 +67,7 @@ function tweakBugzilla(d) { // if they have scrolled the page, in which case we assume that they // are using the page, or if they've selected anything on the page.) if (d.defaultView.scrollY > 0 || - d.defaultView.getSelection() == "") { + d.defaultView.getSelection().rangeCount > 0) { cancelRedirection(); } else { d.location.href = url; -- cgit From ecae20f028473e4310929df022aa8136a9337021 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Fri, 18 Feb 2011 19:44:54 -0500 Subject: Actually listen for all mouse and keyboard interactions for the page to determine whether the user is using the page before redirecting --- data/js/bug-page-mod.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'data/js/bug-page-mod.js') diff --git a/data/js/bug-page-mod.js b/data/js/bug-page-mod.js index 3c9b410..f5eea92 100644 --- a/data/js/bug-page-mod.js +++ b/data/js/bug-page-mod.js @@ -61,11 +61,16 @@ function tweakBugzilla(d) { function cancelRedirection() { d.defaultView.clearTimeout(timer); redirectMsg.parentNode.removeChild(redirectMsg); + d.body.removeEventListener("mousedown", interactionDetector, false); + d.body.removeEventListener("keydown", interactionDetector, false); } + function interactionDetector() { + cancelRedirection(); + } + d.body.addEventListener("mousedown", interactionDetector, false); + d.body.addEventListener("keydown", interactionDetector, false); var timer = d.defaultView.setTimeout(function() { - // don't redirect if the user is using the page (for now, we just see - // if they have scrolled the page, in which case we assume that they - // are using the page, or if they've selected anything on the page.) + // don't redirect if the user is using the page. if (d.defaultView.scrollY > 0 || d.defaultView.getSelection().rangeCount > 0) { cancelRedirection(); -- cgit From 6173ce4e2f45dbfd0402c0a2e98b4d5aed588fe2 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Tue, 22 Feb 2011 00:35:23 -0500 Subject: Use encodeURIComponent in the new link generation --- data/js/bug-page-mod.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/js/bug-page-mod.js') diff --git a/data/js/bug-page-mod.js b/data/js/bug-page-mod.js index 2af545d..2a8c817 100644 --- a/data/js/bug-page-mod.js +++ b/data/js/bug-page-mod.js @@ -1162,7 +1162,7 @@ function addNewLinks(d) { if (product) { var label = d.getElementById('field_container_product'); var span = d.createElement('span'); - var url = 'enter_bug.cgi?product=' + product.value; + var url = 'enter_bug.cgi?product=' + encodeURIComponent(product.value); span.innerHTML = "(new)"; if (label && span) { label.appendChild(span); @@ -1172,7 +1172,7 @@ function addNewLinks(d) { if (product && component) { var select = d.querySelector("select#component"); var span = d.createElement('span'); - var url = 'enter_bug.cgi?product=' + product.value + '&component=' + component.value; + var url = 'enter_bug.cgi?product=' + encodeURIComponent(product.value) + '&component=' + encodeURIComponent(component.value); span.innerHTML = "(new)"; if (select && span) { select.parentNode.appendChild(span); -- cgit From a03fbdab05f0676865edb14091878ab9c03178bf Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Tue, 22 Feb 2011 00:43:09 -0500 Subject: Don't use innerHTML to avoid escaping issues, and add tooltips to the new links describing their purpose --- data/js/bug-page-mod.js | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'data/js/bug-page-mod.js') diff --git a/data/js/bug-page-mod.js b/data/js/bug-page-mod.js index 2a8c817..2213dfb 100644 --- a/data/js/bug-page-mod.js +++ b/data/js/bug-page-mod.js @@ -1161,21 +1161,35 @@ function addNewLinks(d) { if (product) { var label = d.getElementById('field_container_product'); - var span = d.createElement('span'); var url = 'enter_bug.cgi?product=' + encodeURIComponent(product.value); span.innerHTML = "(new)"; - if (label && span) { - label.appendChild(span); + if (label) { + label.appendChild(d.createTextNode("(")); + var link = d.createElement('a'); + link.href = url; + link.textContent = "new"; + link.title = "File a new bug in the same Product"; + var span = d.createElement('span'); + span.appendChild(link); + label.appendChild(span); + label.appendChild(d.createTextNode(")")); } } if (product && component) { var select = d.querySelector("select#component"); - var span = d.createElement('span'); + var label = select.parentNode; var url = 'enter_bug.cgi?product=' + encodeURIComponent(product.value) + '&component=' + encodeURIComponent(component.value); - span.innerHTML = "(new)"; - if (select && span) { - select.parentNode.appendChild(span); + if (label) { + label.appendChild(d.createTextNode("(")); + var link = d.createElement('a'); + link.href = url; + link.textContent = "new"; + link.title = "File a new bug in the same Product and Component"; + var span = d.createElement('span'); + span.appendChild(link); + label.appendChild(span); + label.appendChild(d.createTextNode(")")); } } } -- cgit From b5c3c923a36d1eb6d470e9b0939cc32f47b083f0 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Tue, 22 Feb 2011 00:43:32 -0500 Subject: Whitespace adjustments --- data/js/bug-page-mod.js | 56 ++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'data/js/bug-page-mod.js') diff --git a/data/js/bug-page-mod.js b/data/js/bug-page-mod.js index 2213dfb..bb0e566 100644 --- a/data/js/bug-page-mod.js +++ b/data/js/bug-page-mod.js @@ -1160,37 +1160,37 @@ function addNewLinks(d) { var component = d.querySelector("#component option[selected]"); if (product) { - var label = d.getElementById('field_container_product'); - var url = 'enter_bug.cgi?product=' + encodeURIComponent(product.value); - span.innerHTML = "(new)"; - if (label) { - label.appendChild(d.createTextNode("(")); - var link = d.createElement('a'); - link.href = url; - link.textContent = "new"; - link.title = "File a new bug in the same Product"; - var span = d.createElement('span'); - span.appendChild(link); - label.appendChild(span); - label.appendChild(d.createTextNode(")")); - } + var label = d.getElementById('field_container_product'); + var url = 'enter_bug.cgi?product=' + encodeURIComponent(product.value); + span.innerHTML = "(new)"; + if (label) { + label.appendChild(d.createTextNode("(")); + var link = d.createElement('a'); + link.href = url; + link.textContent = "new"; + link.title = "File a new bug in the same Product"; + var span = d.createElement('span'); + span.appendChild(link); + label.appendChild(span); + label.appendChild(d.createTextNode(")")); + } } if (product && component) { - var select = d.querySelector("select#component"); - var label = select.parentNode; - var url = 'enter_bug.cgi?product=' + encodeURIComponent(product.value) + '&component=' + encodeURIComponent(component.value); - if (label) { - label.appendChild(d.createTextNode("(")); - var link = d.createElement('a'); - link.href = url; - link.textContent = "new"; - link.title = "File a new bug in the same Product and Component"; - var span = d.createElement('span'); - span.appendChild(link); - label.appendChild(span); - label.appendChild(d.createTextNode(")")); - } + var select = d.querySelector("select#component"); + var label = select.parentNode; + var url = 'enter_bug.cgi?product=' + encodeURIComponent(product.value) + '&component=' + encodeURIComponent(component.value); + if (label) { + label.appendChild(d.createTextNode("(")); + var link = d.createElement('a'); + link.href = url; + link.textContent = "new"; + link.title = "File a new bug in the same Product and Component"; + var span = d.createElement('span'); + span.appendChild(link); + label.appendChild(span); + label.appendChild(d.createTextNode(")")); + } } } -- cgit From 99fc41e4c0cf07af51337403aa17085ca94d8928 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Tue, 22 Feb 2011 00:45:10 -0500 Subject: More whitespace adjustments --- data/js/bug-page-mod.js | 66 ++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'data/js/bug-page-mod.js') diff --git a/data/js/bug-page-mod.js b/data/js/bug-page-mod.js index bb0e566..acf0746 100644 --- a/data/js/bug-page-mod.js +++ b/data/js/bug-page-mod.js @@ -1156,42 +1156,42 @@ function htmlEncode(str) { } function addNewLinks(d) { - var product = d.querySelector("#field_container_product option[selected]"); - var component = d.querySelector("#component option[selected]"); - - if (product) { - var label = d.getElementById('field_container_product'); - var url = 'enter_bug.cgi?product=' + encodeURIComponent(product.value); - span.innerHTML = "(new)"; - if (label) { - label.appendChild(d.createTextNode("(")); - var link = d.createElement('a'); - link.href = url; - link.textContent = "new"; - link.title = "File a new bug in the same Product"; - var span = d.createElement('span'); - span.appendChild(link); - label.appendChild(span); - label.appendChild(d.createTextNode(")")); - } + var product = d.querySelector("#field_container_product option[selected]"); + var component = d.querySelector("#component option[selected]"); + + if (product) { + var label = d.getElementById('field_container_product'); + var url = 'enter_bug.cgi?product=' + encodeURIComponent(product.value); + span.innerHTML = "(new)"; + if (label) { + label.appendChild(d.createTextNode("(")); + var link = d.createElement('a'); + link.href = url; + link.textContent = "new"; + link.title = "File a new bug in the same Product"; + var span = d.createElement('span'); + span.appendChild(link); + label.appendChild(span); + label.appendChild(d.createTextNode(")")); } + } - if (product && component) { - var select = d.querySelector("select#component"); - var label = select.parentNode; - var url = 'enter_bug.cgi?product=' + encodeURIComponent(product.value) + '&component=' + encodeURIComponent(component.value); - if (label) { - label.appendChild(d.createTextNode("(")); - var link = d.createElement('a'); - link.href = url; - link.textContent = "new"; - link.title = "File a new bug in the same Product and Component"; - var span = d.createElement('span'); - span.appendChild(link); - label.appendChild(span); - label.appendChild(d.createTextNode(")")); - } + if (product && component) { + var select = d.querySelector("select#component"); + var label = select.parentNode; + var url = 'enter_bug.cgi?product=' + encodeURIComponent(product.value) + '&component=' + encodeURIComponent(component.value); + if (label) { + label.appendChild(d.createTextNode("(")); + var link = d.createElement('a'); + link.href = url; + link.textContent = "new"; + link.title = "File a new bug in the same Product and Component"; + var span = d.createElement('span'); + span.appendChild(link); + label.appendChild(span); + label.appendChild(d.createTextNode(")")); } + } } function tbplbotSpamCollapser(d) { -- cgit From b0717c4d524ce6e583e18865c5693925e1e0020a Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Tue, 22 Feb 2011 00:47:04 -0500 Subject: Remove an unneeded line which throws, causing the add-on to fail --- data/js/bug-page-mod.js | 1 - 1 file changed, 1 deletion(-) (limited to 'data/js/bug-page-mod.js') diff --git a/data/js/bug-page-mod.js b/data/js/bug-page-mod.js index acf0746..6575ab7 100644 --- a/data/js/bug-page-mod.js +++ b/data/js/bug-page-mod.js @@ -1162,7 +1162,6 @@ function addNewLinks(d) { if (product) { var label = d.getElementById('field_container_product'); var url = 'enter_bug.cgi?product=' + encodeURIComponent(product.value); - span.innerHTML = "(new)"; if (label) { label.appendChild(d.createTextNode("(")); var link = d.createElement('a'); -- cgit From ee905fd9a069918ea2e24dbdf22943676e60f607 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Tue, 22 Feb 2011 10:56:55 -0500 Subject: Replace the history state instead of redirecting when changing a bug --- data/js/bug-page-mod.js | 40 ++++------------------------------------ 1 file changed, 4 insertions(+), 36 deletions(-) (limited to 'data/js/bug-page-mod.js') diff --git a/data/js/bug-page-mod.js b/data/js/bug-page-mod.js index 6575ab7..015785a 100644 --- a/data/js/bug-page-mod.js +++ b/data/js/bug-page-mod.js @@ -51,48 +51,16 @@ function tweakBugzilla(d) { d.title = d.title.slice(4); // After POSTing, redirect with a GET back to the same bug - if (/\/(process_bug|attachment).cgi$/.test(d.location.href)) { + if (/\/(process_bug|attachment|post_bug).cgi$/.test(d.location.href)) { var bug = getBugNumber(d); if (bug) { var url = d.location.href; url = url.replace("process_bug.cgi", "show_bug.cgi"); url = url.replace("attachment.cgi", "show_bug.cgi"); + url = url.replace("post_bug.cgi", "show_bug.cgi"); url += "?id=" + bug; - function cancelRedirection() { - d.defaultView.clearTimeout(timer); - redirectMsg.parentNode.removeChild(redirectMsg); - d.body.removeEventListener("mousedown", interactionDetector, false); - d.body.removeEventListener("keydown", interactionDetector, false); - } - function interactionDetector() { - cancelRedirection(); - } - d.body.addEventListener("mousedown", interactionDetector, false); - d.body.addEventListener("keydown", interactionDetector, false); - var timer = d.defaultView.setTimeout(function() { - // don't redirect if the user is using the page. - if (d.defaultView.scrollY > 0 || - d.defaultView.getSelection().rangeCount > 0) { - cancelRedirection(); - } else { - d.location.href = url; - } - }, 2000); - var redirectMsg = d.createElement("div"); - redirectMsg.setAttribute("style", "font-weight: bold; text-align: center; border: 1px solid gray; margin: 10px 0; color: gray;"); - redirectMsg.appendChild(d.createTextNode("Changes submitted, reloading bug " + bug + " in 2 seconds... (")); - var cancelLink = d.createElement("a"); - cancelLink.setAttribute("href", "javascript:void(0)"); - cancelLink.setAttribute("style", "color: black;"); - cancelLink.addEventListener("click", function(event) { - event.preventDefault = true; - cancelRedirection(); - }, false); - cancelLink.appendChild(d.createTextNode("Cancel")); - redirectMsg.appendChild(cancelLink); - redirectMsg.appendChild(d.createTextNode(")")); - var header = d.getElementById("header"); - header.insertBefore(redirectMsg, header.firstChild); + d.defaultView.history.replaceState(null, "", url); + d.title = bug + " - " + d.getElementById("short_desc_nonedit_display").textContent; } } -- cgit From 6a167eb492a22e7b90a2202063d5923a5051e4ea Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Tue, 22 Feb 2011 11:10:02 -0500 Subject: Replace all instances of '+' with ' ' when filling in the quicksearch fields --- data/js/bug-page-mod.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/js/bug-page-mod.js') diff --git a/data/js/bug-page-mod.js b/data/js/bug-page-mod.js index 015785a..a75e776 100644 --- a/data/js/bug-page-mod.js +++ b/data/js/bug-page-mod.js @@ -594,7 +594,7 @@ function quicksearchHandler(doc) { var win = doc.defaultView; var match = /quicksearch=([^&]+)/i.exec(win.location.search); if (match) { - var quicksearch = unescape(match[1].replace('+', ' ')); + var quicksearch = unescape(match[1].replace('+', ' ', 'g')); var quicksearchBox = doc.querySelectorAll("input[name=quicksearch]"); if (quicksearchBox) { for (var i = 0; i < quicksearchBox.length; ++i) { -- cgit