Bug 663778 - Misc fixes r=pbrosset

This commit is contained in:
Michael Ratcliffe 2014-03-13 15:46:37 +00:00
Родитель 840ab7e623
Коммит b675040bec
5 изменённых файлов: 13 добавлений и 8 удалений

Просмотреть файл

@ -699,7 +699,7 @@ HTMLBreadcrumbs.prototype = {
this.selectionGuardEnd(err); this.selectionGuardEnd(err);
}); });
} }
} };
XPCOMUtils.defineLazyGetter(this, "DOMUtils", function () { XPCOMUtils.defineLazyGetter(this, "DOMUtils", function () {
return Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils); return Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);

Просмотреть файл

@ -1545,8 +1545,6 @@ MarkupContainer.prototype = {
// Remove event listeners // Remove event listeners
this.elt.removeEventListener("dblclick", this._onToggle, false); this.elt.removeEventListener("dblclick", this._onToggle, false);
this.elt.removeEventListener("mouseover", this._onMouseOver, false);
this.elt.removeEventListener("mouseout", this._onMouseOut, false);
this.elt.removeEventListener("mousedown", this._onMouseDown, false); this.elt.removeEventListener("mousedown", this._onMouseDown, false);
this.expander.removeEventListener("click", this._onToggle, false); this.expander.removeEventListener("click", this._onToggle, false);

Просмотреть файл

@ -32,8 +32,7 @@ const CM_STYLES = [
"chrome://browser/skin/devtools/common.css", "chrome://browser/skin/devtools/common.css",
"chrome://browser/content/devtools/codemirror/codemirror.css", "chrome://browser/content/devtools/codemirror/codemirror.css",
"chrome://browser/content/devtools/codemirror/dialog.css", "chrome://browser/content/devtools/codemirror/dialog.css",
"chrome://browser/content/devtools/codemirror/mozilla.css", "chrome://browser/content/devtools/codemirror/mozilla.css"
"chrome://browser/content/devtools/codemirror/foldgutter.css"
]; ];
const CM_SCRIPTS = [ const CM_SCRIPTS = [

Просмотреть файл

@ -135,7 +135,7 @@ RuleViewTool.prototype = {
delete this.doc; delete this.doc;
delete this.inspector; delete this.inspector;
} }
} };
function ComputedViewTool(aInspector, aWindow, aIFrame) function ComputedViewTool(aInspector, aWindow, aIFrame)
{ {

Просмотреть файл

@ -1194,7 +1194,7 @@ var WalkerActor = protocol.ActorClass({
// make it easier. // make it easier.
let filteredWalker = (node) => { let filteredWalker = (node) => {
return documentWalker(node, this.rootWin, options.whatToShow); return documentWalker(node, this.rootWin, options.whatToShow);
} };
// Need to know the first and last child. // Need to know the first and last child.
let rawNode = node.rawNode; let rawNode = node.rawNode;
@ -1385,7 +1385,15 @@ var WalkerActor = protocol.ActorClass({
* @param string selector * @param string selector
*/ */
querySelectorAll: method(function(baseNode, selector) { querySelectorAll: method(function(baseNode, selector) {
return new NodeListActor(this, baseNode.rawNode.querySelectorAll(selector)); let nodeList = null;
try {
nodeList = baseNode.rawNode.querySelectorAll(selector);
} catch(e) {
// Bad selector. Do nothing as the selector can come from a searchbox.
}
return new NodeListActor(this, nodeList);
}, { }, {
request: { request: {
node: Arg(0, "domnode"), node: Arg(0, "domnode"),