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

Fix Bug 68543

Browse Source
This commit is contained in:
Julia Radzhabova
2024-06-11 13:07:13 +03:00
parent d2f5639f33
commit b335314cd2
6 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/common/main/lib/component/Mixtbar.js
View File

@ -254,6 +254,7 @@ define([
optsFold.$bar.removeClass('expanded');
optsFold.$bar.find('.tabs .ribtab').removeClass('active');
}
this.fireEvent('tab:collapse');
},
expand: function() {

18
apps/documenteditor/main/app/controller/FormsTab.js
View File

@ -132,7 +132,11 @@ define([
'forms:gopage': this.onGotoPage
},
'Toolbar': {
'tab:active': this.onActiveTab
'tab:active': this.onActiveTab,
'tab:collapse': this.onTabCollapse,
'view:compact' : function (toolbar, state) {
state && me.onTabCollapse();
},
}
});
this.appConfig.isRestrictedEdit && this.api && this.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(this.onDocumentModifiedChanged, this));
@ -617,11 +621,13 @@ define([
onActiveTab: function(tab) {
if (tab !== 'forms') {
this.closeHelpTip('create');
this.closeHelpTip('roles');
this.closeHelpTip('save');
}
(tab !== 'forms') && this.onTabCollapse();
},
onTabCollapse: function(tab) {
this.closeHelpTip('create');
this.closeHelpTip('roles');
this.closeHelpTip('save');
},
onChangeProtectDocument: function(props) {

8
apps/documenteditor/main/app/controller/Toolbar.js
View File

@ -123,7 +123,8 @@ define([
'insert:smartart' : this.onInsertSmartArt,
'smartart:mouseenter': this.mouseenterSmartArt,
'smartart:mouseleave': this.mouseleaveSmartArt,
'tab:active': this.onActiveTab
'tab:active': this.onActiveTab,
'tab:collapse': this.onTabCollapse
},
'FileMenu': {
'menu:hide': this.onFileMenu.bind(this, 'hide'),
@ -507,6 +508,7 @@ define([
onChangeCompactView: function(view, compact) {
this.toolbar.setFolded(compact);
this.toolbar.fireEvent('view:compact', [this, compact]);
compact && this.onTabCollapse();
Common.localStorage.setBool('de-compact-toolbar', compact);
Common.NotificationCenter.trigger('layout:changed', 'toolbar');
@ -3894,6 +3896,10 @@ define([
(tab !== 'home') && Common.UI.TooltipManager.closeTip('docMode');
},
onTabCollapse: function(tab) {
Common.UI.TooltipManager.closeTip('pageColor');
},
textEmptyImgUrl : 'You need to specify image URL.',
textWarning : 'Warning',
textFontSizeErr : 'The entered value is incorrect.<br>Please enter a numeric value between 1 and 300',

10
apps/pdfeditor/main/app/controller/Toolbar.js
View File

@ -93,7 +93,8 @@ define([
'Toolbar': {
'change:compact' : this.onClickChangeCompact,
'home:open' : this.onHomeOpen,
'tab:active' : this.onActiveTab
'tab:active' : this.onActiveTab,
'tab:collapse' : this.onTabCollapse
},
'FileMenu': {
'menu:hide': this.onFileMenu.bind(this, 'hide'),
@ -424,6 +425,8 @@ define([
this.toolbar.setFolded(compact);
this.toolbar.fireEvent('view:compact', [this, compact]);
compact && this.onTabCollapse();
Common.localStorage.setBool('pdfe-compact-toolbar', compact);
Common.NotificationCenter.trigger('layout:changed', 'toolbar');
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
@ -1361,6 +1364,11 @@ define([
(tab === 'comment') ? Common.UI.TooltipManager.showTip('textComment') : Common.UI.TooltipManager.closeTip('textComment');
},
onTabCollapse: function(tab) {
Common.UI.TooltipManager.closeTip('editPdf');
Common.UI.TooltipManager.closeTip('textComment');
},
applySettings: function() {
this.toolbar && this.toolbar.chShowComments && this.toolbar.chShowComments.setValue(Common.Utils.InternalSettings.get("pdfe-settings-livecomment"), true);
},

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

@ -150,7 +150,8 @@ define([
'insert:placeholder-menu': this.onMenuInsertPlaceholder.bind(this),
'title:hide' : this.onTitleHide.bind(this),
'footers:hide' : this.onFootersHide.bind(this),
'tab:active' : this.onActiveTab.bind(this)
'tab:active' : this.onActiveTab.bind(this),
'tab:collapse' : this.onTabCollapse.bind(this)
},
'DocumentHolder': {
'smartart:mouseenter': this.mouseenterSmartArt,
@ -483,6 +484,8 @@ define([
this.toolbar.setFolded(compact);
this.toolbar.fireEvent('view:compact', [this.toolbar, compact]);
compact && this.onTabCollapse();
Common.localStorage.setBool('pe-compact-toolbar', compact);
Common.NotificationCenter.trigger('layout:changed', 'toolbar');
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
@ -3090,6 +3093,12 @@ define([
(tab === 'view') ? Common.UI.TooltipManager.showTip('masterSlide') : Common.UI.TooltipManager.closeTip('masterSlide');
},
onTabCollapse: function(tab) {
Common.UI.TooltipManager.closeTip('colorSchema');
Common.UI.TooltipManager.closeTip('animPane');
Common.UI.TooltipManager.closeTip('masterSlide');
},
textEmptyImgUrl : 'You need to specify image URL.',
textWarning : 'Warning',
textFontSizeErr : 'The entered value is incorrect.<br>Please enter a numeric value between 1 and 300',

8
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View File

@ -91,7 +91,8 @@ define([
'insert:smartart' : this.onInsertSmartArt,
'smartart:mouseenter': this.mouseenterSmartArt,
'smartart:mouseleave': this.mouseleaveSmartArt,
'tab:active': this.onActiveTab
'tab:active': this.onActiveTab,
'tab:collapse': this.onTabCollapse
},
'FileMenu': {
'menu:hide': me.onFileMenu.bind(me, 'hide'),
@ -2209,6 +2210,7 @@ define([
onChangeViewMode: function(item, compact) {
this.toolbar.setFolded(compact);
this.toolbar.fireEvent('view:compact', [this, compact]);
compact && this.onTabCollapse();
Common.localStorage.setBool('sse-compact-toolbar', compact);
Common.NotificationCenter.trigger('layout:changed', 'toolbar');
@ -5250,6 +5252,10 @@ define([
(tab !== 'home') && Common.UI.TooltipManager.closeTip('quickAccess');
},
onTabCollapse: function(tab) {
Common.UI.TooltipManager.closeTip('protectRange');
},
textEmptyImgUrl : 'You need to specify image URL.',
warnMergeLostData : 'Operation can destroy data in the selected cells.<br>Continue?',
textWarning : 'Warning',