Permalink
Browse files

Merge pull request #19968 from r-gaia-cs/bug-1019993

Bug 1019993 - Correct compositekey to compositeKey.
r=rudylu
  • Loading branch information...
RudyLu committed Jun 11, 2014
2 parents 716ce8f + 1d4f8c1 commit 266fa64fabe8340c1b361dcd52b758116811fbf8
Showing with 5 additions and 5 deletions.
  1. +3 −3 apps/keyboard/js/keyboard.js
  2. +2 −2 apps/keyboard/js/render.js
@@ -953,7 +953,7 @@ function hideAlternatives() {
// Test if an HTML node is a normal key
function isNormalKey(key) {
var keyCode = parseInt(key.dataset.keycode);
return keyCode || key.dataset.selection || key.dataset.compositekey;
return keyCode || key.dataset.selection || key.dataset.compositeKey;
}
//
@@ -1411,10 +1411,10 @@ function endPress(target, coords, touchId, hasCandidateScrolled) {
// Normal key
default:
if (target.dataset.compositekey) {
if (target.dataset.compositeKey) {
// Keys with this attribute set send more than a single character
// Like ".com" or "2nd" or (in Catalan) "l·l".
var compositeKey = target.dataset.compositekey;
var compositeKey = target.dataset.compositeKey;
for (var i = 0; i < compositeKey.length; i++) {
inputMethodManager.currentIMEngine.click(compositeKey.charCodeAt(i));
}
@@ -243,7 +243,7 @@ const IMERender = (function() {
dataset.push({'key': 'keycode', 'value': code});
dataset.push({'key': 'keycodeUpper', 'value': upperCode});
if (key.compositeKey) {
dataset.push({'key': 'compositekey', 'value': key.compositeKey});
dataset.push({'key': 'compositeKey', 'value': key.compositeKey});
}
var attributeList = [];
@@ -622,7 +622,7 @@ const IMERender = (function() {
{ 'key': 'keycode', 'value': alt.charCodeAt(0) },
{ 'key': 'keycodeUpper', 'value': alt.toUpperCase().charCodeAt(0) }
] :
[{'key': 'compositekey', 'value': alt}];
[{'key': 'compositeKey', 'value': alt}];
// Make each of these alternative keys 75% as wide as the key that
// it is an alternative for, but adjust for the relative number of

0 comments on commit 266fa64

Please sign in to comment.