зеркало из https://github.com/mozilla/gecko-dev.git
Bug 46555 - "Select All" should only be enabled when editor is non-empty. r=ehsan, gavin
This commit is contained in:
Graeme McCutcheon
Родитель
470b7a0d7d
Коммит
12e287de72
|
|
@ -285,7 +285,7 @@ function runTest(testNum) {
|
|||
"context-paste", null, // ignore clipboard state
|
||||
"context-delete", false,
|
||||
"---", null,
|
||||
"context-selectall", true,
|
||||
"context-selectall", false,
|
||||
"---", null,
|
||||
"spell-check-enabled", true]);
|
||||
closeContextMenu();
|
||||
|
|
|
|||
|
|
@ -661,14 +661,24 @@ nsSelectAllCommand::IsCommandEnabled(const char * aCommandName,
|
|||
{
|
||||
NS_ENSURE_ARG_POINTER(outCmdEnabled);
|
||||
|
||||
// you can select all if there is an editor (and potentially no contents)
|
||||
// some day we may want to change this
|
||||
nsCOMPtr<nsIEditor> editor = do_QueryInterface(aCommandRefCon);
|
||||
if (editor)
|
||||
return editor->GetIsSelectionEditable(outCmdEnabled);
|
||||
|
||||
nsresult rv = NS_OK;
|
||||
*outCmdEnabled = PR_FALSE;
|
||||
return NS_OK;
|
||||
PRBool docIsEmpty, selectionIsEditable;
|
||||
|
||||
// you can select all if there is an editor which is non-empty
|
||||
nsCOMPtr<nsIEditor> editor = do_QueryInterface(aCommandRefCon);
|
||||
if (editor) {
|
||||
rv = editor->GetIsSelectionEditable(&selectionIsEditable);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
if (selectionIsEditable) {
|
||||
rv = editor->GetDocumentIsEmpty(&docIsEmpty);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
*outCmdEnabled = !docIsEmpty;
|
||||
}
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ _TEST_FILES = \
|
|||
|
||||
_CHROME_TEST_FILES = \
|
||||
test_selection_move_commands.xul \
|
||||
test_bug46555.html \
|
||||
test_bug646194.xul \
|
||||
$(NULL)
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,80 @@
|
|||
<!DOCTYPE HTML>
|
||||
<!-- ***** BEGIN LICENSE BLOCK *****
|
||||
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
-
|
||||
- The contents of this file are subject to the Mozilla Public License Version
|
||||
- 1.1 (the "License"); you may not use this file except in compliance with
|
||||
- the License. You may obtain a copy of the License at
|
||||
- http://www.mozilla.org/MPL/
|
||||
-
|
||||
- Software distributed under the License is distributed on an "AS IS" basis,
|
||||
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
- for the specific language governing rights and limitations under the
|
||||
- License.
|
||||
-
|
||||
- The Original Code is Editor Test code
|
||||
-
|
||||
- The Initial Developer of the Original Code is
|
||||
- Graeme McCutcheon <graememcc_firefox@graeme-online.co.uk>.
|
||||
- Portions created by the Initial Developer are Copyright (C) 2011
|
||||
- the Initial Developer. All Rights Reserved.
|
||||
-
|
||||
- Contributor(s):
|
||||
-
|
||||
-
|
||||
- Alternatively, the contents of this file may be used under the terms of
|
||||
- either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
- in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
- of those above. If you wish to allow use of your version of this file only
|
||||
- under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
- use your version of this file under the terms of the MPL, indicate your
|
||||
- decision by deleting the provisions above and replace them with the notice
|
||||
- and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
- the provisions above, a recipient may use your version of this file under
|
||||
- the terms of any one of the MPL, the GPL or the LGPL.
|
||||
-
|
||||
- ***** END LICENSE BLOCK ***** -->
|
||||
<html>
|
||||
<!--
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=46555
|
||||
-->
|
||||
|
||||
<head>
|
||||
<title>Test for Bug 46555</title>
|
||||
<script type="application/javascript"
|
||||
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=46555">Mozilla Bug 46555</a>
|
||||
<p id="display"></p>
|
||||
<div id="content" style="display: none">
|
||||
</div>
|
||||
|
||||
<input type="text" value="" id="t1" />
|
||||
|
||||
<pre id="test">
|
||||
<script type="application/javascript">
|
||||
|
||||
/** Test for Bug 46555 **/
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
SimpleTest.waitForFocus(function() {
|
||||
const kCmd = "cmd_selectAll";
|
||||
|
||||
var input = document.getElementById("t1");
|
||||
input.focus();
|
||||
var controller = input.controllers.getControllerForCommand(kCmd);
|
||||
|
||||
// Test 1: Select All should be disabled if editor is empty
|
||||
is(controller.isCommandEnabled(kCmd), false,
|
||||
"Select All command disabled when editor is empty");
|
||||
|
||||
SimpleTest.finish();
|
||||
});
|
||||
</script>
|
||||
</pre>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
Загрузка…
Ссылка в новой задаче