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

Merge branch hotfix/v6.3.1 into master

Browse source
This commit is contained in:
papacarlo 2021-06-28 08:19:48 +00:00
parent 41107744fd 7218ed9e2a
commit a113f189f9
5 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/view/SearchDialog.js
View file

@ -99,7 +99,7 @@
'<div class="separator horizontal"></div>', '<div class="separator horizontal"></div>',
'<div class="footer right">', '<div class="footer right">',
'<button class="btn normal dlg-btn" result="replace">'+this.txtBtnReplace+'</button>', '<button class="btn normal dlg-btn" result="replace">'+this.txtBtnReplace+'</button>',
'<button class="btn normal dlg-btn" result="replaceall" style="margin-left: 6px;">'+this.txtBtnReplaceAll+'</button>', '<button class="btn normal dlg-btn" result="replaceall" style="margin-left: 6px;width: auto;">'+this.txtBtnReplaceAll+'</button>',
'<button class="btn normal dlg-btn iconic" result="back"><span class="icon img-commonctrl back"></span></button>', '<button class="btn normal dlg-btn iconic" result="back"><span class="icon img-commonctrl back"></span></button>',
'<button class="btn normal dlg-btn iconic" result="next" style="margin-left: 6px;"><span class="icon img-commonctrl next"></span></button>', '<button class="btn normal dlg-btn iconic" result="next" style="margin-left: 6px;"><span class="icon img-commonctrl next"></span></button>',
'</div>' '</div>'

2
apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template
View file

@ -160,7 +160,7 @@
</div> </div>
<div> <div>
<div class="padding-large" style="display: inline-block; margin-right: 9px;"> <div class="padding-large" style="display: inline-block; margin-right: 8px;">
<label class="input-label"><%= scope.textTabPosition %></label> <label class="input-label"><%= scope.textTabPosition %></label>
<div id="paraadv-spin-tab"></div> <div id="paraadv-spin-tab"></div>
</div> </div>

4
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -1960,6 +1960,10 @@ define([
toolbar.listStyles.resumeEvents(); toolbar.listStyles.resumeEvents();
this._state.prstyle = undefined; this._state.prstyle = undefined;
} }
if ( this.appConfig.isDesktopApp && this.appConfig.canProtect ) {
this.getApplication().getController('Common.Controllers.Protection').SetDisabled(is_cell_edited, false);
}
} else { } else {
if (state == Asc.c_oAscCellEditorState.editText) var is_text = true, is_formula = false; else if (state == Asc.c_oAscCellEditorState.editText) var is_text = true, is_formula = false; else
if (state == Asc.c_oAscCellEditorState.editFormula) is_text = !(is_formula = true); else if (state == Asc.c_oAscCellEditorState.editFormula) is_text = !(is_formula = true); else

2
apps/spreadsheeteditor/main/app/view/FormulaWizard.js
View file

@ -407,7 +407,7 @@ define([
me.helpUrl = url; me.helpUrl = url;
me.showHelp(); me.showHelp();
} else { } else {
lang = 'en'; lang = '{{DEFAULT_LANG}}';
url = 'resources/help/' + lang + name; url = 'resources/help/' + lang + name;
fetch(url).then(function(response){ fetch(url).then(function(response){
if ( response.ok ) { if ( response.ok ) {

24
apps/spreadsheeteditor/main/app/view/HeaderFooterDialog.js
View file

@ -273,7 +273,7 @@ define([
parentEl: $('#id-dlg-h-presets'), parentEl: $('#id-dlg-h-presets'),
cls: 'btn-text-menu-default', cls: 'btn-text-menu-default',
caption: this.textPresets, caption: this.textPresets,
style: 'width: 110px;', style: 'width: 115px;',
menu: true menu: true
}); });
@ -281,7 +281,7 @@ define([
parentEl: $('#id-dlg-f-presets'), parentEl: $('#id-dlg-f-presets'),
cls: 'btn-text-menu-default', cls: 'btn-text-menu-default',
caption: this.textPresets, caption: this.textPresets,
style: 'width: 110px;', style: 'width: 115px;',
menu: true menu: true
}); });
@ -298,9 +298,9 @@ define([
parentEl: $('#id-dlg-h-insert'), parentEl: $('#id-dlg-h-insert'),
cls: 'btn-text-menu-default', cls: 'btn-text-menu-default',
caption: this.textInsert, caption: this.textInsert,
style: 'width: 110px;', style: 'width: 115px;',
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
style: 'min-width: 110px;', style: 'min-width: 115px;',
maxHeight: 200, maxHeight: 200,
additionalAlign: this.menuAddAlign, additionalAlign: this.menuAddAlign,
items: data items: data
@ -313,9 +313,9 @@ define([
parentEl: $('#id-dlg-f-insert'), parentEl: $('#id-dlg-f-insert'),
cls: 'btn-text-menu-default', cls: 'btn-text-menu-default',
caption: this.textInsert, caption: this.textInsert,
style: 'width: 110px;', style: 'width: 115px;',
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
style: 'min-width: 110px;', style: 'min-width: 115px;',
maxHeight: 200, maxHeight: 200,
additionalAlign: this.menuAddAlign, additionalAlign: this.menuAddAlign,
items: data items: data
@ -376,9 +376,9 @@ define([
this.cmbFontSize.push(new Common.UI.ComboBox({ this.cmbFontSize.push(new Common.UI.ComboBox({
el: $('#id-dlg-h-font-size'), el: $('#id-dlg-h-font-size'),
cls: 'input-group-nr', cls: 'input-group-nr',
style: 'width: 55px;', style: 'width: 45px;',
menuCls : 'scrollable-menu', menuCls : 'scrollable-menu',
menuStyle: 'min-width: 55px;max-height: 270px;', menuStyle: 'min-width: 45px;max-height: 270px;',
hint: this.tipFontSize, hint: this.tipFontSize,
data: data data: data
})); }));
@ -392,9 +392,9 @@ define([
this.cmbFontSize.push(new Common.UI.ComboBox({ this.cmbFontSize.push(new Common.UI.ComboBox({
el: $('#id-dlg-f-font-size'), el: $('#id-dlg-f-font-size'),
cls: 'input-group-nr', cls: 'input-group-nr',
style: 'width: 55px;', style: 'width: 45px;',
menuCls : 'scrollable-menu', menuCls : 'scrollable-menu',
menuStyle: 'min-width: 55px;max-height: 270px;', menuStyle: 'min-width: 45px;max-height: 270px;',
hint: this.tipFontSize, hint: this.tipFontSize,
data: data data: data
})); }));
@ -662,14 +662,14 @@ define([
}); });
this.btnPresetsH.setMenu(new Common.UI.Menu({ this.btnPresetsH.setMenu(new Common.UI.Menu({
style: 'min-width: 110px;', style: 'min-width: 115px;',
maxHeight: 200, maxHeight: 200,
additionalAlign: this.menuAddAlign, additionalAlign: this.menuAddAlign,
items: presets items: presets
})); }));
this.btnPresetsH.menu.on('item:click', _.bind(this.onPresetSelect, this, false)); this.btnPresetsH.menu.on('item:click', _.bind(this.onPresetSelect, this, false));
this.btnPresetsF.setMenu(new Common.UI.Menu({ this.btnPresetsF.setMenu(new Common.UI.Menu({
style: 'min-width: 110px;', style: 'min-width: 115px;',
maxHeight: 200, maxHeight: 200,
additionalAlign: this.menuAddAlign, additionalAlign: this.menuAddAlign,
items: presets items: presets