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

[SSE] Scale Dialog

Browse source
This commit is contained in:
Julia Svinareva 2019-09-13 13:36:22 +03:00
parent 0b026c8422
commit 178ebc3901
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -63,19 +63,19 @@ define([
this.template = [
'<div class="box">',
'<div id="radio-fit-to" style="margin-bottom: 8px;"></div>',
'<div id="radio-fit-to" style="margin-bottom: 4px;"></div>',
'<div style="padding-left: 22px;">',
'<div>',
'<label style="height: 22px;width: 45px;padding-top: 4px;display: inline-block;margin-bottom: 4px;">' + this.textWidth + '</label>',
'<div id="scale-width" style="display: inline-block;margin-bottom: 4px;"></div>',
'</div>',
'<div>',
'<label style="height: 22px;width: 45px;padding-top: 4px;display: inline-block;margin-bottom: 10px;">' + this.textHeight + '</label>',
'<div id="scale-height" style="display: inline-block;margin-bottom: 10px;"></div>',
'<label style="height: 22px;width: 45px;padding-top: 4px;display: inline-block;margin-bottom: 16px;">' + this.textHeight + '</label>',
'<div id="scale-height" style="display: inline-block;margin-bottom: 16px;"></div>',
'</div>',
'</div>',
'<div id="radio-scale-to" style="margin-bottom: 8px;"></div>',
'<div id="scale" style="padding-left: 22px;"></div>',
'<div id="radio-scale-to" style="margin-bottom: 6px;"></div>',
'<div id="scale" style="padding-left: 22px; margin-bottom: 6px;"></div>',
'</div>',
'<div class="footer center">',
'<button class="btn normal dlg-btn primary" result="ok" style="margin-right: 10px;">' + this.okButtonText + '</button>',
@ -269,11 +269,17 @@ define([
},
onChangeComboScale: function(type, combo, record, e) {
var me = this;
var value = parseInt(record.value),
textPage = me.getTextPages(value);
var expr = new RegExp('^\\s*(\\d*)\\s*(' + textPage + ')?\\s*$');
if (!(expr.exec(record.value)) || value < 1 || value > 32767) {
var me = this,
textPage,
value = record.value.toLowerCase();
var exprAuto = new RegExp('^\\s*(' + me.textAuto.toLowerCase() + ')\\s*$');
if (exprAuto.exec(value)) {
value = 0;
} else {
value = parseInt(value);
!isNaN(value) && (textPage = me.getTextPages(value));
}
if (isNaN(value) || value < 0 || value > 32767) {
Common.UI.error({
msg: me.textError,
callback: function() {
@ -310,7 +316,7 @@ define([
okButtonText: 'Ok',
textWidth: 'Width',
textHeight: 'Height',
textAuto: 'Automatic',
textAuto: 'Auto',
textOnePage: 'page',
textFewPages: 'pages',
textManyPages: 'pages',

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

@ -2439,7 +2439,7 @@
"SSE.Views.ScaleDialog.okButtonText": "Ok",
"SSE.Views.ScaleDialog.textWidth": "Width",
"SSE.Views.ScaleDialog.textHeight": "Height",
"SSE.Views.ScaleDialog.textAuto": "Automatic",
"SSE.Views.ScaleDialog.textAuto": "Auto",
"SSE.Views.ScaleDialog.textOnePage": "page",
"SSE.Views.ScaleDialog.textFewPages": "pages",
"SSE.Views.ScaleDialog.textManyPages": "pages",