pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-02-10 18:05:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'fix/double-dialog' (#776) from fix/double-dialog into release/v9.1.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/web-apps/pulls/776
This commit is contained in:
Oleg Korshul
2025-10-09 11:43:01 +00:00
parent 2d52a89c43 16885f4fcb
commit 924e4f229b
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,7 +113,8 @@ define([
'search:showredact': _.bind(this.onShowHideRedactSearch, this)
},
'RedactTab': {
'search:showredact': _.bind(this.onShowHideRedactSearch, this)
'search:showredact': _.bind(this.onShowHideRedactSearch, this),
'menu:hide': _.bind(this.clickToolbarTab, this, 'red')
},
'Common.Views.SearchPanel': {
'search:showredact': _.bind(this.onShowHideRedactSearch, this)

15
apps/pdfeditor/main/app/controller/RedactTab.js
View File

@ -58,6 +58,8 @@ define([
onLaunch: function () {
this._state = {};
this.redactionsWarning = null;
this.isFileMenuTab = null;
Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
Common.NotificationCenter.on('document:ready', _.bind(this.onDocumentReady, this));
@ -190,8 +192,11 @@ define([
Common.UI.TooltipManager.closeTip('mark-for-redaction');
Common.UI.TooltipManager.closeTip('apply-redaction');
const isMarked = this.api.HasRedact();
if (isMarked) {
Common.UI.warning({
if (
isMarked &&
(!this.redactionsWarning || !this.redactionsWarning.isVisible())
) {
this.redactionsWarning = Common.UI.warning({
width: 500,
msg: this.textUnappliedRedactions,
buttons: [{
@ -211,7 +216,10 @@ define([
this.api.RemoveAllRedact();
this.api.SetRedactTool(false);
this.view.btnMarkForRedact.toggle(false);
} else if (btn == 'cancel') {
} else {
if (this.isFileMenuTab) {
this.view.fireEvent('menu:hide', [this]);
}
if (this.mode.isPDFEdit) {
this.toolbar.toolbar.setTab('red')
} else {
@ -225,6 +233,7 @@ define([
this.api.SetRedactTool(false);
}
}
this.isFileMenuTab = tab === 'file';
},
onRedactionStateToggle: function(isRedaction) {