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

Merge branch 'release/v8.1.0' into feature/close-editor

Browse Source
This commit is contained in:
Julia Radzhabova
2024-02-22 17:49:03 +03:00
parent 14c33df9e1 3740ba4cb7
commit 2ad950ffb7
322 changed files with 3178 additions and 2092 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/presentationeditor/main/app/controller/LeftMenu.js
View File

@ -293,7 +293,10 @@ define([
clickSaveCopyAsFormat: function(menu, format, ext) {
this.isFromFileDownloadAs = ext;
this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format, true));
var options = new Asc.asc_CDownloadOptions(format, true);
options.asc_setIsSaveAs(true);
this.api.asc_DownloadAs(options);
menu.hide();
},
@ -601,7 +604,7 @@ define([
if (this.isSearchPanelVisible()) {
selectedText && this.leftMenu.panelSearch.setFindText(selectedText);
this.leftMenu.panelSearch.focus(selectedText !== '' ? s : 'search');
this.leftMenu.fireEvent('search:aftershow', this.leftMenu, selectedText ? selectedText : undefined);
this.leftMenu.fireEvent('search:aftershow', selectedText ? [selectedText] : undefined);
return false;
} else if (this.getApplication().getController('Viewport').isSearchBarVisible()) {
var viewport = this.getApplication().getController('Viewport');
@ -675,7 +678,7 @@ define([
}
}
if ( this.leftMenu.btnAbout.pressed || this.leftMenu.isPluginButtonPressed() || $(e.target).parents('#left-menu').length ) {
if ( this.leftMenu.btnAbout.pressed ) {
if (!Common.UI.HintManager.isHintVisible()) {
this.leftMenu.close();
Common.NotificationCenter.trigger('layout:changed', 'leftmenu');
@ -740,7 +743,7 @@ define([
Common.UI.Menu.Manager.hideAll();
this.tryToShowLeftMenu();
this.leftMenu.showMenu('advancedsearch', undefined, true);
this.leftMenu.fireEvent('search:aftershow', this.leftMenu, findText);
this.leftMenu.fireEvent('search:aftershow', [findText]);
} else {
this.leftMenu.btnSearchBar.toggle(false, true);
this.leftMenu.onBtnMenuClick(this.leftMenu.btnSearchBar);