Bug 920321 - Do not truncate the source line number in the web console; r=msucan

This commit is contained in:
Thomas Andersen
2013-10-31 21:28:08 +01:00
parent 517d64b606
commit afbc609801
2 changed files with 29 additions and 13 deletions

View File

@@ -2606,29 +2606,28 @@ WebConsoleFrame.prototype = {
createLocationNode: function WCF_createLocationNode(aSourceURL, aSourceLine)
{
let locationNode = this.document.createElementNS(XHTML_NS, "a");
let filenameNode = this.document.createElementNS(XHTML_NS, "span");
// Create the text, which consists of an abbreviated version of the URL
// plus an optional line number. Scratchpad URLs should not be abbreviated.
let displayLocation;
// Scratchpad URLs should not be abbreviated.
let filename;
let fullURL;
let isScratchpad = false;
if (/^Scratchpad\/\d+$/.test(aSourceURL)) {
displayLocation = aSourceURL;
filename = aSourceURL;
fullURL = aSourceURL;
isScratchpad = true;
}
else {
fullURL = aSourceURL.split(" -> ").pop();
displayLocation = WebConsoleUtils.abbreviateSourceURL(fullURL);
filename = WebConsoleUtils.abbreviateSourceURL(fullURL);
}
if (aSourceLine) {
displayLocation += ":" + aSourceLine;
locationNode.sourceLine = aSourceLine;
}
filenameNode.className = "filename";
filenameNode.textContent = " " + filename;
locationNode.appendChild(filenameNode);
locationNode.textContent = " " + displayLocation;
locationNode.href = isScratchpad ? "#" : fullURL;
locationNode.draggable = false;
locationNode.setAttribute("title", aSourceURL);
@@ -2651,6 +2650,14 @@ WebConsoleFrame.prototype = {
}
});
if (aSourceLine) {
let lineNumberNode = this.document.createElementNS(XHTML_NS, "span");
lineNumberNode.className = "line-number";
lineNumberNode.textContent = ":" + aSourceLine;
locationNode.appendChild(lineNumberNode);
locationNode.sourceLine = aSourceLine;
}
return locationNode;
},