corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 960946 - Correct events which can be generated and sent repeatedly from longpressing a key. r=yxl

Browse Source
This commit is contained in:
Wei Deng
2014-03-25 15:46:52 +08:00
parent 7993dfe577
commit 52c7a2e15a
6 changed files with 123 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dom/inputmethod/MozKeyboard.js
View File

@@ -675,7 +675,7 @@ MozInputContext.prototype = {
return this.replaceSurroundingText(null, offset, length); return this.replaceSurroundingText(null, offset, length);
}, },
sendKey: function ic_sendKey(keyCode, charCode, modifiers) { sendKey: function ic_sendKey(keyCode, charCode, modifiers, repeat) {
let self = this; let self = this;
return this._sendPromise(function(resolverId) { return this._sendPromise(function(resolverId) {
cpmm.sendAsyncMessage('Keyboard:SendKey', { cpmm.sendAsyncMessage('Keyboard:SendKey', {
@@ -683,7 +683,8 @@ MozInputContext.prototype = {
requestId: resolverId, requestId: resolverId,
keyCode: keyCode, keyCode: keyCode,
charCode: charCode, charCode: charCode,
modifiers: modifiers modifiers: modifiers,
repeat: repeat
}); });
}); });
}, },

8
dom/inputmethod/forms.js
View File

@@ -523,8 +523,12 @@ let FormAssistant = {
domWindowUtils.sendKeyEvent('keypress', json.keyCode, domWindowUtils.sendKeyEvent('keypress', json.keyCode,
json.charCode, json.modifiers); json.charCode, json.modifiers);
} }
domWindowUtils.sendKeyEvent('keyup', json.keyCode,
json.charCode, json.modifiers); if(!json.repeat) {
domWindowUtils.sendKeyEvent('keyup', json.keyCode,
json.charCode, json.modifiers);
}
this._editing = false; this._editing = false;
if (json.requestId && doKeypress) { if (json.requestId && doKeypress) {

4
dom/inputmethod/mochitest/inputmethod_common.js
View File

@@ -24,7 +24,9 @@ function inputmethod_setup(callback) {
// Bypass the permission check for mozInputMethod API. // Bypass the permission check for mozInputMethod API.
['dom.mozInputMethod.testing', true] ['dom.mozInputMethod.testing', true]
]; ];
SpecialPowers.pushPrefEnv({set: prefs}, callback); SpecialPowers.pushPrefEnv({set: prefs}, function() {
SimpleTest.waitForFocus(callback);
});
}); });
} }

1
dom/inputmethod/mochitest/mochitest.ini
View File

@@ -11,6 +11,7 @@ support-files =
[test_basic.html] [test_basic.html]
[test_bug944397.html] [test_bug944397.html]
[test_bug949059.html] [test_bug949059.html]
[test_bug960946.html]
[test_bug978918.html] [test_bug978918.html]
[test_delete_focused_element.html] [test_delete_focused_element.html]
[test_sendkey_cancel.html] [test_sendkey_cancel.html]

105
dom/inputmethod/mochitest/test_bug960946.html Normal file
View File

@@ -0,0 +1,105 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=960946
-->
<head>
<title>Basic test for repeat sendKey events</title>
<script type="application/javascript;version=1.7" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript;version=1.7" src="inputmethod_common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=960946">Mozilla Bug 960946</a>
<p id="display"></p>
<pre id="test">
<script class="testbody" type="application/javascript;version=1.7">
// The input context.
var gContext = null;
var gCounter = 0;
var result = ["keydown", "keypress", "keydown","keypress",
"keydown", "keypress", "keyup"
];
inputmethod_setup(function() {
runTest();
});
// The frame script running in file_test_backspace_event.html.
function appFrameScript() {
let input = content.document.getElementById('test-input');
input.onkeydown = input.onkeypress = input.onkeyup = function(event) {
dump('key event was fired in file_test_backspace_event.html.');
sendAsyncMessage('test:KeyBoard:keyEvent', {'type':event.type});
};
}
function runTest() {
let im = navigator.mozInputMethod;
im.oninputcontextchange = function() {
ok(true, 'inputcontextchange event was fired.');
im.oninputcontextchange = null;
gContext = im.inputcontext;
if (!gContext) {
ok(false, 'Should have a non-null inputcontext.');
inputmethod_cleanup();
return;
}
test_sendKey();
};
// Set current page as an input method.
SpecialPowers.wrap(im).setActive(true);
// Create an app frame to recieve keyboard inputs.
let app = document.createElement('iframe');
app.src = 'file_test_app.html';
app.setAttribute('mozbrowser', true);
document.body.appendChild(app);
app.addEventListener('mozbrowserloadend', function() {
let mm = SpecialPowers.getBrowserFrameMessageManager(app);
mm.loadFrameScript('data:,(' + appFrameScript.toString() + ')();', false);
mm.addMessageListener("test:KeyBoard:keyEvent", function(event) {
ok(true, 'Keyboard input was received.');
is(SpecialPowers.wrap(event).json.type, result[gCounter], "expected event");
gCounter++;
if (gCounter == 7) {
inputmethod_cleanup();
}
});
});
}
function test_sendKey() {
// Move cursor position to 4.
gContext.setSelectionRange(4, 0).then(function() {
is(gContext.selectionStart, 4, 'selectionStart was set successfully.');
is(gContext.selectionEnd, 4, 'selectionEnd was set successfully.');
for(let i = 0; i < 2; i++) {
test_sendBackspace(true);
}
test_sendBackspace(false);
}, function(e) {
ok(false, 'setSelectionRange failed:' + e.name);
inputmethod_cleanup();
});
}
function test_sendBackspace(repeat) {
// Send backspace
gContext.sendKey(KeyEvent.DOM_VK_BACK_SPACE, 0, 0, repeat).then(function() {
ok(true, 'sendKey success');
}, function(e) {
ok(false, 'sendKey failed:' + e.name);
inputmethod_cleanup();
});
}
</script>
</pre>
</body>
</html>

6
dom/webidl/InputMethod.webidl
View File

@@ -150,11 +150,15 @@ interface MozInputContext: EventTarget {
/* /*
* send a character with its key events. * send a character with its key events.
* @param modifiers see http://mxr.mozilla.org/mozilla-central/source/dom/interfaces/base/nsIDOMWindowUtils.idl#206 * @param modifiers see http://mxr.mozilla.org/mozilla-central/source/dom/interfaces/base/nsIDOMWindowUtils.idl#206
* @param repeat indicates whether a key would be sent repeatedly.
* @return true if succeeds. Otherwise false if the input context becomes void. * @return true if succeeds. Otherwise false if the input context becomes void.
* Alternative: sendKey(KeyboardEvent event), but we will likely * Alternative: sendKey(KeyboardEvent event), but we will likely
* waste memory for creating the KeyboardEvent object. * waste memory for creating the KeyboardEvent object.
* Note that, if you want to send a key n times repeatedly, make sure set
* parameter repeat to true and invoke sendKey n-1 times, and then set
* repeat to false in the last invoke.
*/ */
Promise sendKey(long keyCode, long charCode, long modifiers); Promise sendKey(long keyCode, long charCode, long modifiers, optional boolean repeat);
/* /*
* Set current composing text. This method will start composition or update * Set current composing text. This method will start composition or update