Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Separator settings

Browse source
This commit is contained in:
Julia Svinareva 2019-12-09 14:53:06 +03:00
parent 2857df224d
commit 0b3636f663
3 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -347,9 +347,13 @@ define([
var reg = Common.localStorage.getItem("sse-settings-reg-settings"), var reg = Common.localStorage.getItem("sse-settings-reg-settings"),
isUseBaseSeparator = Common.localStorage.getBool("sse-settings-use-base-separator", true), isUseBaseSeparator = Common.localStorage.getBool("sse-settings-use-base-separator", true),
decimal = Common.localStorage.getItem("sse-settings-decimal-separator"), decimal = undefined,
group = Common.localStorage.getItem("sse-settings-group-separator"); group = undefined;
Common.Utils.InternalSettings.set("sse-settings-use-base-separator", isUseBaseSeparator); Common.Utils.InternalSettings.set("sse-settings-use-base-separator", isUseBaseSeparator);
if (!isUseBaseSeparator) {
decimal = Common.localStorage.getItem("sse-settings-decimal-separator");
group = Common.localStorage.getItem("sse-settings-group-separator");
}
if (reg!==null) if (reg!==null)
this.api.asc_setLocale(parseInt(reg), decimal, group); this.api.asc_setLocale(parseInt(reg), decimal, group);
else { else {

28
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file

@ -773,6 +773,11 @@ define([
'</span>'].join('')) '</span>'].join(''))
}).on('selected', function(combo, record) { }).on('selected', function(combo, record) {
me.updateRegionalExample(record.value); me.updateRegionalExample(record.value);
var isBaseSettings = me.chSeparator.getValue();
if (isBaseSettings === 'checked') {
me.inputDecimalSeparator.setValue(me.api.asc_getDecimalSeparator(record.value), true);
me.inputThousandsSeparator.setValue(me.api.asc_getGroupSeparator(record.value), true);
}
}); });
if (this.cmbRegSettings.scroller) this.cmbRegSettings.scroller.update({alwaysVisibleY: true}); if (this.cmbRegSettings.scroller) this.cmbRegSettings.scroller.update({alwaysVisibleY: true});
@ -782,8 +787,9 @@ define([
}).on('change', _.bind(function(field, newValue, oldValue, eOpts){ }).on('change', _.bind(function(field, newValue, oldValue, eOpts){
var checked = field.getValue() === 'checked'; var checked = field.getValue() === 'checked';
if (checked) { if (checked) {
var decimal = this.api.asc_getDecimalSeparator(), var lang = this.cmbRegSettings.getValue(),
group = this.api.asc_getGroupSeparator(); decimal = this.api.asc_getDecimalSeparator(_.isNumber(lang) ? lang : undefined),
group = this.api.asc_getGroupSeparator(_.isNumber(lang) ? lang : undefined);
this.inputDecimalSeparator.setValue(decimal); this.inputDecimalSeparator.setValue(decimal);
this.inputThousandsSeparator.setValue(group); this.inputThousandsSeparator.setValue(group);
} }
@ -795,14 +801,15 @@ define([
var key = event.key, var key = event.key,
value = event.target.value; value = event.target.value;
if (key !== 'ArrowLeft' && key !== 'ArrowDown' && key !== 'ArrowUp' && key !== 'ArrowRight' && if (key !== 'ArrowLeft' && key !== 'ArrowDown' && key !== 'ArrowUp' && key !== 'ArrowRight' &&
key !== 'Home' && key !== 'End' && key !== 'Backspace' && key !== 'Delete' && value.length > 0) { key !== 'Home' && key !== 'End' && key !== 'Backspace' && key !== 'Delete' && value.length > 0 &&
event.target.selectionEnd - event.target.selectionStart === 0) {
event.preventDefault(); event.preventDefault();
} }
}; };
this.inputDecimalSeparator = new Common.UI.InputField({ this.inputDecimalSeparator = new Common.UI.InputField({
el: $markup.findById('#fms-decimal-separator'), el: $markup.findById('#fms-decimal-separator'),
style: 'width: 50px;', style: 'width: 35px;',
validateOnBlur: false validateOnBlur: false
}); });
var $decimalSeparatorInput = this.inputDecimalSeparator.$el.find('input'); var $decimalSeparatorInput = this.inputDecimalSeparator.$el.find('input');
@ -810,7 +817,7 @@ define([
this.inputThousandsSeparator = new Common.UI.InputField({ this.inputThousandsSeparator = new Common.UI.InputField({
el: $markup.findById('#fms-thousands-separator'), el: $markup.findById('#fms-thousands-separator'),
style: 'width: 50px;', style: 'width: 35px;',
validateOnBlur: false validateOnBlur: false
}); });
var $thousandsSeparatorInput = this.inputThousandsSeparator.$el.find('input'); var $thousandsSeparatorInput = this.inputThousandsSeparator.$el.find('input');
@ -909,15 +916,16 @@ define([
this.updateRegionalExample(value); this.updateRegionalExample(value);
var isBaseSettings = Common.Utils.InternalSettings.get("sse-settings-use-base-separator"); var isBaseSettings = Common.Utils.InternalSettings.get("sse-settings-use-base-separator");
this.chSeparator.setValue(isBaseSettings); this.chSeparator.setValue(isBaseSettings, true);
var decimal, var decimal,
group; group;
if (!isBaseSettings) { if (!isBaseSettings) {
decimal = Common.Utils.InternalSettings.get("sse-settings-decimal-separator") || this.api.asc_getDecimalSeparator() || ''; decimal = Common.Utils.InternalSettings.get("sse-settings-decimal-separator") || this.api.asc_getDecimalSeparator();
group = Common.Utils.InternalSettings.get("sse-settings-group-separator") || this.api.asc_getGroupSeparator() || ''; group = Common.Utils.InternalSettings.get("sse-settings-group-separator") || this.api.asc_getGroupSeparator();
} else { } else {
decimal = this.api.asc_getDecimalSeparator(); var lang = this.cmbRegSettings.getValue();
group = this.api.asc_getGroupSeparator(); decimal = this.api.asc_getDecimalSeparator(_.isNumber(lang) ? lang : undefined);
group = this.api.asc_getGroupSeparator(_.isNumber(lang) ? lang : undefined);
} }
this.inputDecimalSeparator.setValue(decimal); this.inputDecimalSeparator.setValue(decimal);
this.inputThousandsSeparator.setValue(group); this.inputThousandsSeparator.setValue(group);

4
apps/spreadsheeteditor/main/locale/en.json
View file

@ -1595,6 +1595,10 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Point", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Point",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.strSeparator": "Separator",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.strUseSeparatorsBasedOnRegionalSettings": "Use separators based on regional settings",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.strDecimalSeparator": "Decimal separator",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.strThousandsSeparator": "Thousands separator",
"SSE.Views.FileMenuPanels.MainSpellCheckSettings.strIgnoreWordsInUPPERCASE": "Ignore words in UPPERCASE", "SSE.Views.FileMenuPanels.MainSpellCheckSettings.strIgnoreWordsInUPPERCASE": "Ignore words in UPPERCASE",
"SSE.Views.FileMenuPanels.MainSpellCheckSettings.strIgnoreWordsWithNumbers": "Ignore words with numbers", "SSE.Views.FileMenuPanels.MainSpellCheckSettings.strIgnoreWordsWithNumbers": "Ignore words with numbers",
"SSE.Views.FileMenuPanels.MainSpellCheckSettings.strDictionaryLanguage": "Dictionary language", "SSE.Views.FileMenuPanels.MainSpellCheckSettings.strDictionaryLanguage": "Dictionary language",