mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 438840. Page-up/page-down in editable content should scroll the innermost scrollable region containing the caret, not the root. r=roc
--HG-- extra : rebase_source : 096868b13160a3c197387cf5e44fb7892b3b23ca
This commit is contained in:
parent
cfb5f9002b
commit
db643902e8
@ -3061,15 +3061,10 @@ NS_IMETHODIMP
|
||||
PresShell::PageMove(PRBool aForward, PRBool aExtend)
|
||||
{
|
||||
nsresult result;
|
||||
nsIViewManager* viewManager = GetViewManager();
|
||||
nsIScrollableView *scrollableView;
|
||||
if (!viewManager)
|
||||
return NS_ERROR_UNEXPECTED;
|
||||
result = viewManager->GetRootScrollableView(&scrollableView);
|
||||
if (NS_FAILED(result))
|
||||
return result;
|
||||
if (!scrollableView)
|
||||
nsIScrollableView *scrollableView = GetViewToScroll(nsLayoutUtils::eVertical);
|
||||
if (!scrollableView)
|
||||
return NS_ERROR_UNEXPECTED;
|
||||
|
||||
nsIView *scrolledView;
|
||||
result = scrollableView->GetScrolledView(scrolledView);
|
||||
mSelection->CommonPageMove(aForward, aExtend, scrollableView);
|
||||
|
@ -79,6 +79,7 @@ _TEST_FILES = \
|
||||
$(warning test_bug421839-1.html disabled because it calls finish twice which can cause timeouts) \
|
||||
test_bug421839-2.html \
|
||||
bug421839-2-page.html \
|
||||
test_bug438840.html \
|
||||
test_bug448860.html \
|
||||
test_bug460532.html \
|
||||
test_bug468167.html \
|
||||
|
55
layout/generic/test/test_bug438840.html
Normal file
55
layout/generic/test/test_bug438840.html
Normal file
@ -0,0 +1,55 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<head>
|
||||
<title>Test Character Movement (including nsTextFrame::PeekOffsetCharacter)</title>
|
||||
<script type="text/javascript" src="/MochiKit/packed.js"></script>
|
||||
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
|
||||
</head>
|
||||
<body>
|
||||
<p id="display"></p>
|
||||
<div>content before the editor</div>
|
||||
<div contentEditable="true" id="editor" style="width:200px;height:150px;overflow-y:auto;overflow-x:hidden;"><p>paragraph1</p>
|
||||
<p>paragraph2</p>
|
||||
<p>paragraph3</p>
|
||||
<p>paragraph4</p>
|
||||
<p>paragraph5</p>
|
||||
<p>paragraph6</p>
|
||||
</div>
|
||||
<div>content after the editor</div>
|
||||
<pre id="test">
|
||||
<script class="testbody" type="text/javascript;version=1.7">
|
||||
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
|
||||
// This seems to be necessary because the selection is not set up properly otherwise
|
||||
setTimeout(test, 0);
|
||||
|
||||
function test() {
|
||||
var sel = window.getSelection();
|
||||
var editor = document.getElementById("editor");
|
||||
|
||||
var keymodifier={};
|
||||
//in windows/linux, pageup/pagedown will trigger movement of caret
|
||||
//while in Mac, pageup/pagedown will just scroll. We need to press
|
||||
//alt-pageup/pagedown in Mac to actually move caret
|
||||
if(navigator.platform.indexOf("Mac") >= 0){
|
||||
keymodifier.altKey=true;
|
||||
}
|
||||
|
||||
sel.collapse(editor.firstChild.firstChild, 1);
|
||||
synthesizeKey("VK_PAGE_UP", keymodifier);
|
||||
is(sel.anchorNode, editor.firstChild.firstChild, 'after pageup caret should still be in the first paragraph');
|
||||
|
||||
synthesizeKey("VK_PAGE_DOWN", keymodifier);
|
||||
is(sel.anchorNode.parentNode.parentNode, editor, 'pagedown should not move caret outside the editor');
|
||||
|
||||
SimpleTest.finish();
|
||||
}
|
||||
|
||||
|
||||
</script>
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
Loading…
Reference in New Issue
Block a user