| Index: third_party/google_input_tools/src/chrome/os/inputview/layouts/rowsof102.js
|
| diff --git a/third_party/google_input_tools/src/chrome/os/inputview/layouts/rowsof102.js b/third_party/google_input_tools/src/chrome/os/inputview/layouts/rowsof102.js
|
| index 4df3e415c5741e6ee11dda4966a8e1e4cc987d42..58e046682345fdda9ad86c6407c5876e87cbc305 100644
|
| --- a/third_party/google_input_tools/src/chrome/os/inputview/layouts/rowsof102.js
|
| +++ b/third_party/google_input_tools/src/chrome/os/inputview/layouts/rowsof102.js
|
| @@ -15,94 +15,94 @@ goog.provide('i18n.input.chrome.inputview.layouts.RowsOf102');
|
|
|
| goog.require('i18n.input.chrome.inputview.layouts.util');
|
|
|
| +goog.scope(function() {
|
| +var layouts = i18n.input.chrome.inputview.layouts;
|
| +var util = layouts.util;
|
| +
|
|
|
| /**
|
| * Creates the top four rows for 102 keyboard.
|
| *
|
| * @return {!Array.<!Object>} The rows.
|
| */
|
| -i18n.input.chrome.inputview.layouts.RowsOf102.create = function() {
|
| +layouts.RowsOf102.create = function() {
|
| var baseKeySpec = {
|
| 'widthInWeight': 1,
|
| 'heightInWeight': 1
|
| };
|
|
|
| // Row1
|
| - var backquoteKey = i18n.input.chrome.inputview.layouts.util.createKey({
|
| - 'widthInWeight': 0.94
|
| - });
|
| - var keySequenceOf12 = i18n.input.chrome.inputview.layouts.util.
|
| - createKeySequence(baseKeySpec, 12);
|
| - var backspaceKey = i18n.input.chrome.inputview.layouts.util.createKey({
|
| - 'widthInWeight': 1.42
|
| + var keySequenceOf13 = util.createKeySequence(baseKeySpec, 13);
|
| + var backspaceKey = util.createKey({
|
| + 'widthInWeight': 1.46
|
| });
|
| - var row1 = i18n.input.chrome.inputview.layouts.util.createLinearLayout({
|
| + var row1 = util.createLinearLayout({
|
| 'id': 'row1',
|
| - 'children': [backquoteKey, keySequenceOf12, backspaceKey]
|
| + 'children': [keySequenceOf13, backspaceKey]
|
| });
|
|
|
|
|
| // Row2 and row3
|
|
|
| // First linear layout at the left of the enter.
|
| - var tabKey = i18n.input.chrome.inputview.layouts.util.createKey({
|
| - 'widthInWeight': 1.38
|
| + var tabKey = util.createKey({
|
| + 'widthInWeight': 1.46
|
| });
|
| - keySequenceOf12 = i18n.input.chrome.inputview.layouts.util.
|
| - createKeySequence(baseKeySpec, 12);
|
| - var row2 = i18n.input.chrome.inputview.layouts.util.createLinearLayout({
|
| + var keySequenceOf12 = util.createKeySequence(baseKeySpec, 12);
|
| + var row2 = util.createLinearLayout({
|
| 'id': 'row2',
|
| 'children': [tabKey, keySequenceOf12]
|
| });
|
|
|
| // Second linear layout at the right of the enter.
|
| - var capslockKey = i18n.input.chrome.inputview.layouts.util.createKey({
|
| - 'widthInWeight': 1.74
|
| + var capslockKey = util.createKey({
|
| + 'widthInWeight': 1.66
|
| });
|
| - keySequenceOf12 = i18n.input.chrome.inputview.layouts.util.createKeySequence({
|
| - 'widthInWeight': 0.97
|
| + keySequenceOf12 = util.createKeySequence({
|
| + 'widthInWeight': 0.98
|
| }, 12);
|
| - var row3 = i18n.input.chrome.inputview.layouts.util.createLinearLayout({
|
| + var row3 = util.createLinearLayout({
|
| 'id': 'row3',
|
| 'children': [capslockKey, keySequenceOf12]
|
| });
|
|
|
| // Vertical layout contains the two rows at the left of the enter.
|
| - var vLayout = i18n.input.chrome.inputview.layouts.util.createVerticalLayout({
|
| + var vLayout = util.createVerticalLayout({
|
| 'id': 'row2-3-left',
|
| 'children': [row2, row3]
|
| });
|
|
|
| // Vertical layout contains enter key.
|
| - var enterKey = i18n.input.chrome.inputview.layouts.util.createKey({
|
| - 'widthInWeight': 0.98,
|
| + var enterKey = util.createKey({
|
| + 'widthInWeight': 1.04,
|
| 'heightInWeight': 2
|
| });
|
| - var enterLayout = i18n.input.chrome.inputview.layouts.util.
|
| + var enterLayout = util.
|
| createVerticalLayout({
|
| 'id': 'row2-3-right',
|
| 'children': [enterKey]
|
| });
|
|
|
| // Linear layout contains the two vertical layout.
|
| - var row2and3 = i18n.input.chrome.inputview.layouts.util.createLinearLayout({
|
| + var row2and3 = util.createLinearLayout({
|
| 'id': 'row2-3',
|
| 'children': [vLayout, enterLayout]
|
| });
|
|
|
| // Row4
|
| - var shiftLeft = i18n.input.chrome.inputview.layouts.util.createKey({
|
| - 'widthInWeight': 1.2
|
| + var shiftLeft = util.createKey({
|
| + 'widthInWeight': 1.46
|
| });
|
| - var keySequenceOf11 = i18n.input.chrome.inputview.layouts.util.
|
| - createKeySequence(baseKeySpec, 11);
|
| - var shiftRight = i18n.input.chrome.inputview.layouts.util.createKey({
|
| - 'widthInWeight': 2.16
|
| + var keySequenceOf11 = util.createKeySequence(baseKeySpec, 11);
|
| + var shiftRight = util.createKey({
|
| + 'widthInWeight': 2
|
| });
|
| - var row4 = i18n.input.chrome.inputview.layouts.util.createLinearLayout({
|
| + var row4 = util.createLinearLayout({
|
| 'id': 'row4',
|
| 'children': [shiftLeft, keySequenceOf11, shiftRight]
|
| });
|
|
|
| return [row1, row2and3, row4];
|
| };
|
| +
|
| +}); // goog.scope
|
|
|