mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 592592 - Non-breaking spaces inserted when multiple spaces are typed, even in pre-wrap-styled text r,a=roc

This commit is contained in:
Ehsan Akhgari 2010-09-02 20:36:42 -04:00
Родитель 2766b27391
Коммит 103480ab0b
4 изменённых файлов: 67 добавлений и 1 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
content/html/content/test/test_bug408231.html
Просмотреть файл

@ -182,6 +182,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=408231
function runTests() { function runTests() {
document.designMode='on'; document.designMode='on';
window.getSelection().collapse(document.body, 0);
testQueryCommand(commandEnabledResults, callQueryCommandEnabled, "queryCommandEnabled"); testQueryCommand(commandEnabledResults, callQueryCommandEnabled, "queryCommandEnabled");
testQueryCommand(commandStateResults, callQueryCommandState, "queryCommandState"); testQueryCommand(commandStateResults, callQueryCommandState, "queryCommandState");
testQueryCommand(commandValueResults, callQueryCommandValue, "queryCommandValue"); testQueryCommand(commandValueResults, callQueryCommandValue, "queryCommandValue");

6
editor/libeditor/base/nsEditor.cpp
Просмотреть файл

@ -3857,8 +3857,12 @@ nsEditor::IsPreformatted(nsIDOMNode *aNode, PRBool *aResult)
nsCOMPtr<nsIPresShell> ps = do_QueryReferent(mPresShellWeak); nsCOMPtr<nsIPresShell> ps = do_QueryReferent(mPresShellWeak);
NS_ENSURE_TRUE(ps, NS_ERROR_NOT_INITIALIZED); NS_ENSURE_TRUE(ps, NS_ERROR_NOT_INITIALIZED);
// Look at the node (and its parent if it's not an element), and grab its style context
nsRefPtr<nsStyleContext> elementStyle; nsRefPtr<nsStyleContext> elementStyle;
if (content->IsElement()) { if (!content->IsElement()) {
content = content->GetParent();
}
if (content && content->IsElement()) {
elementStyle = nsComputedDOMStyle::GetStyleContextForElement(content->AsElement(), elementStyle = nsComputedDOMStyle::GetStyleContextForElement(content->AsElement(),
nsnull, nsnull,
ps); ps);

1
editor/libeditor/html/tests/Makefile.in
Просмотреть файл

@ -59,6 +59,7 @@ _TEST_FILES = \
test_bug525389.html \ test_bug525389.html \
test_bug537046.html \ test_bug537046.html \
test_bug550434.html \ test_bug550434.html \
test_bug592592.html \
test_CF_HTML_clipboard.html \ test_CF_HTML_clipboard.html \
test_contenteditable_focus.html \ test_contenteditable_focus.html \
test_contenteditable_text_input_handling.html \ test_contenteditable_text_input_handling.html \

60
editor/libeditor/html/tests/test_bug592592.html Normal file
Просмотреть файл

@ -0,0 +1,60 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=592592
-->
<head>
<title>Test for Bug 592592</title>
<script type="application/javascript" src="/MochiKit/packed.js"></script>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
<script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=592592">Mozilla Bug 592592</a>
<p id="display"></p>
<div id="content">
<div id="editor" contenteditable="true" style="white-space:pre-wrap">a b</div>
</div>
<pre id="test">
<script type="application/javascript">
/** Test for Bug 592592 **/
SimpleTest.waitForExplicitFinish();
SimpleTest.waitForFocus(function() {
var ed = document.getElementById("editor");
// Put the selection right after "a"
ed.focus();
window.getSelection().collapse(ed.firstChild, 1);
// Press space
synthesizeKey(" ", {});
// Make sure we haven't added an nbsp
is(ed.innerHTML, "a b", "We should not be adding an &nbsp; for preformatted text");
// Remove the preformatted style
ed.removeAttribute("style");
// Reset the DOM
ed.innerHTML = "a b";
// Reset the selection
ed.focus();
window.getSelection().collapse(ed.firstChild, 1);
// Press space
synthesizeKey(" ", {});
// Make sure that we have added an nbsp
is(ed.innerHTML, "a&nbsp; b", "We should add an &nbsp; for non-preformatted text");
SimpleTest.finish();
});
</script>
</pre>
</body>
</html>