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

Backed out changeset e62454ab7c04 (bug 893677) for mochitest-bc timeouts.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-09-12 18:09:56 -04:00
parent dbccea7742
commit 5837a789a9
3 changed files with 1 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
browser/devtools/markupview/markup-view.js
View File

@ -10,9 +10,6 @@ const {Cc, Cu, Ci} = require("chrome");
const PAGE_SIZE = 10;
const PREVIEW_AREA = 700;
const DEFAULT_MAX_CHILDREN = 100;
const COLLAPSE_ATTRIBUTE_LENGTH = 120;
const COLLAPSE_DATA_URL_REGEX = /^data.+base64/;
const COLLAPSE_DATA_URL_LENGTH = 60;
const {UndoStack} = require("devtools/shared/undo");
const {editableField, InplaceEditor} = require("devtools/shared/inplace-editor");
@ -1368,16 +1365,8 @@ ElementEditor.prototype = {
this.attrs[aAttr.name] = attr;
let collapsedValue;
if (aAttr.value.match(COLLAPSE_DATA_URL_REGEX)) {
collapsedValue = truncateString(aAttr.value, COLLAPSE_DATA_URL_LENGTH);
}
else {
collapsedValue = truncateString(aAttr.value, COLLAPSE_ATTRIBUTE_LENGTH);
}
name.textContent = aAttr.name;
val.textContent = collapsedValue;
val.textContent = aAttr.value;
return attr;
},
@ -1478,15 +1467,6 @@ function nodeDocument(node) {
return node.ownerDocument || (node.nodeType == Ci.nsIDOMNode.DOCUMENT_NODE ? node : null);
}
function truncateString(str, maxLength) {
if (str.length <= maxLength) {
return str;
}
return str.substring(0, Math.ceil(maxLength / 2)) +
"…" +
str.substring(str.length - Math.floor(maxLength / 2));
}
/**
* Parse attribute names and values from a string.
*

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

@ -42,7 +42,5 @@
<div id="node25"></div>
<div id="node26" style='background-image: url("moz-page-thumb://thumbnail?url=http%3A%2F%2Fwww.mozilla.org%2F");'></div>
<div id="node27" class="Double &quot; and single &apos;"></div>
<img id="node-data-url" />
<div id="node-data-url-style"></div>
</body>
</html>

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

@ -34,15 +34,6 @@ function test() {
// Holds the MarkupTool object we're testing.
let markup;
let LONG_ATTRIBUTE = "ABCDEFGHIJKLMNOPQRSTUVWXYZ-ABCDEFGHIJKLMNOPQRSTUVWXYZ-ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ-ABCDEFGHIJKLMNOPQRSTUVWXYZ-ABCDEFGHIJKLMNOPQRSTUVWXYZ";
let LONG_ATTRIBUTE_COLLAPSED = "ABCDEFGHIJKLMNOPQRSTUVWXYZ-ABCDEFGHIJKLMNOPQRSTUVWXYZ-ABCDEF\u2026UVWXYZ-ABCDEFGHIJKLMNOPQRSTUVWXYZ-ABCDEFGHIJKLMNOPQRSTUVWXYZ";
let DATA_URL_INLINE_STYLE='color: red; background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC");';
let DATA_URL_INLINE_STYLE_COLLAPSED='color: red; background: url("data:image/png;base64,iVBORw0KG\u2026NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC");';
let DATA_URL_ATTRIBUTE = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC";
let DATA_URL_ATTRIBUTE_COLLAPSED = "data:image/png;base64,iVBORw0K\u20269/AFGGFyjOXZtQAAAAAElFTkSuQmCC";
/**
* Edit a given editableField
*/
@ -213,128 +204,6 @@ function test() {
}
},
{
desc: "Try to add long attribute to make sure it is collapsed in attribute editor.",
before: function() {
assertAttributes(doc.querySelector("#node24"), {
id: "node24",
class: ""
});
},
execute: function(after) {
let editor = getContainerForRawNode(markup, doc.querySelector("#node24")).editor;
let attr = editor.newAttr;
editField(attr, 'data-long="'+LONG_ATTRIBUTE+'"');
inspector.once("markupmutation", after);
},
after: function() {
let editor = getContainerForRawNode(markup, doc.querySelector("#node24")).editor;
let visibleAttrText = editor.attrs["data-long"].querySelector(".attrvalue").textContent;
is (visibleAttrText, LONG_ATTRIBUTE_COLLAPSED)
assertAttributes(doc.querySelector("#node24"), {
id: "node24",
class: "",
'data-long':LONG_ATTRIBUTE
});
}
},
{
desc: "Try to modify the collapsed long attribute, making sure it expands.",
before: function() {
assertAttributes(doc.querySelector("#node24"), {
id: "node24",
class: "",
'data-long': LONG_ATTRIBUTE
});
},
execute: function(after) {
let editor = getContainerForRawNode(markup, doc.querySelector("#node24")).editor;
let attr = editor.attrs["data-long"].querySelector(".editable");
// Check to make sure it has expanded after focus
attr.focus();
EventUtils.sendKey("return", inspector.panelWin);
let input = inplaceEditor(attr).input;
is (input.value, 'data-long="'+LONG_ATTRIBUTE+'"');
EventUtils.sendKey("escape", inspector.panelWin);
editField(attr, input.value + ' data-short="ABC"');
inspector.once("markupmutation", after);
},
after: function() {
let editor = getContainerForRawNode(markup, doc.querySelector("#node24")).editor;
let visibleAttrText = editor.attrs["data-long"].querySelector(".attrvalue").textContent;
is (visibleAttrText, LONG_ATTRIBUTE_COLLAPSED)
assertAttributes(doc.querySelector("#node24"), {
id: "node24",
class: "",
'data-long': LONG_ATTRIBUTE,
"data-short": "ABC"
});
}
},
{
desc: "Try to add long data URL to make sure it is collapsed in attribute editor.",
before: function() {
assertAttributes(doc.querySelector("#node-data-url"), {
id: "node-data-url"
});
},
execute: function(after) {
let editor = getContainerForRawNode(markup, doc.querySelector("#node-data-url")).editor;
let attr = editor.newAttr;
editField(attr, 'src="'+DATA_URL_ATTRIBUTE+'"');
inspector.once("markupmutation", after);
},
after: function() {
let editor = getContainerForRawNode(markup, doc.querySelector("#node-data-url")).editor;
let visibleAttrText = editor.attrs["src"].querySelector(".attrvalue").textContent;
is (visibleAttrText, DATA_URL_ATTRIBUTE_COLLAPSED);
let node = doc.querySelector("#node-data-url");
is (node.width, 16, "Image width has been set after data url src.");
is (node.height, 16, "Image height has been set after data url src.");
assertAttributes(node, {
id: "node-data-url",
"src": DATA_URL_ATTRIBUTE
});
}
},
{
desc: "Try to add long data URL to make sure it is collapsed in attribute editor.",
before: function() {
assertAttributes(doc.querySelector("#node-data-url-style"), {
id: "node-data-url-style"
});
},
execute: function(after) {
let editor = getContainerForRawNode(markup, doc.querySelector("#node-data-url-style")).editor;
let attr = editor.newAttr;
editField(attr, "style='"+DATA_URL_INLINE_STYLE+"'");
inspector.once("markupmutation", after);
},
after: function() {
let editor = getContainerForRawNode(markup, doc.querySelector("#node-data-url-style")).editor;
let visibleAttrText = editor.attrs["style"].querySelector(".attrvalue").textContent;
is (visibleAttrText, DATA_URL_INLINE_STYLE_COLLAPSED)
assertAttributes(doc.querySelector("#node-data-url-style"), {
id: "node-data-url-style",
'style':DATA_URL_INLINE_STYLE
});
}
},
{
desc: "Edit text",
before: function() {