| Index: third_party/google_input_tools/src/chrome/os/inputview/layouts/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/compactspacerow.js
|
| index 4499728b0645fce3689210511aaa85ee92cca810..a517a69ef4952871247f814dd2cbb46f1c631483 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/compactspacerow.js
|
| @@ -17,56 +17,55 @@ goog.require('i18n.input.chrome.inputview.ConditionName');
|
| goog.require('i18n.input.chrome.inputview.layouts.util');
|
|
|
|
|
| +goog.scope(function() {
|
| +var layouts = i18n.input.chrome.inputview.layouts;
|
| +var util = layouts.util;
|
| +
|
| +
|
| /**
|
| * Creates the compact keyboard spaceKey row.
|
| * @param {boolean} isNordic True if the space key row is generated for compact
|
| * nordic layout.
|
| * @return {!Object} The compact spaceKey row.
|
| */
|
| -i18n.input.chrome.inputview.layouts.CompactSpaceRow.create = function(
|
| +layouts.CompactSpaceRow.create = function(
|
| isNordic) {
|
| - var digitSwitcher = i18n.input.chrome.inputview.layouts.util.createKey({
|
| - 'widthInWeight': 1.1
|
| + var digitSwitcher = util.createKey({
|
| + 'widthInWeight': 1.078125
|
| });
|
| - var globeOrSymbolKey = i18n.input.chrome.inputview.layouts.util.createKey({
|
| + var globeOrSymbolKey = 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 = util.createKey({
|
| 'condition': i18n.input.chrome.inputview.ConditionName.SHOW_MENU,
|
| 'widthInWeight': 1
|
| });
|
| - var slashKey = i18n.input.chrome.inputview.layouts.util.createKey({
|
| + var slashKey = 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 = util.createKey({
|
| + 'widthInWeight': 4
|
| + });
|
| + var comma = util.createKey({
|
| 'widthInWeight': 1
|
| });
|
| - var period = i18n.input.chrome.inputview.layouts.util.createKey({
|
| + var period = util.createKey({
|
| 'widthInWeight': 1
|
| });
|
| - var hide = i18n.input.chrome.inputview.layouts.util.createKey({
|
| - 'widthInWeight': 1.1
|
| + var hide = 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 = util.createLinearLayout({
|
| + 'id': 'spaceKeyrow',
|
| + 'children': [digitSwitcher, globeOrSymbolKey, menuKey, slashKey, space,
|
| + comma, period, hide]
|
| + });
|
| return spaceKeyRow;
|
| };
|
| +
|
| +}); // goog.scope
|
|
|