Backout 86b5d8778fc4,fab07b9d6dee,89a059433037,bbb54cde82c3 (bug 897960) due to orange

This commit is contained in:
Blair McBride
2013-09-09 12:45:31 +12:00
parent e94d12b4b2
commit b059ed329c
19 changed files with 141 additions and 244 deletions

View File

@@ -53,8 +53,6 @@ function MarkupView(aInspector, aFrame, aControllerWindow)
this.doc = this._frame.contentDocument;
this._elt = this.doc.querySelector("#root");
this.layoutHelpers = new LayoutHelpers(this.doc.defaultView);
try {
this.maxChildren = Services.prefs.getIntPref("devtools.markup.pagesize");
} catch(ex) {
@@ -408,7 +406,7 @@ MarkupView.prototype = {
return this._ensureVisible(aNode);
}).then(() => {
// Why is this not working?
this.layoutHelpers.scrollIntoViewIfNeeded(this._containers.get(aNode).editor.elt, centered);
LayoutHelpers.scrollIntoViewIfNeeded(this._containers.get(aNode).editor.elt, centered);
});
},
@@ -1233,7 +1231,7 @@ ElementEditor.prototype = {
// Double quotes need to be handled specially to prevent DOMParser failing.
// name="v"a"l"u"e" when editing -> name='v"a"l"u"e"'
// name="v'a"l'u"e" when editing -> name="v'a"l'u"e"
let editValueDisplayed = aAttr.value || "";
let editValueDisplayed = aAttr.value;
let hasDoubleQuote = editValueDisplayed.contains('"');
let hasSingleQuote = editValueDisplayed.contains("'");
let initial = aAttr.name + '="' + editValueDisplayed + '"';