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 1142194 - fix quoteString to correctly quote. r=pbrosset

Browse Source
This commit is contained in:
Tom Tromey 2015-03-18 08:12:00 +01:00
parent 1ba4722af8
commit 6e154c1df1
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
browser/devtools/styleinspector/css-parsing-utils.js
View File

@ -15,14 +15,26 @@ function quoteString(string) {
let hasDoubleQuotes = string.contains('"'); let hasDoubleQuotes = string.contains('"');
let hasSingleQuotes = string.contains("'"); let hasSingleQuotes = string.contains("'");
let quote = '"';
if (hasDoubleQuotes && !hasSingleQuotes) { if (hasDoubleQuotes && !hasSingleQuotes) {
// In this case, no escaping required, just enclose in single-quotes quote = "'";
return "'" + string + "'";
} }
// In all other cases, enclose in double-quotes, and escape any double-quote // Quote special characters as specified by the CSS grammar.
// that may be in the string // See http://www.w3.org/TR/CSS2/syndata.html#tokenization
return '"' + string.replace(/"/g, '\"') + '"'; // and http://www.w3.org/TR/CSS2/syndata.html#strings
return quote +
string.replace(/[\\"]/g, match => {
switch (match) {
case '\\':
return '\\\\';
case '"':
if (quote == '"')
return '\\"';
return match;
}
}) +
quote;
} }
/** /**

2
browser/devtools/styleinspector/test/unit/test_parseDeclarations.js
View File

@ -155,7 +155,7 @@ const TEST_DATA = [
{input: 'content: "this is a \\"string\\""', expected: [{name: "content", value: '\'this is a "string"\'', priority: ""}]}, {input: 'content: "this is a \\"string\\""', expected: [{name: "content", value: '\'this is a "string"\'', priority: ""}]},
{input: "content: 'this is a \"string\"'", expected: [{name: "content", value: '\'this is a "string"\'', priority: ""}]}, {input: "content: 'this is a \"string\"'", expected: [{name: "content", value: '\'this is a "string"\'', priority: ""}]},
{input: "content: 'this is a \\'string\\'", expected: [{name: "content", value: '"this is a \'string\'"', priority: ""}]}, {input: "content: 'this is a \\'string\\'", expected: [{name: "content", value: '"this is a \'string\'"', priority: ""}]},
{input: "content: 'this \\' is a \" really strange string'", expected: [{name: "content", value: '"this \' is a \" really strange string"', priority: ""}]}, {input: "content: 'this \\' is a \" really strange string'", expected: [{name: "content", value: '"this \' is a \\\" really strange string"', priority: ""}]},
{ {
input: "content: \"a not s\\\ input: "content: \"a not s\\\
o very long title\"", o very long title\"",

7
browser/devtools/styleinspector/test/unit/test_parseSingleValue.js
View File

@ -47,6 +47,13 @@ const TEST_DATA = [
value: "\"content!important\"", value: "\"content!important\"",
priority: "" priority: ""
} }
},
{
input: "\"all the \\\"'\\\\ special characters\"",
expected: {
value: "\"all the \\\"'\\\\ special characters\"",
priority: ""
}
} }
]; ];