Skip to content

Commit

Permalink
Make HTMLEditor::ChangeSelectedHardLinesToList refer result of inse…
Browse files Browse the repository at this point in the history
…rting list item element rather than list element after inserting it

This is a simple mistake.  When it should refer inserting a list item element
result, it refers inserting a list element result instead.

Differential Revision: https://phabricator.services.mozilla.com/D137393

bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1752462
gecko-commit: 3f4641a4774ad51351311983ea6e4fe036b90aff
gecko-reviewers: m_kato
  • Loading branch information
masayuki-nakano authored and moz-wptsync-bot committed Feb 1, 2022
1 parent 6c63ae6 commit 34b9a71
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 1 deletion.
30 changes: 30 additions & 0 deletions editing/data/insertorderedlist.js
Original file line number Diff line number Diff line change
Expand Up @@ -690,4 +690,34 @@ var browserTests = [
"<ol style=\"font-family:times; color:rgb(0, 0, 255)\"><li>bar</li><li><span style=\"font-family:italic; color:rgb(0, 128, 0)\">[baz]</span></li></ol>",
[true],
{"insertorderedlist":[false,false,"false",false,true,"true"]}],
["{}",
[["insertorderedlist",""],["inserttext","abc"]],
["<ol><li>abc</li></ol>",
"<ol><li>abc<br></li></ol>"],
[true,true],
{"insertorderedlist":[false,false,"false",false,true,"true"]}],
["<div>{}</div>",
[["insertorderedlist",""],["inserttext","abc"]],
["<div><ol><li>abc</li></ol></div>",
"<div><ol><li>abc<br></li></ol></div>"],
[true,true],
{"insertorderedlist":[false,false,"false",false,true,"true"]}],
["<div>{}<br></div>",
[["insertorderedlist",""],["inserttext","abc"]],
["<div><ol><li>abc</li></ol></div>",
"<div><ol><li>abc<br></li></ol></div>"],
[true,true],
{"insertorderedlist":[false,false,"false",false,true,"true"]}],
["<p>{}</p>",
[["insertorderedlist",""],["inserttext","abc"]],
["<ol><li>abc</li></ol>",
"<ol><li>abc<br></li></ol>"],
[true,true],
{"insertorderedlist":[false,false,"false",false,true,"true"]}],
["<p>{}<br></p>",
[["insertorderedlist",""],["inserttext","abc"]],
["<ol><li>abc</li></ol>",
"<ol><li>abc<br></li></ol>"],
[true,true],
{"insertorderedlist":[false,false,"false",false,true,"true"]}],
]
32 changes: 31 additions & 1 deletion editing/data/insertunorderedlist.js
Original file line number Diff line number Diff line change
Expand Up @@ -739,5 +739,35 @@ var browserTests = [
[["defaultparagraphseparator","p"],["insertunorderedlist",""]],
"<ul>{<li style=\"font-size:1.3em\">1</li><li style=\"font-size:1.1em\">2</li>}</ul>",
[true,true],
{"defaultparagraphseparator":[false,false,"div",false,false,"p"],"insertunorderedlist":[false,false,"",false,true,""]}]
{"defaultparagraphseparator":[false,false,"div",false,false,"p"],"insertunorderedlist":[false,false,"",false,true,""]}],
["{}",
[["insertunorderedlist",""],["inserttext","abc"]],
["<ul><li>abc</li></ul>",
"<ul><li>abc<br></li></ul>"],
[true,true],
{"insertunorderedlist":[false,false,"false",false,true,"true"]}],
["<div>{}</div>",
[["insertunorderedlist",""],["inserttext","abc"]],
["<div><ul><li>abc</li></ul></div>",
"<div><ul><li>abc<br></li></ul></div>"],
[true,true],
{"insertunorderedlist":[false,false,"false",false,true,"true"]}],
["<div>{}<br></div>",
[["insertunorderedlist",""],["inserttext","abc"]],
["<div><ul><li>abc</li></ul></div>",
"<div><ul><li>abc<br></li></ul></div>"],
[true,true],
{"insertunorderedlist":[false,false,"false",false,true,"true"]}],
["<p>{}</p>",
[["insertunorderedlist",""],["inserttext","abc"]],
["<ul><li>abc</li></ul>",
"<ul><li>abc<br></li></ul>"],
[true,true],
{"insertunorderedlist":[false,false,"false",false,true,"true"]}],
["<p>{}<br></p>",
[["insertunorderedlist",""],["inserttext","abc"]],
["<ul><li>abc</li></ul>",
"<ul><li>abc<br></li></ul>"],
[true,true],
{"insertunorderedlist":[false,false,"false",false,true,"true"]}],
]

0 comments on commit 34b9a71

Please sign in to comment.