Index: third_party/google_input_tools/src/chrome/os/inputview/layouts/jpkbd_layout.js |
diff --git a/third_party/google_input_tools/src/chrome/os/inputview/layouts/jpkbd_layout.js b/third_party/google_input_tools/src/chrome/os/inputview/layouts/jpkbd_layout.js |
index 9af34a16e954f6a1b4e673dafbcaed02d327b054..e78aeff26d6ed36b06b90d9100092a0278e4a69d 100644 |
--- a/third_party/google_input_tools/src/chrome/os/inputview/layouts/jpkbd_layout.js |
+++ b/third_party/google_input_tools/src/chrome/os/inputview/layouts/jpkbd_layout.js |
@@ -19,10 +19,10 @@ goog.require('i18n.input.chrome.inputview.layouts.util'); |
(function() { |
var ConditionName = i18n.input.chrome.inputview.ConditionName; |
var util = i18n.input.chrome.inputview.layouts.util; |
- i18n.input.chrome.inputview.layouts.util.setPrefix('jpkbd-k-'); |
- |
- var topFourRows = i18n.input.chrome.inputview.layouts.RowsOfJP.create(); |
+ var RowsOfJP = i18n.input.chrome.inputview.layouts.RowsOfJP; |
+ util.setPrefix('jpkbd-k-'); |
+ var topFourRows = RowsOfJP.create(); |
// Creates the space row. |
var globeKey = util.createKey({ |
'condition': ConditionName.SHOW_GLOBE_OR_SYMBOL, |
@@ -39,6 +39,7 @@ goog.require('i18n.input.chrome.inputview.layouts.util'); |
'widthInWeight': 1 |
}); |
+ |
var leftIMEKey = util.createKey({'widthInWeight': 1}); |
var spaceKey = util.createKey({'widthInWeight': 6}); |
var rightIMEKey = util.createKey({'widthInWeight': 1}); |
@@ -58,10 +59,10 @@ goog.require('i18n.input.chrome.inputview.layouts.util'); |
}); |
var keys = [ |
- globeKey, |
- menuKey, |
ctrlKey, |
altKey, |
+ globeKey, |
+ menuKey, |
leftIMEKey, |
spaceKey, |
rightIMEKey, |
@@ -77,21 +78,20 @@ goog.require('i18n.input.chrome.inputview.layouts.util'); |
// Keyboard view. |
- var keyboardView = i18n.input.chrome.inputview.layouts.util.createLayoutView({ |
+ var keyboardView = util.createLayoutView({ |
'id': 'keyboardView', |
'children': [topFourRows, spaceRow], |
'widthPercent': 100, |
'heightPercent': 100 |
}); |
- var keyboardContainer = i18n.input.chrome.inputview.layouts.util. |
- createLinearLayout({ |
- 'id': 'keyboardContainer', |
- 'children': [keyboardView] |
- }); |
+ var keyboardContainer = util.createLinearLayout({ |
+ 'id': 'keyboardContainer', |
+ 'children': [keyboardView] |
+ }); |
var data = { |
- 'layoutID': 'jpkbd', |
+ 'layoutID': 'm-jpkbd', |
'widthInWeight': 15, |
'children': [keyboardContainer] |
}; |