Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 05:15:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 759135 - Move a __proto__ property at the bottom of the list; r=rcampbell

Browse Source
This commit is contained in:
Victor Porof 2012-05-30 12:11:55 +03:00
parent 5a7af100f4
commit 023b1c09fc
2 changed files with 45 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
browser/devtools/debugger/debugger-controller.js
View File

@ -661,15 +661,6 @@ StackFrames.prototype = {
let objClient = this.activeThread.pauseGrip(aObject);
objClient.getPrototypeAndProperties(function SF_onProtoAndProps(aResponse) {
// Add __proto__.
if (aResponse.prototype.type !== "null") {
let properties = { "__proto__ ": { value: aResponse.prototype } };
aVar.addProperties(properties);
// Expansion handlers must be set after the properties are added.
this._addExpander(aVar["__proto__ "], aResponse.prototype);
}
// Sort all of the properties before adding them, for better UX.
let properties = {};
for each (let prop in Object.keys(aResponse.ownProperties).sort()) {
@ -682,6 +673,14 @@ StackFrames.prototype = {
this._addExpander(aVar[prop], aResponse.ownProperties[prop].value);
}
// Add __proto__.
if (aResponse.prototype.type !== "null") {
let properties = { "__proto__ ": { value: aResponse.prototype } };
aVar.addProperties(properties);
// Expansion handlers must be set after the properties are added.
this._addExpander(aVar["__proto__ "], aResponse.prototype);
}
aVar.fetched = true;
}.bind(this));
},

59
browser/devtools/debugger/test/browser_dbg_propertyview-08.js
View File

@ -79,36 +79,51 @@ function testFrameParameters()
}
window.clearInterval(intervalID);
is(localNodes[0].querySelector(".property > .title > .key")
.getAttribute("value"), "__proto__",
"Should have the right property name for __proto__.");
.getAttribute("value"), "Array",
"Should have the right property name for Array.");
ok(localNodes[0].querySelector(".property > .title > .value")
.getAttribute("value").search(/object/) != -1,
"Array should be an object.");
is(localNodes[8].querySelector(".value")
.getAttribute("value"), "[object Arguments]",
"Should have the right property value for 'arguments'.");
ok(localNodes[8].querySelector(".property > .title > .value")
.getAttribute("value").search(/object/) != -1,
"Arguments should be an object.");
is(localNodes[8].querySelectorAll(".property > .title > .key")[7]
.getAttribute("value"), "__proto__",
"Should have the right property name for '__proto__'.");
ok(localNodes[8].querySelectorAll(".property > .title > .value")[7]
.getAttribute("value").search(/object/) != -1,
"__proto__ should be an object.");
is(localNodes[8].querySelector(".value").getAttribute("value"),
"[object Arguments]",
"Should have the right property value for 'arguments'.");
is(localNodes[8].querySelectorAll(".property > .title > .key")[7]
.getAttribute("value"), "length",
"Should have the right property name for 'length'.");
is(localNodes[8].querySelectorAll(".property > .title > .value")[7]
.getAttribute("value"), 5,
"Should have the right argument length.");
is(localNodes[10].querySelector(".value").getAttribute("value"), "[object Object]",
is(localNodes[10].querySelector(".value")
.getAttribute("value"), "[object Object]",
"Should have the right property value for 'c'.");
is(localNodes[10].querySelectorAll(".property > .title > .key")[1]
.getAttribute("value"), "a",
"Should have the right property name for 'a'.");
is(localNodes[10].querySelectorAll(".property > .title > .value")[1]
.getAttribute("value"), 1,
is(localNodes[10].querySelectorAll(".property > .title > .key")[0]
.getAttribute("value"), "a",
"Should have the right property name for 'c.a'.");
is(localNodes[10].querySelectorAll(".property > .title > .value")[0]
.getAttribute("value"), "1",
"Should have the right value for 'c.a'.");
is(localNodes[10].querySelectorAll(".property > .title > .key")[1]
.getAttribute("value"), "b",
"Should have the right property name for 'c.b'.");
is(localNodes[10].querySelectorAll(".property > .title > .value")[1]
.getAttribute("value"), "\"beta\"",
"Should have the right value for 'c.b'.");
is(localNodes[10].querySelectorAll(".property > .title > .key")[2]
.getAttribute("value"), "c",
"Should have the right property name for 'c.c'.");
is(localNodes[10].querySelectorAll(".property > .title > .value")[2]
.getAttribute("value"), "true",
"Should have the right value for 'c.c'.");
resumeAndFinish();
}, 100);
}}, 0);