| Index: third_party/google_input_tools/src/chrome/os/inputview/layouts/material/compactspacerow.js
|
| diff --git a/third_party/google_input_tools/src/chrome/os/inputview/layouts/compactspacerow.js b/third_party/google_input_tools/src/chrome/os/inputview/layouts/material/compactspacerow.js
|
| similarity index 50%
|
| copy from third_party/google_input_tools/src/chrome/os/inputview/layouts/compactspacerow.js
|
| copy to third_party/google_input_tools/src/chrome/os/inputview/layouts/material/compactspacerow.js
|
| index 4499728b0645fce3689210511aaa85ee92cca810..cfdeb8d131e06e4d38a042d99206569388f8d2c0 100644
|
| --- a/third_party/google_input_tools/src/chrome/os/inputview/layouts/compactspacerow.js
|
| +++ b/third_party/google_input_tools/src/chrome/os/inputview/layouts/material/compactspacerow.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.CompactSpaceRow');
|
| +goog.provide('i18n.input.chrome.inputview.layouts.material.CompactSpaceRow');
|
|
|
| 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;
|
|
|
|
|
| /**
|
| @@ -23,50 +27,44 @@ goog.require('i18n.input.chrome.inputview.layouts.util');
|
| * nordic layout.
|
| * @return {!Object} The compact spaceKey row.
|
| */
|
| -i18n.input.chrome.inputview.layouts.CompactSpaceRow.create = function(
|
| +material.CompactSpaceRow.create = function(
|
| isNordic) {
|
| - var digitSwitcher = i18n.input.chrome.inputview.layouts.util.createKey({
|
| - 'widthInWeight': 1.1
|
| + var digitSwitcher = material.util.createKey({
|
| + 'widthInWeight': 1.078125
|
| });
|
| - var globeOrSymbolKey = i18n.input.chrome.inputview.layouts.util.createKey({
|
| + var globeOrSymbolKey = 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 slashKey = i18n.input.chrome.inputview.layouts.util.createKey({
|
| + var slashKey = material.util.createKey({
|
| 'widthInWeight': 1
|
| });
|
| - var space;
|
| - if (isNordic) {
|
| - space = i18n.input.chrome.inputview.layouts.util.createKey({
|
| - 'widthInWeight': 5
|
| - });
|
| - } else {
|
| - space = i18n.input.chrome.inputview.layouts.util.createKey({
|
| - 'widthInWeight': 4
|
| - });
|
| - }
|
| - var comma = i18n.input.chrome.inputview.layouts.util.createKey({
|
| + var space = material.util.createKey({
|
| + 'widthInWeight': 4
|
| + });
|
| + var comma = material.util.createKey({
|
| 'widthInWeight': 1
|
| });
|
| - var period = i18n.input.chrome.inputview.layouts.util.createKey({
|
| + var period = material.util.createKey({
|
| 'widthInWeight': 1
|
| });
|
| - var hide = i18n.input.chrome.inputview.layouts.util.createKey({
|
| - 'widthInWeight': 1.1
|
| + var hide = material.util.createKey({
|
| + 'widthInWeight': 1.078125
|
| });
|
|
|
| menuKey['spec']['giveWeightTo'] = space['spec']['id'];
|
| globeOrSymbolKey['spec']['giveWeightTo'] = space['spec']['id'];
|
|
|
| - var spaceKeyRow = i18n.input.chrome.inputview.layouts.util.
|
| - createLinearLayout({
|
| - 'id': 'spaceKeyrow',
|
| - 'children': [digitSwitcher, globeOrSymbolKey, menuKey, slashKey, space,
|
| - comma, period, hide]
|
| - });
|
| + var spaceKeyRow = material.util.createLinearLayout({
|
| + 'id': 'spaceKeyrow',
|
| + 'children': [digitSwitcher, globeOrSymbolKey, menuKey, slashKey, space,
|
| + comma, period, hide]
|
| + });
|
| return spaceKeyRow;
|
| };
|
| +
|
| +}); // goog.scope
|
|
|