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

Merge pull request #826 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-04-22 12:19:42 +03:00 committed by GitHub
parent 40b2738bcf 1ab9d09675
commit d0e8931a29
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -99,6 +99,7 @@ define([
type: 'password',
allowBlank : false,
style : 'width: 100%;',
maxLength: 255,
validateOnBlur: false
});
this.repeatPwd = new Common.UI.InputField({
@ -106,6 +107,7 @@ define([
type: 'password',
allowBlank : false,
style : 'width: 100%;',
maxLength: 255,
validateOnBlur: false,
validation : function(value) {
return me.txtIncorrectPwd;

7
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -301,6 +301,9 @@ define([
toolbar.mnuNumberChangeLevel && toolbar.mnuNumberChangeLevel.menu &&
toolbar.mnuNumberChangeLevel.menu.on('show:after', _.bind(this.onChangeLevelShowAfter, this, 1));
toolbar.mnuNumberChangeLevel.menu.on('item:click', _.bind(this.onChangeLevelClick, this, 1));
toolbar.mnuMultiChangeLevel && toolbar.mnuMultiChangeLevel.menu &&
toolbar.mnuMultiChangeLevel.menu.on('show:after', _.bind(this.onChangeLevelShowAfter, this, 2));
toolbar.mnuMultiChangeLevel.menu.on('item:click', _.bind(this.onChangeLevelClick, this, 2));
toolbar.btnHighlightColor.on('click', _.bind(this.onBtnHighlightColor, this));
toolbar.btnFontColor.on('click', _.bind(this.onBtnFontColor, this));
toolbar.btnParagraphColor.on('click', _.bind(this.onBtnParagraphColor, this));
@ -526,6 +529,7 @@ define([
this.toolbar.mnuMarkerSettings && this.toolbar.mnuMarkerSettings.setDisabled(this._state.bullets.subtype<0);
this.toolbar.mnuMarkerChangeLevel && this.toolbar.mnuMarkerChangeLevel.setDisabled(this._state.bullets.subtype<0);
this.toolbar.mnuMultilevelSettings && this.toolbar.mnuMultilevelSettings.setDisabled(this._state.bullets.subtype<0);
this.toolbar.mnuMultiChangeLevel && this.toolbar.mnuMultiChangeLevel.setDisabled(this._state.bullets.subtype<0);
break;
case 1:
var idx;
@ -561,6 +565,7 @@ define([
this.toolbar.mnuNumberSettings && this.toolbar.mnuNumberSettings.setDisabled(idx==0);
this.toolbar.mnuNumberChangeLevel && this.toolbar.mnuNumberChangeLevel.setDisabled(idx==0);
this.toolbar.mnuMultilevelSettings && this.toolbar.mnuMultilevelSettings.setDisabled(idx==0);
this.toolbar.mnuMultiChangeLevel && this.toolbar.mnuMultiChangeLevel.setDisabled(idx==0);
break;
case 2:
this.toolbar.btnMultilevels.toggle(true, true);
@ -1409,7 +1414,6 @@ define([
onChangeLevelShowAfter: function(type, menu) {
var me = this;
var listId = me.api.asc_GetCurrentNumberingId(),
level = me.api.asc_GetCurrentNumberingLvl(),
props = (listId !== null) ? me.api.asc_GetNumberingPr(listId) : null;
if (props) {
this.api.SetDrawImagePreviewBulletChangeListLevel(menu.options.previewIds, props);
@ -2387,6 +2391,7 @@ define([
this.toolbar.mnuMultilevelSettings && this.toolbar.mnuMultilevelSettings.setDisabled(true);
this.toolbar.mnuMarkerChangeLevel && this.toolbar.mnuMarkerChangeLevel.setDisabled(true);
this.toolbar.mnuNumberChangeLevel && this.toolbar.mnuNumberChangeLevel.setDisabled(true);
this.toolbar.mnuMultiChangeLevel && this.toolbar.mnuMultiChangeLevel.setDisabled(true);
},
_getApiTextSize: function () {

24
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -1707,6 +1707,7 @@ define([
style: 'min-width: 139px',
items: [
{template: _.template('<div id="id-toolbar-menu-markers" class="menu-markers" style="width: 139px; margin: 0 9px;"></div>')},
{caption: '--'},
this.mnuMarkerChangeLevel = new Common.UI.MenuItem({
caption: this.textChangeLevel,
style: 'padding-right:20px;',
@ -1727,7 +1728,7 @@ define([
})
);
items = [], ids = [];
items = []; ids = [];
for (var i=0; i<9; i++) {
ids.push('id-toolbar-menu-numbering-level-' + i);
items.push({template: levelTemplate, previewId: ids[i], level: i });
@ -1737,6 +1738,7 @@ define([
cls: 'shifted-left',
items: [
{template: _.template('<div id="id-toolbar-menu-numbering" class="menu-markers" style="width: 185px; margin: 0 9px;"></div>')},
{caption: '--'},
this.mnuNumberChangeLevel = new Common.UI.MenuItem({
caption: this.textChangeLevel,
style: 'padding-right:20px;',
@ -1756,13 +1758,29 @@ define([
]
})
);
items = []; ids = [];
for (var i=0; i<9; i++) {
ids.push('id-toolbar-menu-multilevels-level-' + i);
items.push({template: levelTemplate, previewId: ids[i], level: i });
}
this.btnMultilevels.setMenu(
new Common.UI.Menu({
cls: 'shifted-left',
style: 'min-width: 90px',
items: [
{template: _.template('<div id="id-toolbar-menu-multilevels" class="menu-markers" style="width: 93px; margin: 0 9px;"></div>')},
{template: _.template('<div id="id-toolbar-menu-multilevels" class="menu-markers" style="width: 185px; margin: 0 9px;"></div>')},
{caption: '--'},
this.mnuMultiChangeLevel = new Common.UI.MenuItem({
caption: this.textChangeLevel,
style: 'padding-right:20px;',
disabled: (this.mnuMultilevelPicker.conf.index || 0)==0,
menu: new Common.UI.Menu({
cls: 'list-settings-level',
menuAlign: 'tl-tr',
items: items,
previewIds: ids
})
}),
this.mnuMultilevelSettings = new Common.UI.MenuItem({
caption: this.textListSettings,
disabled: (this.mnuMultilevelPicker.conf.index || 0)==0,

10
apps/spreadsheeteditor/main/app/view/PivotGroupDialog.js
View file

@ -242,9 +242,11 @@ define([
if (rangePr) {
this.chStart.setValue(rangePr.asc_getAutoStart(), true);
this.chEnd.setValue(rangePr.asc_getAutoEnd(), true);
this.inputStart.setValue((dateTypes ? rangePr.asc_getStartDateText() : rangePr.asc_getStartNum()) || '');
this.inputEnd.setValue((dateTypes ? rangePr.asc_getEndDateText() : rangePr.asc_getEndNum()) || '');
!dateTypes && this.inputBy.setValue(rangePr.asc_getGroupInterval() || '');
var value = dateTypes ? rangePr.asc_getStartDateText() : rangePr.asc_getStartNum();
this.inputStart.setValue(value!==null && value!==undefined ? value : '');
value = dateTypes ? rangePr.asc_getEndDateText() : rangePr.asc_getEndNum();
this.inputEnd.setValue(value!==null && value!==undefined ? value : '');
!dateTypes && this.inputBy.setValue(rangePr.asc_getGroupInterval());
this.rangePr = rangePr;
if (defRangePr) {
this.defRangePr = {start: dateTypes ? defRangePr.asc_getStartDateText() : defRangePr.asc_getStartNum(), end: dateTypes ? defRangePr.asc_getEndDateText() : defRangePr.asc_getEndNum()};
@ -259,7 +261,7 @@ define([
if (item == Asc.c_oAscGroupBy.Days)
isDays = true;
});
this.spnDays.setValue(rangePr.asc_getGroupInterval() || '');
this.spnDays.setValue(rangePr.asc_getGroupInterval());
this.spnDays.setDisabled(!isDays || dateTypes.length>1);
this.btnOk.setDisabled(dateTypes.length<1);
this.dateTypes = dateTypes;