Bug 1019993 - Correct compositekey to compositeKey

Replace compositekey with compositeKey to follow interCaps coding style guidelines.
mozilla-b2g · Jun 9, 2014 · 1d4f8c1 · 1d4f8c1
1 parent 9826ce7
commit 1d4f8c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/apps/keyboard/js/keyboard.js b/apps/keyboard/js/keyboard.js
@@ -954,7 +954,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;
 }
 
 //
@@ -1412,10 +1412,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));
       }

diff --git a/apps/keyboard/js/render.js b/apps/keyboard/js/render.js
@@ -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 = [];
@@ -617,7 +617,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