Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #2105 from ONLYOFFICE/fix/bug-59971

Browse source 
For Bug 59971
This commit is contained in:
maxkadushkin 2022-12-04 22:50:14 +03:00 committed by GitHub
parent f7eccb611f 37b37425af
commit b5c282872d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/common/main/lib/controller/Desktop.js
View file

@ -340,6 +340,7 @@ define([
Common.NotificationCenter.on({ Common.NotificationCenter.on({
'modal:show': _onModalDialog.bind(this, 'open'), 'modal:show': _onModalDialog.bind(this, 'open'),
'modal:close': _onModalDialog.bind(this, 'close'), 'modal:close': _onModalDialog.bind(this, 'close'),
'modal:hide': _onModalDialog.bind(this, 'hide'),
'uitheme:changed' : function (name) { 'uitheme:changed' : function (name) {
if (Common.localStorage.getBool('ui-theme-use-system', false)) { if (Common.localStorage.getBool('ui-theme-use-system', false)) {
native.execCommand("uitheme:changed", JSON.stringify({name:'theme-system'})); native.execCommand("uitheme:changed", JSON.stringify({name:'theme-system'}));

2
apps/common/main/lib/view/ExternalOleEditor.js
View file

@ -115,7 +115,6 @@ define([
}, },
onDlgBtnClick: function(event) { onDlgBtnClick: function(event) {
Common.NotificationCenter.trigger('modal:close', this);
if ( this.handler ) { if ( this.handler ) {
this.handler.call(this, event.currentTarget.attributes['result'].value); this.handler.call(this, event.currentTarget.attributes['result'].value);
return; return;
@ -124,7 +123,6 @@ define([
}, },
onToolClose: function() { onToolClose: function() {
Common.NotificationCenter.trigger('modal:close', this);
if ( this.handler ) { if ( this.handler ) {
this.handler.call(this, 'cancel'); this.handler.call(this, 'cancel');
return; return;