pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 01:13:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

[DE PE SSE] Fix bug 65228

Browse Source
This commit is contained in:
Julia.Svinareva
2023-11-26 01:48:51 +03:00
parent f79e4dd40b
commit 74e62f003d
9 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/common/main/lib/component/SideMenu.js
View File

@ -245,6 +245,25 @@ define([
this.setMoreButton();
},
isPluginButtonPressed: function () {
var pressed = false;
for (var i=0; i<this.buttons.length; i++) {
if (this.buttons[i].options.type === 'plugin' && this.buttons[i].pressed) {
pressed = true;
break;
}
}
return pressed;
},
togglePluginButtons: function (toggle) {
for (var i=0; i<this.buttons.length; i++) {
if (this.buttons[i].options.type === 'plugin' && this.buttons[i].pressed) {
this.buttons[i].toggle(toggle, true);
}
}
},
}
}()));
});

2
apps/documenteditor/main/app/controller/LeftMenu.js
View File

@ -847,7 +847,7 @@ define([
return false;
}
}
if (this.leftMenu.btnAbout.pressed || $(e.target).parents('#left-menu').length ) {
if (this.leftMenu.btnAbout.pressed || this.leftMenu.isPluginButtonPressed() || $(e.target).parents('#left-menu').length ) {
if (!Common.UI.HintManager.isHintVisible()) {
this.leftMenu.close();
Common.NotificationCenter.trigger('layout:changed', 'leftmenu');

1
apps/documenteditor/main/app/view/LeftMenu.js
View File

@ -320,6 +320,7 @@ define([
this.panelThumbnails['hide']();
this.btnThumbnails.toggle(false, true);
}
this.togglePluginButtons(false);
}
},

3
apps/pdfeditor/main/app/controller/LeftMenu.js
View File

@ -769,8 +769,7 @@ define([
return false;
}
}
if (this.leftMenu.btnAbout.pressed || this.leftMenu.btnPlugins.pressed ||
$(e.target).parents('#left-menu').length ) {
if (this.leftMenu.btnAbout.pressed || this.leftMenu.isPluginButtonPressed() || $(e.target).parents('#left-menu').length ) {
if (!Common.UI.HintManager.isHintVisible()) {
this.leftMenu.close();
Common.NotificationCenter.trigger('layout:changed', 'leftmenu');

1
apps/pdfeditor/main/app/view/LeftMenu.js
View File

@ -316,6 +316,7 @@ define([
this.panelThumbnails['hide']();
this.btnThumbnails.toggle(false, true);
}
this.togglePluginButtons(false);
}
},

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

@ -675,7 +675,7 @@ define([
}
}
if ( this.leftMenu.btnAbout.pressed || $(e.target).parents('#left-menu').length ) {
if ( this.leftMenu.btnAbout.pressed || this.leftMenu.isPluginButtonPressed() || $(e.target).parents('#left-menu').length ) {
if (!Common.UI.HintManager.isHintVisible()) {
this.leftMenu.close();
Common.NotificationCenter.trigger('layout:changed', 'leftmenu');

1
apps/presentationeditor/main/app/view/LeftMenu.js
View File

@ -289,6 +289,7 @@ define([
this.btnSearchBar.toggle(false, true);
}
this.fireEvent('panel:show', [this, '', false]);
this.togglePluginButtons(false);
},
isOpened: function() {

2
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
View File

@ -831,7 +831,7 @@ define([
return false;
}
}
if ( this.leftMenu.btnAbout.pressed ||
if ( this.leftMenu.btnAbout.pressed || this.leftMenu.isPluginButtonPressed() ||
($(e.target).parents('#left-menu').length || this.leftMenu.btnComments.pressed) && this.api.isCellEdited!==true) {
if (!Common.UI.HintManager.isHintVisible()) {
this.leftMenu.close();

1
apps/spreadsheeteditor/main/app/view/LeftMenu.js
View File

@ -273,6 +273,7 @@ define([
this.panelSearch['hide']();
this.btnSearchBar.toggle(false, true);
}
this.togglePluginButtons(false);
},
isOpened: function() {