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 974309: Fixes the IsEditable() logic for table cells. r=ehsan

Browse Source
This commit is contained in:
Jet Villegas 2016-02-09 14:06:03 -08:00
parent 63e921a3d8
commit 54183c3115
4 changed files with 91 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/libeditor/tests/mochitest.ini
View File

@ -141,6 +141,7 @@ skip-if = toolkit == 'android'
[test_bug857487.html] [test_bug857487.html]
[test_bug858918.html] [test_bug858918.html]
[test_bug915962.html] [test_bug915962.html]
[test_bug974309.html]
skip-if = toolkit == 'android' skip-if = toolkit == 'android'
[test_bug966155.html] [test_bug966155.html]
skip-if = os != "win" skip-if = os != "win"

78
editor/libeditor/tests/test_bug974309.html Normal file
View File

@ -0,0 +1,78 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=974309
-->
<head>
<title>Test for Bug 974309</title>
<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=974309">Mozilla Bug 974309</a>
<div id="edit_not_table_parent" contenteditable="true"></div>
<div>
<table id="table" border="1" width="100%">
<tbody>
<tr>
<td>a</td>
<td>b</td>
<td>c</td>
</tr>
<tr>
<td>d</td>
<td id="cell">e</td>
<td>f</td>
</tr>
<tr>
<td>g</td>
<td>h</td>
<td>i</td>
</tr>
</tbody>
</table>
</div>
<script type="application/javascript">
/**
* Test for Bug 974309
*
* Tests that editing a table row fails when the table or row is _not_ a child of a contenteditable node.
* See bug 857487 for tests that cover when the table or row _is_ a child of a contenteditable node.
*/
function getEditor() {
const Ci = SpecialPowers.Ci;
var editingSession = SpecialPowers.wrap(window)
.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIWebNavigation)
.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIEditingSession);
return editingSession.getEditorForWindow(window).QueryInterface(Ci.nsITableEditor);
}
var cell = document.getElementById("cell");
cell.focus();
// place caret at end of center cell
var sel = getSelection();
sel.collapse(cell, cell.childNodes.length);
var table = document.getElementById("table");
var tableHTML = table.innerHTML;
var editor = getEditor();
editor.deleteTableRow(1);
is(table.innerHTML == tableHTML, true, "editor should not modify non-editable table" );
isnot(table.innerHTML == "\n <tbody>\n <tr>\n <td>a</td>\n <td>b</td>\n <td>c</td>\n </tr>\n \n <tr>\n <td>g</td>\n <td>h</td>\n <td>i</td>\n </tr>\n </tbody>\n ",
true, "editor.deleteTableRow(1) should not delete a non-editable row containing the selection");
</script>
</body>
</html>

1
layout/generic/moz.build
View File

@ -193,6 +193,7 @@ LOCAL_INCLUDES += [
'/dom/base', '/dom/base',
'/dom/html', '/dom/html',
'/dom/xul', '/dom/xul',
'/editor/libeditor'
] ]
JAR_MANIFESTS += ['jar.mn'] JAR_MANIFESTS += ['jar.mn']

15
layout/generic/nsSelection.cpp
View File

@ -77,6 +77,7 @@ static NS_DEFINE_CID(kFrameTraversalCID, NS_FRAMETRAVERSAL_CID);
#include "mozilla/ErrorResult.h" #include "mozilla/ErrorResult.h"
#include "mozilla/dom/SelectionBinding.h" #include "mozilla/dom/SelectionBinding.h"
#include "mozilla/AsyncEventDispatcher.h" #include "mozilla/AsyncEventDispatcher.h"
#include "nsHTMLEditor.h"
using namespace mozilla; using namespace mozilla;
using namespace mozilla::dom; using namespace mozilla::dom;
@ -1697,11 +1698,17 @@ nsFrameSelection::TakeFocus(nsIContent* aNewFocus,
// BUT only do this in an editor // BUT only do this in an editor
NS_ENSURE_STATE(mShell); NS_ENSURE_STATE(mShell);
int16_t displaySelection = mShell->GetSelectionFlags(); bool editable = false;
RefPtr<nsPresContext> context = mShell->GetPresContext();
if (context) {
nsCOMPtr<nsIHTMLEditor> editor = do_QueryInterface(nsContentUtils::GetHTMLEditor(context));
if (editor) {
nsCOMPtr<nsINode> editorHostNode = editor->GetActiveEditingHost();
editable = editorHostNode && nsContentUtils::ContentIsDescendantOf(aNewFocus, editorHostNode);
}
}
// Editor has DISPLAY_ALL selection type if (editable) {
if (displaySelection == nsISelectionDisplay::DISPLAY_ALL)
{
mCellParent = GetCellParent(aNewFocus); mCellParent = GetCellParent(aNewFocus);
#ifdef DEBUG_TABLE_SELECTION #ifdef DEBUG_TABLE_SELECTION
if (mCellParent) if (mCellParent)