Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-14 02:31:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 418874 - undo function does not work in emptyText textboxes (e.g. Firefox search field, URL bar). r=gavin

Browse Source
This commit is contained in:
Graeme McCutcheon 2008-12-31 11:40:23 +01:00
parent e9a866b929
commit 69f3eb65b6
3 changed files with 101 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
toolkit/content/tests/chrome/Makefile.in
View File

@ -57,6 +57,7 @@ _TEST_FILES = findbar_window.xul \
test_bug331215.xul \
bug263683_window.xul \
test_bug263683.xul \
test_bug418874.xul \
bug451286_window.xul \
test_bug451286.xul \
test_popup_preventdefault_chrome.xul \

99
toolkit/content/tests/chrome/test_bug418874.xul Normal file
View File

@ -0,0 +1,99 @@
<?xml version="1.0"?>
<!-- ***** 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 XUL Textbox Widget 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) 2008
- 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 ***** -->
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
<window title="Textbox with emptyText test" width="500" height="600"
onload="doTest();"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
<hbox>
<textbox id="t1" emptytext="empty"/>
</hbox>
<hbox>
<textbox id="t2" emptytext="empty"/>
</hbox>
<!-- test results are displayed in the html:body -->
<body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px; overflow: auto;">
<p id="display">
</p>
<div id="content" style="display: none">
</div>
<pre id="test">
</pre>
</body>
<!-- test code goes here -->
<script type="application/javascript"><![CDATA[
SimpleTest.waitForExplicitFinish();
function doTest() {
var t1 = $("t1");
var t2 = $("t2");
t1.focus();
synthesizeKey("1", {});
var t1Enabled = {};
var t1CanUndo = {};
t1.editor.canUndo(t1Enabled, t1CanUndo);
ok(t1CanUndo.value, "undo correctly enabled when emptyText was not changed through property");
t2.emptyText = "reallyempty";
// Remaining tests after timeout - emptyText is displayed asynchronously.
setTimeout(function () {
is(t2.inputField.value, "reallyempty", "updated emptyText displayed");
t2.click();
synthesizeKey("2", {});
var t2Enabled = {};
var t2CanUndo = {};
t2.editor.canUndo(t2Enabled, t2CanUndo);
ok(t2CanUndo.value, "undo correctly enabled when emptyText explicitly changed through property");
SimpleTest.finish();
}, 100);
}
]]></script>
</window>

1
toolkit/content/widgets/textbox.xml
View File

@ -164,6 +164,7 @@
<method name="_updateVisibleText">
<body><![CDATA[
if (!this.hasAttribute("focused") &&
!this.hasAttribute("empty") &&
!this.value &&
this.emptyText) {
// This section is a wee bit hacky; without the timeout, the CSS