pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-26 17:31:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

[DE] Fix scroll in right panel

Browse Source
This commit is contained in:
Julia Radzhabova
2023-06-14 17:56:24 +03:00
parent 4636c96b9c
commit 771009fdc0
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/documenteditor/main/app/controller/RightMenu.js
View File

@ -132,8 +132,10 @@ define([
var panel = this._settings[type].panel;
var props = this._settings[type].props;
if (props && panel)
if (props && panel) {
panel.ChangeSettings.call(panel, (type==Common.Utils.documentSettingsType.MailMerge || type==Common.Utils.documentSettingsType.Signature) ? undefined : props);
this.rightmenu.updateScroller();
}
} else if (minimized && type==Common.Utils.documentSettingsType.MailMerge) {
this.rightmenu.mergeSettings.disablePreviewMode();
}
@ -315,6 +317,7 @@ define([
this._settings[active].panel.ChangeSettings.call(this._settings[active].panel, this._settings[active].props);
else
this._settings[active].panel.ChangeSettings.call(this._settings[active].panel);
this.rightmenu.updateScroller();
} else if (activePane) { // lock active pane if no selected objects (ex. drawing)
for (var i=0; i<this._settings.length; i++) {
if (this._settings[i] && this._settings[i].panelId === activePane) {
@ -419,6 +422,7 @@ define([
if (settingsType !== Common.Utils.documentSettingsType.Paragraph) {
this.rightmenu.SetActivePane(settingsType, true);
this._settings[settingsType].panel.ChangeSettings.call(this._settings[settingsType].panel, this._settings[settingsType].props);
this.rightmenu.updateScroller();
}
},
@ -429,6 +433,7 @@ define([
this.rightmenu.SetActivePane(type, true);
this._settings[type].panel.setLocked(this._settings[type].locked);
this._settings[type].panel.ChangeSettings.call(this._settings[type].panel);
this.rightmenu.updateScroller();
},
onError: function(id, level, errData) {

7
apps/documenteditor/main/app/view/RightMenu.js
View File

@ -350,6 +350,13 @@ define([
Common.NotificationCenter.trigger('layout:changed', 'rightmenu');
},
updateScroller: function() {
if (this.scroller) {
this.scroller.update();
this.scroller.scrollTop(0);
}
},
txtParagraphSettings: 'Paragraph Settings',
txtImageSettings: 'Image Settings',
txtTableSettings: 'Table Settings',