Index: third_party/google_input_tools/src/chrome/os/inputview/config/emoji_data.js |
diff --git a/third_party/google_input_tools/src/chrome/os/inputview/config/emoji_data.js b/third_party/google_input_tools/src/chrome/os/inputview/config/emoji_data.js |
index 3dd9311db4c90ed145f09dfef6bcbac0fafbc7d7..3318735927f008a1464fd09419596963ba06bbb1 100644 |
--- a/third_party/google_input_tools/src/chrome/os/inputview/config/emoji_data.js |
+++ b/third_party/google_input_tools/src/chrome/os/inputview/config/emoji_data.js |
@@ -11,18 +11,18 @@ |
// you may not use this file except in compliance with the License. |
// Licensed under the Apache License, Version 2.0 (the "License"); |
// |
+goog.require('i18n.input.chrome.ElementType'); |
goog.require('i18n.input.chrome.inputview.Css'); |
goog.require('i18n.input.chrome.inputview.EmojiType'); |
goog.require('i18n.input.chrome.inputview.SpecNodeName'); |
goog.require('i18n.input.chrome.inputview.content.util'); |
-goog.require('i18n.input.chrome.inputview.elements.ElementType'); |
(function() { |
var viewIdPrefix = 'emoji-k-'; |
var emojiKeysPerPage = 27; |
var util = i18n.input.chrome.inputview.content.util; |
- var ElementType = i18n.input.chrome.inputview.elements.ElementType; |
+ var ElementType = i18n.input.chrome.ElementType; |
var EmojiType = i18n.input.chrome.inputview.EmojiType; |
var SpecNodeName = i18n.input.chrome.inputview.SpecNodeName; |
var Css = i18n.input.chrome.inputview.Css; |
@@ -521,7 +521,7 @@ goog.require('i18n.input.chrome.inputview.elements.ElementType'); |
keyList.push(tmp); |
mapping[tmp['spec'][SpecNodeName.ID]] = viewIdPrefix + viewId++; |
- var result = []; |
+ var result = {}; |
result[SpecNodeName.TEXT] = emojiGroups; |
result[SpecNodeName.KEY_LIST] = keyList; |
result[SpecNodeName.MAPPING] = mapping; |