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

[DE] Fix Bug 47607

Browse source
This commit is contained in:
Julia Radzhabova 2020-11-23 21:37:56 +03:00
parent 6be3e9ea97
commit 2a60b2466d
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/documenteditor/main/app/controller/Links.js
View file

@ -337,6 +337,7 @@ define([
Common.NotificationCenter.trigger('edit:complete', me.toolbar); Common.NotificationCenter.trigger('edit:complete', me.toolbar);
}, },
isEndNote: isEndNote, isEndNote: isEndNote,
hasSections: me.api.asc_GetSectionsCount()>1,
props: isEndNote ? me.api.asc_GetEndnoteProps() : me.api.asc_GetFootnoteProps() props: isEndNote ? me.api.asc_GetEndnoteProps() : me.api.asc_GetFootnoteProps()
})).show(); })).show();
break; break;

10
apps/documenteditor/main/app/view/NoteSettingsDialog.js
View file

@ -130,6 +130,7 @@ define([
this.handler = options.handler; this.handler = options.handler;
this.props = options.props; this.props = options.props;
this.isEndNote = options.isEndNote || false; this.isEndNote = options.isEndNote || false;
this.hasSections = options.hasSections || false;
Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options); Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options);
@ -260,17 +261,16 @@ define([
me.btnApply.setDisabled(value.length>0); me.btnApply.setDisabled(value.length>0);
}); });
var arr = this.hasSections ? [{ displayValue: this.textSection, value: 0 }] : [];
arr.push({ displayValue: this.textDocument, value: 1 });
this.cmbApply = new Common.UI.ComboBox({ this.cmbApply = new Common.UI.ComboBox({
el: $('#note-settings-combo-apply'), el: $('#note-settings-combo-apply'),
cls: 'input-group-nr', cls: 'input-group-nr',
menuStyle: 'min-width: 150px;', menuStyle: 'min-width: 150px;',
editable: false, editable: false,
data: [ data: arr
{ displayValue: this.textDocument, value: 1 },
{ displayValue: this.textSection, value: 0 }
]
}); });
this.cmbApply.setValue(1); this.cmbApply.setValue(arr[0].value);
this.btnApply = new Common.UI.Button({ this.btnApply = new Common.UI.Button({
el: $('#note-settings-btn-apply') el: $('#note-settings-btn-apply')