wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 804400 - Inspector stops updating when badly formed attribute input is given in the markup panel. r=dcamp

Browse Source
This commit is contained in:
N Bosma 2012-10-31 18:30:37 +02:00
parent 901c1e8bf4
commit f0c95d0a08
3 changed files with 80 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
browser/devtools/markupview/MarkupView.jsm
View File

@ -867,7 +867,11 @@ function ElementEditor(aContainer, aNode)
return;
}
this._applyAttributes(aVal);
try {
this._applyAttributes(aVal);
} catch (x) {
return;
}
}.bind(this)
});
@ -962,11 +966,16 @@ ElementEditor.prototype = {
this.undo.startBatch();
// Remove the attribute stored in this editor and re-add any attributes
// parsed out of the input element.
this._removeAttribute(this.node, aAttr.name)
this._applyAttributes(aVal, attr);
this.undo.endBatch();
// parsed out of the input element. Restore original attribute if
// parsing fails.
this._removeAttribute(this.node, aAttr.name);
try {
this._applyAttributes(aVal, attr);
this.undo.endBatch();
} catch (e) {
this.undo.endBatch();
this.undo.undo();
}
}.bind(this)
});
@ -987,6 +996,7 @@ ElementEditor.prototype = {
* @param Element aAttrNode the attribute editor that created this
* set of attributes, used to place new attributes where the
* user put them.
* @throws SYNTAX_ERR if aValue is not well-formed.
*/
_applyAttributes: function EE__applyAttributes(aValue, aAttrNode)
{
@ -996,6 +1006,7 @@ ElementEditor.prototype = {
let parseTag = (this.node.namespaceURI.match(/svg/i) ? "svg" :
(this.node.namespaceURI.match(/mathml/i) ? "math" : "div"));
let parseText = "<" + parseTag + " " + aValue + "/>";
// Throws exception if parseText is not well-formed.
dummyNode.innerHTML = parseText;
let parsedNode = dummyNode.firstChild;

3
browser/devtools/markupview/test/browser_inspector_markup_edit.html
View File

@ -33,6 +33,9 @@
</div>
</div>
</div>
<div id="node22" class="unchanged"></div>
<div id="node23"></div>
<div id="node24"></div>
<div id="retag-me">
<div id="retag-me-2"></div>
</div>

60
browser/devtools/markupview/test/browser_inspector_markup_edit.js
View File

@ -73,6 +73,28 @@ function test() {
}
},
// Try change an attribute to a badly formed string
{
before: function() {
assertAttributes(doc.querySelector("#node22"), {
id: "node22",
class: "unchanged"
});
},
execute: function() {
let editor = markup.getContainer(doc.querySelector("#node22")).editor;
let attr = editor.attrs["class"].querySelector(".editable");
editField(attr, 'class="""');
},
after: function() {
assertAttributes(doc.querySelector("#node22"), {
id: "node22",
class: "unchanged"
});
}
},
// Remove an attribute
{
before: function() {
@ -114,6 +136,25 @@ function test() {
}
},
// Try add a badly formed attribute by clicking the empty space after a node
{
before: function() {
assertAttributes(doc.querySelector("#node23"), {
id: "node23",
});
},
execute: function() {
let editor = markup.getContainer(doc.querySelector("#node23")).editor;
let attr = editor.newAttr;
editField(attr, 'class="newclass" style="""');
},
after: function() {
assertAttributes(doc.querySelector("#node23"), {
id: "node23",
});
}
},
// Add attributes by adding to an existing attribute's entry
{
setup: function() {
@ -140,6 +181,25 @@ function test() {
}
},
// Try add attributes by adding to an existing attribute's entry
{
before: function() {
assertAttributes(doc.querySelector("#node24"), {
id: "node24",
});
},
execute: function() {
let editor = markup.getContainer(doc.querySelector("#node24")).editor;
let attr = editor.attrs["id"].querySelector(".editable");
editField(attr, attr.textContent + ' class="""');
},
after: function() {
assertAttributes(doc.querySelector("#node24"), {
id: "node24",
});
}
},
// Remove an element with the delete key
{
before: function() {