Uprev Google Input Tools.

third_party/google_input_tools/src/chrome/os/inputview/imewindows/accents.js

 // Copyright 2014 The ChromeOS IME Authors. All Rights Reserved.
 // limitations under the License.
 // See the License for the specific language governing permissions and
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // distributed under the License is distributed on an "AS-IS" BASIS,
 // Unless required by applicable law or agreed to in writing, software
 //
 //      http://www.apache.org/licenses/LICENSE-2.0
 //
 // You may obtain a copy of the License at
 // you may not use this file except in compliance with the License.
 // Licensed under the Apache License, Version 2.0 (the "License");
 //
 goog.provide('i18n.input.chrome.inputview.Accents');
 
 goog.require('goog.dom');
 goog.require('goog.math.Coordinate');
 goog.require('goog.style');
+goog.require('i18n.input.chrome.inputview.util');
 
 
 goog.scope(function() {
 var Accents = i18n.input.chrome.inputview.Accents;
 
 
 /**
  * The highlighted element.
  *
  * @type {Element}
  * @private
  */
 Accents.highlightedItem_ = null;
 
 
 /**
  * Gets the highlighted character.
  *
  * @return {string} The character.
  * @private
  */
 Accents.getHighlightedAccent_ = function() {
-  return Accents.highlightedItem_ ? Accents.highlightedItem_.textContent : '';
+  return Accents.highlightedItem_ ?
+      Accents.highlightedItem_.textContent.trim() : '';
 };
 
 
 /**
  * Highlights the item according to the current coordinate of the finger.
  *
  * @param {number} x The x position of finger in screen coordinate system.
  * @param {number} y The y position of finger in screen coordinate system.
  * @param {number} offset The offset to cancel highlight.
  * @private
  */
 Accents.highlightItem_ = function(x, y, offset) {
   var highlightedItem = Accents.getHighlightedItem_(x, y, offset);
   if (Accents.highlightedItem_ != highlightedItem) {
     if (Accents.highlightedItem_) {
       Accents.highlightedItem_.classList.remove('highlight');
     }
     Accents.highlightedItem_ = highlightedItem;
-    if (Accents.highlightedItem_) {
+    if (Accents.highlightedItem_ &&
+        Accents.highlightedItem_.textContent.trim()) {
       Accents.highlightedItem_.classList.add('highlight');
     }
   }
 };
 
 
 /**
  * Gets the higlighted item from |x| and |y| position.
  * @param {number} x The x position of finger in screen coordinate system.
  * @param {number} y The y position of finger in screen coordinate system.
@@ skipping 52 matching lines @@
   container.classList.add('accent-container');
 
   var orderedAccents = Accents.reorderAccents_(accents, numOfColumns, numOfRows,
       startKeyIndex);
   var row = null;
   for (var i = 0; i < orderedAccents.length; i++) {
     var keyElem = document.createElement('div');
     // Even if this is an empty key, we still need to add textDiv. Otherwise,
     // the keys have layout issues.
     var textDiv = document.createElement('div');
-    textDiv.textContent = orderedAccents[i];
+    textDiv.textContent =
+        i18n.input.chrome.inputview.util.getVisibleCharacter(
+            orderedAccents[i]);
+    textDiv.style.lineHeight = height + 'px';
     keyElem.appendChild(textDiv);
     if (!orderedAccents[i]) {
       keyElem.classList.add('empty-key');
     }
-    keyElem.style.width = width;
-    keyElem.style.height = height;
+    keyElem.style.width = width + 'px';
+    keyElem.style.height = height + 'px';
     if (i % numOfColumns == 0) {
       if (row) {
         container.appendChild(row);
       }
       row = document.createElement('div');
       row.classList.add('accent-row');
     }
     row.appendChild(keyElem);
   }
   container.appendChild(row);
@@ skipping 45 matching lines @@
   }
 
   return orderedAccents;
 };
 
 goog.exportSymbol('accents.highlightedAccent', Accents.getHighlightedAccent_);
 goog.exportSymbol('accents.highlightItem', Accents.highlightItem_);
 goog.exportSymbol('accents.setAccents', Accents.setAccents_);
 
 });  // goog.scope