mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 04:15:43 +00:00
Bug 1244514 - webconsole.js eslint: fix spacing and line length; r=linclark
This commit is contained in:
AJ Kerrigan
parent
17e41f6c46
commit
45e6ab33d8
@ -8,7 +8,8 @@
|
||||
|
||||
const {Cc, Ci, Cu} = require("chrome");
|
||||
|
||||
const {Utils: WebConsoleUtils, CONSOLE_WORKER_IDS} = require("devtools/shared/webconsole/utils");
|
||||
const {Utils: WebConsoleUtils, CONSOLE_WORKER_IDS} =
|
||||
require("devtools/shared/webconsole/utils");
|
||||
const promise = require("promise");
|
||||
|
||||
loader.lazyServiceGetter(this, "clipboardHelper",
|
||||
@ -68,8 +69,10 @@ const CATEGORY_NETWORK = 0;
|
||||
const CATEGORY_CSS = 1;
|
||||
const CATEGORY_JS = 2;
|
||||
const CATEGORY_WEBDEV = 3;
|
||||
const CATEGORY_INPUT = 4; // always on
|
||||
const CATEGORY_OUTPUT = 5; // always on
|
||||
// always on
|
||||
const CATEGORY_INPUT = 4;
|
||||
// always on
|
||||
const CATEGORY_OUTPUT = 5;
|
||||
const CATEGORY_SECURITY = 6;
|
||||
const CATEGORY_SERVER = 7;
|
||||
|
||||
@ -101,20 +104,30 @@ const SEVERITY_CLASS_FRAGMENTS = [
|
||||
];
|
||||
|
||||
// The preference keys to use for each category/severity combination, indexed
|
||||
// first by category (rows) and then by severity (columns).
|
||||
// first by category (rows) and then by severity (columns) in the following
|
||||
// order:
|
||||
//
|
||||
// [ Error, Warning, Info, Log ]
|
||||
//
|
||||
// Most of these rather idiosyncratic names are historical and predate the
|
||||
// division of message type into "category" and "severity".
|
||||
const MESSAGE_PREFERENCE_KEYS = [
|
||||
// Error Warning Info Log
|
||||
[ "network", "netwarn", "netxhr", "networkinfo", ], // Network
|
||||
[ "csserror", "cssparser", null, "csslog", ], // CSS
|
||||
[ "exception", "jswarn", null, "jslog", ], // JS
|
||||
[ "error", "warn", "info", "log", ], // Web Developer
|
||||
[ null, null, null, null, ], // Input
|
||||
[ null, null, null, null, ], // Output
|
||||
[ "secerror", "secwarn", null, null, ], // Security
|
||||
[ "servererror", "serverwarn", "serverinfo", "serverlog", ], // Server Logging
|
||||
// Network
|
||||
[ "network", "netwarn", "netxhr", "networkinfo", ],
|
||||
// CSS
|
||||
[ "csserror", "cssparser", null, "csslog", ],
|
||||
// JS
|
||||
[ "exception", "jswarn", null, "jslog", ],
|
||||
// Web Developer
|
||||
[ "error", "warn", "info", "log", ],
|
||||
// Input
|
||||
[ null, null, null, null, ],
|
||||
// Output
|
||||
[ null, null, null, null, ],
|
||||
// Security
|
||||
[ "secerror", "secwarn", null, null, ],
|
||||
// Server Logging
|
||||
[ "servererror", "serverwarn", "serverinfo", "serverlog", ],
|
||||
];
|
||||
|
||||
// A mapping from the console API log event levels to the Web Console
|
||||
@ -141,7 +154,8 @@ const LEVELS = {
|
||||
|
||||
// This array contains the prefKey for the workers and it must keep them in the
|
||||
// same order as CONSOLE_WORKER_IDS
|
||||
const WORKERTYPES_PREFKEYS = [ 'sharedworkers', 'serviceworkers', 'windowlessworkers' ];
|
||||
const WORKERTYPES_PREFKEYS =
|
||||
[ "sharedworkers", "serviceworkers", "windowlessworkers" ];
|
||||
|
||||
// The lowest HTTP response code (inclusive) that is considered an error.
|
||||
const MIN_HTTP_ERROR_CODE = 400;
|
||||
@ -159,20 +173,21 @@ const GROUP_INDENT = 12;
|
||||
// too many messages at once we slow down the Firefox UI too much.
|
||||
const MESSAGES_IN_INTERVAL = DEFAULT_LOG_LIMIT;
|
||||
|
||||
// The delay between display updates - tells how often we should *try* to push
|
||||
// new messages to screen. This value is optimistic, updates won't always
|
||||
// happen. Keep this low so the Web Console output feels live.
|
||||
const OUTPUT_INTERVAL = 20; // milliseconds
|
||||
// The delay (in milliseconds) between display updates - tells how often we
|
||||
// should *try* to push new messages to screen. This value is optimistic,
|
||||
// updates won't always happen. Keep this low so the Web Console output feels
|
||||
// live.
|
||||
const OUTPUT_INTERVAL = 20;
|
||||
|
||||
// The maximum amount of time that can be spent doing cleanup inside of the
|
||||
// flush output callback. If things don't get cleaned up in this time,
|
||||
// then it will start again the next time it is called.
|
||||
const MAX_CLEANUP_TIME = 10; // milliseconds
|
||||
// The maximum amount of time (in milliseconds) that can be spent doing cleanup
|
||||
// inside of the flush output callback. If things don't get cleaned up in this
|
||||
// time, then it will start again the next time it is called.
|
||||
const MAX_CLEANUP_TIME = 10;
|
||||
|
||||
// When the output queue has more than MESSAGES_IN_INTERVAL items we throttle
|
||||
// output updates to this number of milliseconds. So during a lot of output we
|
||||
// update every N milliseconds given here.
|
||||
const THROTTLE_UPDATES = 1000; // milliseconds
|
||||
const THROTTLE_UPDATES = 1000;
|
||||
|
||||
// The preference prefix for all of the Web Console filters.
|
||||
const FILTER_PREFS_PREFIX = "devtools.webconsole.filter.";
|
||||
@ -414,7 +429,8 @@ WebConsoleFrame.prototype = {
|
||||
// when the original top level window we attached to is closed,
|
||||
// but we don't want to reset console history and just switch to
|
||||
// the next available window.
|
||||
return this.owner._browserConsole || Services.prefs.getBoolPref(PREF_PERSISTLOG);
|
||||
return this.owner._browserConsole ||
|
||||
Services.prefs.getBoolPref(PREF_PERSISTLOG);
|
||||
},
|
||||
|
||||
/**
|
||||
@ -460,9 +476,11 @@ WebConsoleFrame.prototype = {
|
||||
this._initDefer = promise.defer();
|
||||
this.proxy = new WebConsoleConnectionProxy(this, this.owner.target);
|
||||
|
||||
this.proxy.connect().then(() => { // on success
|
||||
this.proxy.connect().then(() => {
|
||||
// on success
|
||||
this._initDefer.resolve(this);
|
||||
}, (reason) => { // on failure
|
||||
}, (reason) => {
|
||||
// on failure
|
||||
let node = this.createMessageNode(CATEGORY_JS, SEVERITY_ERROR,
|
||||
reason.error + ": " + reason.message);
|
||||
this.outputMessage(CATEGORY_JS, node, [reason]);
|
||||
@ -507,7 +525,8 @@ WebConsoleFrame.prototype = {
|
||||
this._initFilterButtons();
|
||||
|
||||
let fontSize = this.owner._browserConsole ?
|
||||
Services.prefs.getIntPref("devtools.webconsole.fontSize") : 0;
|
||||
Services.prefs.getIntPref("devtools.webconsole.fontSize") :
|
||||
0;
|
||||
|
||||
if (fontSize != 0) {
|
||||
fontSize = Math.max(MIN_FONT_SIZE, fontSize);
|
||||
@ -528,7 +547,8 @@ WebConsoleFrame.prototype = {
|
||||
// calculations.
|
||||
this._updateCharSize();
|
||||
|
||||
let clearButton = doc.getElementsByClassName("webconsole-clear-console-button")[0];
|
||||
let clearButton =
|
||||
doc.getElementsByClassName("webconsole-clear-console-button")[0];
|
||||
clearButton.addEventListener("command", () => {
|
||||
this.owner._onClearButton();
|
||||
this.jsterm.clearOutput(true);
|
||||
@ -722,10 +742,12 @@ WebConsoleFrame.prototype = {
|
||||
let accesskey = net.getAttribute("accesskeyMacOSX");
|
||||
net.setAttribute("accesskey", accesskey);
|
||||
|
||||
let logging = this.document.querySelector("toolbarbutton[category=logging]");
|
||||
let logging =
|
||||
this.document.querySelector("toolbarbutton[category=logging]");
|
||||
logging.removeAttribute("accesskey");
|
||||
|
||||
let serverLogging = this.document.querySelector("toolbarbutton[category=server]");
|
||||
let serverLogging =
|
||||
this.document.querySelector("toolbarbutton[category=server]");
|
||||
serverLogging.removeAttribute("accesskey");
|
||||
}
|
||||
},
|
||||
@ -812,7 +834,7 @@ WebConsoleFrame.prototype = {
|
||||
let target = event.target;
|
||||
let tagName = target.tagName;
|
||||
// Prevent toggle if generated from a contextmenu event (right click)
|
||||
let isRightClick = (event.button === 2); // right click is button 2;
|
||||
let isRightClick = (event.button === 2);
|
||||
if (tagName != event.currentTarget.tagName || isRightClick) {
|
||||
return;
|
||||
}
|
||||
@ -861,8 +883,8 @@ WebConsoleFrame.prototype = {
|
||||
this._setMenuState(target, state);
|
||||
|
||||
// CSS reflow logging can decrease web page performance.
|
||||
// Make sure the option is always unchecked when the CSS filter button is selected.
|
||||
// See bug 971798.
|
||||
// Make sure the option is always unchecked when the CSS filter button
|
||||
// is selected. See bug 971798.
|
||||
if (target.getAttribute("category") == "css" && state) {
|
||||
let csslogMenuItem = target.querySelector("menuitem[prefKey=csslog]");
|
||||
csslogMenuItem.setAttribute("checked", false);
|
||||
@ -974,7 +996,7 @@ WebConsoleFrame.prototype = {
|
||||
|
||||
let searchStr = str.toLowerCase();
|
||||
let filterStrings = filter.toLowerCase().split(/\s+/);
|
||||
return !filterStrings.some(function (f) {
|
||||
return !filterStrings.some(function(f) {
|
||||
return searchStr.indexOf(f) == -1;
|
||||
});
|
||||
},
|
||||
@ -1094,7 +1116,8 @@ WebConsoleFrame.prototype = {
|
||||
mergeFilteredMessageNode: function(original, filtered) {
|
||||
let repeatNode = original.getElementsByClassName("message-repeats")[0];
|
||||
if (!repeatNode) {
|
||||
return; // no repeat node, return early.
|
||||
// no repeat node, return early.
|
||||
return;
|
||||
}
|
||||
|
||||
let occurrences = parseInt(repeatNode.getAttribute("value")) + 1;
|
||||
@ -1139,7 +1162,8 @@ WebConsoleFrame.prototype = {
|
||||
return null;
|
||||
}
|
||||
|
||||
let lastRepeatNode = lastMessage.getElementsByClassName("message-repeats")[0];
|
||||
let lastRepeatNode =
|
||||
lastMessage.getElementsByClassName("message-repeats")[0];
|
||||
if (lastRepeatNode && lastRepeatNode._uid == uid) {
|
||||
dupeNode = lastMessage;
|
||||
}
|
||||
@ -1327,7 +1351,8 @@ WebConsoleFrame.prototype = {
|
||||
}
|
||||
|
||||
if (level == "groupEnd") {
|
||||
return null; // no need to continue
|
||||
// no need to continue
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!node) {
|
||||
@ -1386,7 +1411,7 @@ WebConsoleFrame.prototype = {
|
||||
severity = 'log';
|
||||
}
|
||||
|
||||
switch(category) {
|
||||
switch (category) {
|
||||
case CATEGORY_CSS:
|
||||
category = 'css';
|
||||
break;
|
||||
@ -1419,7 +1444,8 @@ WebConsoleFrame.prototype = {
|
||||
// it makes sense to only display the protcol, host and port (prePath).
|
||||
// This also means messages are grouped for a single origin.
|
||||
if (scriptError.category && scriptError.category == "SHA-1 Signature") {
|
||||
let sourceURI = Services.io.newURI(scriptError.sourceName, null, null).QueryInterface(Ci.nsIURL);
|
||||
let sourceURI = Services.io.newURI(scriptError.sourceName, null, null)
|
||||
.QueryInterface(Ci.nsIURL);
|
||||
displayOrigin = sourceURI.prePath;
|
||||
}
|
||||
|
||||
@ -1590,7 +1616,8 @@ WebConsoleFrame.prototype = {
|
||||
* Parent to the requested urlNode.
|
||||
*/
|
||||
makeMixedContentNode: function(linkNode) {
|
||||
let mixedContentWarning = "[" + l10n.getStr("webConsoleMixedContentWarning") + "]";
|
||||
let mixedContentWarning =
|
||||
"[" + l10n.getStr("webConsoleMixedContentWarning") + "]";
|
||||
|
||||
// Mixed content warning message links to a Learn More page
|
||||
let mixedContentWarningNode = this.document.createElementNS(XHTML_NS, "a");
|
||||
@ -1724,12 +1751,14 @@ WebConsoleFrame.prototype = {
|
||||
let duration = Math.round((end - start) * 100) / 100;
|
||||
let node = this.document.createElementNS(XHTML_NS, "span");
|
||||
if (sourceURL) {
|
||||
node.textContent = l10n.getFormatStr("reflow.messageWithLink", [duration]);
|
||||
node.textContent =
|
||||
l10n.getFormatStr("reflow.messageWithLink", [duration]);
|
||||
let a = this.document.createElementNS(XHTML_NS, "a");
|
||||
a.href = "#";
|
||||
a.draggable = "false";
|
||||
let filename = WebConsoleUtils.abbreviateSourceURL(sourceURL);
|
||||
let functionName = message.functionName || l10n.getStr("stacktrace.anonymousFunction");
|
||||
let functionName = message.functionName ||
|
||||
l10n.getStr("stacktrace.anonymousFunction");
|
||||
a.textContent = l10n.getFormatStr("reflow.messageLinkText",
|
||||
[functionName, filename, sourceLine]);
|
||||
this._addMessageLinkCallback(a, () => {
|
||||
@ -1737,12 +1766,12 @@ WebConsoleFrame.prototype = {
|
||||
});
|
||||
node.appendChild(a);
|
||||
} else {
|
||||
node.textContent = l10n.getFormatStr("reflow.messageWithNoLink", [duration]);
|
||||
node.textContent =
|
||||
l10n.getFormatStr("reflow.messageWithNoLink", [duration]);
|
||||
}
|
||||
return this.createMessageNode(CATEGORY_CSS, SEVERITY_LOG, node);
|
||||
},
|
||||
|
||||
|
||||
handleReflowActivity: function(message) {
|
||||
this.outputMessage(CATEGORY_CSS, this.logReflowActivity, [message]);
|
||||
},
|
||||
@ -1814,7 +1843,8 @@ WebConsoleFrame.prototype = {
|
||||
let hasEventTimings = updates.indexOf("eventTimings") > -1;
|
||||
let hasResponseStart = updates.indexOf("responseStart") > -1;
|
||||
let request = networkInfo.request;
|
||||
let methodText = (networkInfo.isXHR)? request.method + ' XHR' : request.method;
|
||||
let methodText = (networkInfo.isXHR) ?
|
||||
request.method + ' XHR' : request.method;
|
||||
let response = networkInfo.response;
|
||||
let updated = false;
|
||||
|
||||
@ -1993,8 +2023,8 @@ WebConsoleFrame.prototype = {
|
||||
// We won't bother to try to restore scroll position if this is showing
|
||||
// a lot of messages at once (and there are still items in the queue).
|
||||
// It is going to purge whatever you were looking at anyway.
|
||||
let scrolledToBottom = shouldPrune ||
|
||||
Utils.isOutputScrolledToBottom(outputNode, scrollNode);
|
||||
let scrolledToBottom =
|
||||
shouldPrune || Utils.isOutputScrolledToBottom(outputNode, scrollNode);
|
||||
|
||||
// Output the current batch of messages.
|
||||
let messages = new Set();
|
||||
@ -2105,7 +2135,7 @@ WebConsoleFrame.prototype = {
|
||||
|
||||
// The last object in the args array should be message
|
||||
// object or response packet received from the server.
|
||||
let message = (args && args.length) ? args[args.length-1] : null;
|
||||
let message = (args && args.length) ? args[args.length - 1] : null;
|
||||
|
||||
let node = typeof methodOrNode == "function" ?
|
||||
methodOrNode.apply(this, args || []) :
|
||||
@ -2126,7 +2156,6 @@ WebConsoleFrame.prototype = {
|
||||
let nodeID = node.getAttribute("id");
|
||||
Services.obs.notifyObservers(hudIdSupportsString,
|
||||
"web-console-message-created", nodeID);
|
||||
|
||||
}
|
||||
|
||||
if (node._onOutput) {
|
||||
@ -2218,7 +2247,8 @@ WebConsoleFrame.prototype = {
|
||||
} else if (typeof methodOrNode != "function") {
|
||||
connectionId = methodOrNode._connectionId;
|
||||
}
|
||||
if (connectionId && this.webConsoleClient.hasNetworkRequest(connectionId)) {
|
||||
if (connectionId &&
|
||||
this.webConsoleClient.hasNetworkRequest(connectionId)) {
|
||||
this.webConsoleClient.removeNetworkRequest(connectionId);
|
||||
this._releaseObject(connectionId);
|
||||
}
|
||||
@ -2455,7 +2485,8 @@ WebConsoleFrame.prototype = {
|
||||
* message.
|
||||
*
|
||||
* @param object aLocation
|
||||
* An object containing url, line and column number of the message source (destructured).
|
||||
* An object containing url, line and column number of the message
|
||||
* source (destructured).
|
||||
* @param string target [optional]
|
||||
* Tells which tool to open the link with, on click. Supported tools:
|
||||
* jsdebugger, styleeditor, scratchpad.
|
||||
@ -2485,7 +2516,8 @@ WebConsoleFrame.prototype = {
|
||||
}
|
||||
|
||||
filenameNode.className = "filename";
|
||||
filenameNode.textContent = " " + (filename || l10n.getStr("unknownLocation"));
|
||||
filenameNode.textContent =
|
||||
" " + (filename || l10n.getStr("unknownLocation"));
|
||||
locationNode.appendChild(filenameNode);
|
||||
|
||||
locationNode.href = isScratchpad || !fullURL ? "#" : fullURL;
|
||||
@ -2522,7 +2554,8 @@ WebConsoleFrame.prototype = {
|
||||
if (line) {
|
||||
let lineNumberNode = this.document.createElementNS(XHTML_NS, "span");
|
||||
lineNumberNode.className = "line-number";
|
||||
lineNumberNode.textContent = ":" + line + (column >= 0 ? ":" + column : "");
|
||||
lineNumberNode.textContent =
|
||||
":" + line + (column >= 0 ? ":" + column : "");
|
||||
locationNode.appendChild(lineNumberNode);
|
||||
locationNode.sourceLine = line;
|
||||
}
|
||||
@ -2546,7 +2579,8 @@ WebConsoleFrame.prototype = {
|
||||
messageNode.severity = severity;
|
||||
messageNode.setAttribute("category", CATEGORY_CLASS_FRAGMENTS[category]);
|
||||
messageNode.setAttribute("severity", SEVERITY_CLASS_FRAGMENTS[severity]);
|
||||
messageNode.setAttribute("filter", MESSAGE_PREFERENCE_KEYS[category][severity]);
|
||||
messageNode.setAttribute("filter",
|
||||
MESSAGE_PREFERENCE_KEYS[category][severity]);
|
||||
},
|
||||
|
||||
/**
|
||||
@ -2609,8 +2643,8 @@ WebConsoleFrame.prototype = {
|
||||
|
||||
// If this event started with a mousedown event and it ends at a different
|
||||
// location, we consider this text selection.
|
||||
// Add a fuzz modifier of two pixels in any direction to account for sloppy
|
||||
// clicking.
|
||||
// Add a fuzz modifier of two pixels in any direction to account for
|
||||
// sloppy clicking.
|
||||
if (mousedown &&
|
||||
(Math.abs(event.clientX - this._startX) >= 2) &&
|
||||
(Math.abs(event.clientY - this._startY) >= 1)) {
|
||||
@ -2798,7 +2832,6 @@ WebConsoleFrame.prototype = {
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @see VariablesView.simpleValueEvalMacro
|
||||
*/
|
||||
@ -2806,7 +2839,6 @@ function simpleValueEvalMacro(item, currentString) {
|
||||
return VariablesView.simpleValueEvalMacro(item, currentString, "_self");
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @see VariablesView.overrideValueEvalMacro
|
||||
*/
|
||||
@ -2814,7 +2846,6 @@ function overrideValueEvalMacro(item, currentString) {
|
||||
return VariablesView.overrideValueEvalMacro(item, currentString, "_self");
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @see VariablesView.getterOrSetterEvalMacro
|
||||
*/
|
||||
@ -2822,8 +2853,6 @@ function getterOrSetterEvalMacro(item, currentString) {
|
||||
return VariablesView.getterOrSetterEvalMacro(item, currentString, "_self");
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Create a JSTerminal (a JavaScript command line). This is attached to an
|
||||
* existing HeadsUpDisplay (a Web Console instance). This code is responsible
|
||||
@ -2863,21 +2892,23 @@ JSTerm.prototype = {
|
||||
this.history = [];
|
||||
this.historyIndex = this.historyPlaceHolder = 0;
|
||||
|
||||
this.historyLoaded = asyncStorage.getItem("webConsoleHistory").then(value => {
|
||||
if (Array.isArray(value)) {
|
||||
// Since it was gotten asynchronously, there could be items already in
|
||||
// the history. It's not likely but stick them onto the end anyway.
|
||||
this.history = value.concat(this.history);
|
||||
this.historyLoaded = asyncStorage.getItem("webConsoleHistory")
|
||||
.then(value => {
|
||||
if (Array.isArray(value)) {
|
||||
// Since it was gotten asynchronously, there could be items already in
|
||||
// the history. It's not likely but stick them onto the end anyway.
|
||||
this.history = value.concat(this.history);
|
||||
|
||||
// Holds the number of entries in history. This value is incremented in
|
||||
// this.execute().
|
||||
this.historyIndex = this.history.length;
|
||||
// Holds the number of entries in history. This value is incremented
|
||||
// in this.execute().
|
||||
this.historyIndex = this.history.length;
|
||||
|
||||
// Holds the index of the history entry that the user is currently viewing.
|
||||
// This is reset to this.history.length when this.execute() is invoked.
|
||||
this.historyPlaceHolder = this.history.length;
|
||||
}
|
||||
}, console.error);
|
||||
// Holds the index of the history entry that the user is currently
|
||||
// viewing. This is reset to this.history.length when this.execute()
|
||||
// is invoked.
|
||||
this.historyPlaceHolder = this.history.length;
|
||||
}
|
||||
}, console.error);
|
||||
},
|
||||
|
||||
/**
|
||||
@ -3045,9 +3076,9 @@ JSTerm.prototype = {
|
||||
} else {
|
||||
let okstring = l10n.getStr("selfxss.okstring");
|
||||
let msg = l10n.getFormatStr("selfxss.msg", [okstring]);
|
||||
this._onPaste = WebConsoleUtils.pasteHandlerGen(this.inputNode,
|
||||
doc.getElementById("webconsole-notificationbox"),
|
||||
msg, okstring);
|
||||
this._onPaste = WebConsoleUtils.pasteHandlerGen(
|
||||
this.inputNode, doc.getElementById("webconsole-notificationbox"),
|
||||
msg, okstring);
|
||||
this.inputNode.addEventListener("keypress", this._keyPress, false);
|
||||
this.inputNode.addEventListener("paste", this._onPaste);
|
||||
this.inputNode.addEventListener("drop", this._onPaste);
|
||||
@ -3101,7 +3132,8 @@ JSTerm.prototype = {
|
||||
break;
|
||||
case "inspectObject":
|
||||
this.openVariablesView({
|
||||
label: VariablesView.getString(helperResult.object, { concise: true }),
|
||||
label:
|
||||
VariablesView.getString(helperResult.object, { concise: true }),
|
||||
objectActor: helperResult.object,
|
||||
});
|
||||
break;
|
||||
@ -3238,9 +3270,9 @@ JSTerm.prototype = {
|
||||
* user-selected stackframe.
|
||||
* If you do not provide a |frame| the string will be evaluated in the
|
||||
* global content window.
|
||||
* - selectedNodeActor: tells the NodeActor ID of the current selection in
|
||||
* the Inspector, if such a selection exists. This is used by helper
|
||||
* functions that can evaluate on the current selection.
|
||||
* - selectedNodeActor: tells the NodeActor ID of the current selection
|
||||
* in the Inspector, if such a selection exists. This is used by
|
||||
* helper functions that can evaluate on the current selection.
|
||||
* @return object
|
||||
* A promise object that is resolved when the server response is
|
||||
* received.
|
||||
@ -3427,7 +3459,7 @@ JSTerm.prototype = {
|
||||
if (event.keyCode != Ci.nsIDOMKeyEvent.DOM_VK_ESCAPE || event.shiftKey ||
|
||||
event.altKey || event.ctrlKey || event.metaKey ||
|
||||
["input", "textarea", "select", "textbox"].indexOf(tag) > -1) {
|
||||
return;
|
||||
return;
|
||||
}
|
||||
|
||||
this._sidebarDestroy();
|
||||
@ -3524,8 +3556,8 @@ JSTerm.prototype = {
|
||||
} else if (options.rawObject) {
|
||||
view._consoleLastObjectActor = null;
|
||||
} else {
|
||||
throw new Error("Variables View cannot open without giving it an object " +
|
||||
"display.");
|
||||
throw new Error(
|
||||
"Variables View cannot open without giving it an object display.");
|
||||
}
|
||||
|
||||
expanded.then(() => {
|
||||
@ -3576,8 +3608,8 @@ JSTerm.prototype = {
|
||||
bindObjectActor: options.objectActor.actor,
|
||||
};
|
||||
|
||||
this.requestEvaluation("delete _self" + variableObject.symbolicName, evalOptions)
|
||||
.then(onEval, onEval);
|
||||
this.requestEvaluation("delete _self" +
|
||||
variableObject.symbolicName, evalOptions).then(onEval, onEval);
|
||||
},
|
||||
|
||||
/**
|
||||
@ -3601,13 +3633,15 @@ JSTerm.prototype = {
|
||||
bindObjectActor: options.objectActor.actor,
|
||||
};
|
||||
|
||||
let newSymbolicName = variableObject.ownerView.symbolicName + '["' + newName + '"]';
|
||||
let newSymbolicName =
|
||||
variableObject.ownerView.symbolicName + '["' + newName + '"]';
|
||||
if (newSymbolicName == variableObject.symbolicName) {
|
||||
return;
|
||||
}
|
||||
|
||||
let code = "_self" + newSymbolicName + " = _self" + variableObject.symbolicName + ";" +
|
||||
"delete _self" + variableObject.symbolicName;
|
||||
let code = "_self" + newSymbolicName + " = _self" +
|
||||
variableObject.symbolicName + ";" + "delete _self" +
|
||||
variableObject.symbolicName;
|
||||
|
||||
this.requestEvaluation(code, evalOptions).then(onEval, onEval);
|
||||
},
|
||||
@ -3664,7 +3698,6 @@ JSTerm.prototype = {
|
||||
callback && callback(response);
|
||||
},
|
||||
|
||||
|
||||
/**
|
||||
* Clear the Web Console output.
|
||||
*
|
||||
@ -3799,7 +3832,7 @@ JSTerm.prototype = {
|
||||
let lineEndPos = inputValue.length;
|
||||
if (this.hasMultilineInput()) {
|
||||
// find index of closest newline >= cursor
|
||||
for (let i = inputNode.selectionEnd; i<lineEndPos; i++) {
|
||||
for (let i = inputNode.selectionEnd; i < lineEndPos; i++) {
|
||||
if (inputValue.charAt(i) == "\r" ||
|
||||
inputValue.charAt(i) == "\n") {
|
||||
lineEndPos = i;
|
||||
@ -3820,9 +3853,9 @@ JSTerm.prototype = {
|
||||
this.canCaretGoNext() &&
|
||||
this.historyPeruse(HISTORY_FORWARD)) {
|
||||
event.preventDefault();
|
||||
// Ctrl-N is also used to focus the Network category button on MacOSX.
|
||||
// The preventDefault() call doesn't prevent the focus from moving
|
||||
// away from the input.
|
||||
// Ctrl-N is also used to focus the Network category button on
|
||||
// MacOSX. The preventDefault() call doesn't prevent the focus
|
||||
// from moving away from the input.
|
||||
inputNode.focus();
|
||||
}
|
||||
this.clearCompletion();
|
||||
@ -3951,10 +3984,12 @@ JSTerm.prototype = {
|
||||
|
||||
case Ci.nsIDOMKeyEvent.DOM_VK_END:
|
||||
if (this.autocompletePopup.isOpen) {
|
||||
this.autocompletePopup.selectedIndex = this.autocompletePopup.itemCount - 1;
|
||||
this.autocompletePopup.selectedIndex =
|
||||
this.autocompletePopup.itemCount - 1;
|
||||
event.preventDefault();
|
||||
} else if (inputValue.length <= 0) {
|
||||
this.hud.outputWrapper.scrollTop = this.hud.outputWrapper.scrollHeight;
|
||||
this.hud.outputWrapper.scrollTop =
|
||||
this.hud.outputWrapper.scrollHeight;
|
||||
event.preventDefault();
|
||||
}
|
||||
break;
|
||||
@ -4033,14 +4068,14 @@ JSTerm.prototype = {
|
||||
// the user is already at the last entry.
|
||||
// Note: this code does not store changes to items that are already in
|
||||
// history.
|
||||
if (this.historyPlaceHolder+1 == this.historyIndex) {
|
||||
if (this.historyPlaceHolder + 1 == this.historyIndex) {
|
||||
this.history[this.historyIndex] = this.getInputValue() || "";
|
||||
}
|
||||
|
||||
this.setInputValue(inputVal);
|
||||
} else if (direction == HISTORY_FORWARD) {
|
||||
// Down Arrow key
|
||||
if (this.historyPlaceHolder >= (this.history.length-1)) {
|
||||
if (this.historyPlaceHolder >= (this.history.length - 1)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -4120,16 +4155,17 @@ JSTerm.prototype = {
|
||||
* - this.COMPLETE_BACKWARD: Same as this.COMPLETE_FORWARD but if the
|
||||
* value stayed the same as the last time the function was called,
|
||||
* then the previous completion of all possible completions is used.
|
||||
* - this.COMPLETE_PAGEUP: Scroll up one page if available or select the first
|
||||
* item.
|
||||
* - this.COMPLETE_PAGEDOWN: Scroll down one page if available or select the
|
||||
* last item.
|
||||
* - this.COMPLETE_PAGEUP: Scroll up one page if available or select the
|
||||
* first item.
|
||||
* - this.COMPLETE_PAGEDOWN: Scroll down one page if available or select
|
||||
* the last item.
|
||||
* - this.COMPLETE_HINT_ONLY: If there is more than one possible
|
||||
* completion and the input value stayed the same compared to the
|
||||
* last time this function was called, then the same completion is
|
||||
* used again. If there is only one possible completion, then
|
||||
* the this.getInputValue() is set to this value and the selection is set
|
||||
* from the current cursor position to the end of the completed text.
|
||||
* the this.getInputValue() is set to this value and the selection
|
||||
* is set from the current cursor position to the end of the
|
||||
* completed text.
|
||||
* @param function callback
|
||||
* Optional function invoked when the autocomplete properties are
|
||||
* updated.
|
||||
@ -4158,7 +4194,8 @@ JSTerm.prototype = {
|
||||
}
|
||||
|
||||
// Update the completion results.
|
||||
if (this.lastCompletion.value != inputValue || frameActor != this._lastFrameActorId) {
|
||||
if (this.lastCompletion.value != inputValue ||
|
||||
frameActor != this._lastFrameActorId) {
|
||||
this._updateCompletionResult(type, callback);
|
||||
return false;
|
||||
}
|
||||
@ -4250,10 +4287,11 @@ JSTerm.prototype = {
|
||||
value: null,
|
||||
};
|
||||
|
||||
let autocompleteCallback = this._receiveAutocompleteProperties.bind(this, requestId,
|
||||
callback);
|
||||
let autocompleteCallback =
|
||||
this._receiveAutocompleteProperties.bind(this, requestId, callback);
|
||||
|
||||
this.webConsoleClient.autocomplete(input, cursor, autocompleteCallback, frameActor);
|
||||
this.webConsoleClient.autocomplete(
|
||||
input, cursor, autocompleteCallback, frameActor);
|
||||
},
|
||||
|
||||
/**
|
||||
@ -4276,7 +4314,8 @@ JSTerm.prototype = {
|
||||
requestId != this.lastCompletion.requestId) {
|
||||
return;
|
||||
}
|
||||
// Cache whatever came from the server if the last char is alphanumeric or '.'
|
||||
// Cache whatever came from the server if the last char is
|
||||
// alphanumeric or '.'
|
||||
let cursor = inputNode.selectionStart;
|
||||
let inputUntilCursor = inputValue.substring(0, cursor);
|
||||
|
||||
@ -4382,7 +4421,8 @@ JSTerm.prototype = {
|
||||
matchProp.length);
|
||||
let cursor = this.inputNode.selectionStart;
|
||||
let value = this.getInputValue();
|
||||
this.setInputValue(value.substr(0, cursor) + suffix + value.substr(cursor));
|
||||
this.setInputValue(value.substr(0, cursor) +
|
||||
suffix + value.substr(cursor));
|
||||
let newCursor = cursor + suffix.length;
|
||||
this.inputNode.selectionStart = this.inputNode.selectionEnd = newCursor;
|
||||
updated = true;
|
||||
@ -4405,7 +4445,6 @@ JSTerm.prototype = {
|
||||
this.completeNode.value = prefix + suffix;
|
||||
},
|
||||
|
||||
|
||||
/**
|
||||
* Destroy the sidebar.
|
||||
* @private
|
||||
@ -4548,9 +4587,9 @@ var Utils = {
|
||||
},
|
||||
};
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// ////////////////////////////////////////////////////////////////////////////
|
||||
// CommandController
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// ////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
/**
|
||||
* A controller (an instance of nsIController) that makes editing actions
|
||||
@ -4603,8 +4642,9 @@ CommandController.prototype = {
|
||||
return selectedItem && "url" in selectedItem;
|
||||
}
|
||||
case "cmd_copy": {
|
||||
// Only copy if we right-clicked the console and there's no selected text.
|
||||
// With text selected, we want to fall back onto the default copy behavior.
|
||||
// Only copy if we right-clicked the console and there's no selected
|
||||
// text. With text selected, we want to fall back onto the default
|
||||
// copy behavior.
|
||||
return this.owner._contextMenuHandler.lastClickedMessage &&
|
||||
!this.owner.output.getSelectedMessages(1)[0];
|
||||
}
|
||||
@ -4657,9 +4697,9 @@ CommandController.prototype = {
|
||||
}
|
||||
};
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// ////////////////////////////////////////////////////////////////////////////
|
||||
// Web Console connection proxy
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// ////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
/**
|
||||
* The WebConsoleConnectionProxy handles the connection between the Web Console
|
||||
@ -4687,7 +4727,8 @@ function WebConsoleConnectionProxy(webConsoleFrame, target) {
|
||||
this._onAttachConsole = this._onAttachConsole.bind(this);
|
||||
this._onCachedMessages = this._onCachedMessages.bind(this);
|
||||
this._connectionTimeout = this._connectionTimeout.bind(this);
|
||||
this._onLastPrivateContextExited = this._onLastPrivateContextExited.bind(this);
|
||||
this._onLastPrivateContextExited =
|
||||
this._onLastPrivateContextExited.bind(this);
|
||||
}
|
||||
|
||||
WebConsoleConnectionProxy.prototype = {
|
||||
@ -4791,7 +4832,8 @@ WebConsoleConnectionProxy.prototype = {
|
||||
client.addListener("fileActivity", this._onFileActivity);
|
||||
client.addListener("reflowActivity", this._onReflowActivity);
|
||||
client.addListener("serverLogCall", this._onServerLogCall);
|
||||
client.addListener("lastPrivateContextExited", this._onLastPrivateContextExited);
|
||||
client.addListener("lastPrivateContextExited",
|
||||
this._onLastPrivateContextExited);
|
||||
}
|
||||
this.target.on("will-navigate", this._onTabNavigated);
|
||||
this.target.on("navigate", this._onTabNavigated);
|
||||
@ -4886,7 +4928,8 @@ WebConsoleConnectionProxy.prototype = {
|
||||
Cu.reportError("Web Console getCachedMessages error: invalid state.");
|
||||
}
|
||||
|
||||
let messages = response.messages.concat(...this.webConsoleClient.getNetworkEvents());
|
||||
let messages =
|
||||
response.messages.concat(...this.webConsoleClient.getNetworkEvents());
|
||||
messages.sort((a, b) => a.timeStamp - b.timeStamp);
|
||||
|
||||
this.webConsoleFrame.displayCachedMessages(messages);
|
||||
@ -5089,7 +5132,8 @@ WebConsoleConnectionProxy.prototype = {
|
||||
this.client.removeListener("fileActivity", this._onFileActivity);
|
||||
this.client.removeListener("reflowActivity", this._onReflowActivity);
|
||||
this.client.removeListener("serverLogCall", this._onServerLogCall);
|
||||
this.client.removeListener("lastPrivateContextExited", this._onLastPrivateContextExited);
|
||||
this.client.removeListener("lastPrivateContextExited",
|
||||
this._onLastPrivateContextExited);
|
||||
this.webConsoleClient.off("networkEvent", this._onNetworkEvent);
|
||||
this.webConsoleClient.off("networkEventUpdate", this._onNetworkEventUpdate);
|
||||
this.target.off("will-navigate", this._onTabNavigated);
|
||||
@ -5111,9 +5155,9 @@ function gSequenceId() {
|
||||
}
|
||||
gSequenceId.n = 0;
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// ////////////////////////////////////////////////////////////////////////////
|
||||
// Context Menu
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// ////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
/*
|
||||
* ConsoleContextMenu this used to handle the visibility of context menu items.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user