| Index: third_party/google_input_tools/src/chrome/os/inputview/layouts/material/spacerow.js
|
| diff --git a/third_party/google_input_tools/src/chrome/os/inputview/layouts/spacerow.js b/third_party/google_input_tools/src/chrome/os/inputview/layouts/material/spacerow.js
|
| similarity index 57%
|
| copy from third_party/google_input_tools/src/chrome/os/inputview/layouts/spacerow.js
|
| copy to third_party/google_input_tools/src/chrome/os/inputview/layouts/material/spacerow.js
|
| index 41e4708cf6772c9f8af8711d11c8c56d2d872fce..858c86ce57cf7946a893604f2c27baef2dd364b5 100644
|
| --- a/third_party/google_input_tools/src/chrome/os/inputview/layouts/spacerow.js
|
| +++ b/third_party/google_input_tools/src/chrome/os/inputview/layouts/material/spacerow.js
|
| @@ -1,4 +1,4 @@
|
| -// Copyright 2014 The ChromeOS IME Authors. All Rights Reserved.
|
| +// Copyright 2015 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.
|
| @@ -11,10 +11,14 @@
|
| // 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.layouts.SpaceRow');
|
| +goog.provide('i18n.input.chrome.inputview.layouts.material.SpaceRow');
|
|
|
| goog.require('i18n.input.chrome.inputview.ConditionName');
|
| -goog.require('i18n.input.chrome.inputview.layouts.util');
|
| +goog.require('i18n.input.chrome.inputview.layouts.material.util');
|
| +
|
| +
|
| +goog.scope(function() {
|
| +var material = i18n.input.chrome.inputview.layouts.material;
|
|
|
|
|
| /**
|
| @@ -22,30 +26,30 @@ goog.require('i18n.input.chrome.inputview.layouts.util');
|
| *
|
| * @return {!Object} The spaceKey row.
|
| */
|
| -i18n.input.chrome.inputview.layouts.SpaceRow.create = function() {
|
| - var globeKey = i18n.input.chrome.inputview.layouts.util.createKey({
|
| +material.SpaceRow.create = function() {
|
| + var globeKey = material.util.createKey({
|
| 'condition': i18n.input.chrome.inputview.ConditionName.SHOW_GLOBE_OR_SYMBOL,
|
| 'widthInWeight': 1
|
| });
|
| - var menuKey = i18n.input.chrome.inputview.layouts.util.createKey({
|
| + var menuKey = material.util.createKey({
|
| 'condition': i18n.input.chrome.inputview.ConditionName.SHOW_MENU,
|
| 'widthInWeight': 1
|
| });
|
| - var ctrlKey = i18n.input.chrome.inputview.layouts.util.createKey({
|
| + var ctrlKey = material.util.createKey({
|
| 'widthInWeight': 1
|
| });
|
| - var altKey = i18n.input.chrome.inputview.layouts.util.createKey({
|
| + var altKey = material.util.createKey({
|
| 'widthInWeight': 1
|
| });
|
| - var spaceKey = i18n.input.chrome.inputview.layouts.util.createKey({
|
| - 'widthInWeight': 4.87
|
| + var spaceKey = material.util.createKey({
|
| + 'widthInWeight': 5.21
|
| });
|
| - var enSwitcher = i18n.input.chrome.inputview.layouts.util.createKey({
|
| + var enSwitcher = material.util.createKey({
|
| 'widthInWeight': 1,
|
| 'condition': i18n.input.chrome.inputview.ConditionName.
|
| SHOW_EN_SWITCHER_KEY
|
| });
|
| - var altGrKey = i18n.input.chrome.inputview.layouts.util.createKey({
|
| + var altGrKey = material.util.createKey({
|
| 'widthInWeight': 1.25,
|
| 'condition': i18n.input.chrome.inputview.ConditionName.
|
| SHOW_ALTGR
|
| @@ -56,21 +60,21 @@ i18n.input.chrome.inputview.layouts.SpaceRow.create = function() {
|
| altGrKey['spec']['giveWeightTo'] = spaceKey['spec']['id'];
|
| enSwitcher['spec']['giveWeightTo'] = spaceKey['spec']['id'];
|
|
|
| - var leftKey = i18n.input.chrome.inputview.layouts.util.createKey({
|
| - 'widthInWeight': 1.08
|
| + var leftKey = material.util.createKey({
|
| + 'widthInWeight': 1
|
| });
|
| - var rightKey = i18n.input.chrome.inputview.layouts.util.createKey({
|
| - 'widthInWeight': 1.08
|
| + var rightKey = material.util.createKey({
|
| + 'widthInWeight': 1
|
| });
|
| - var hideKeyboardKey = i18n.input.chrome.inputview.layouts.util.createKey({
|
| - 'widthInWeight': 1.08
|
| + var hideKeyboardKey = material.util.createKey({
|
| + 'widthInWeight': 1
|
| });
|
| - var spaceKeyRow = i18n.input.chrome.inputview.layouts.util.
|
| - createLinearLayout({
|
| + var spaceKeyRow = material.util.createLinearLayout({
|
| 'id': 'spaceKeyrow',
|
| 'children': [globeKey, menuKey, ctrlKey, altKey, spaceKey,
|
| - enSwitcher, altGrKey, leftKey, rightKey, hideKeyboardKey]
|
| + enSwitcher, altGrKey, leftKey, rightKey, hideKeyboardKey]
|
| });
|
| return spaceKeyRow;
|
| };
|
|
|
| +}); // goog.scope
|
|
|