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

Merge branch 'hotfix/v7.2.2' into release/v7.3.0

Browse source
This commit is contained in:
Maxim Kadushkin 2022-12-19 23:29:21 +03:00
parent bf6e0377a3 7b03f08adc
commit 57749f4fe1
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -323,6 +323,18 @@ define([
})).on('closeclick', function () { })).on('closeclick', function () {
this.close(); this.close();
}).show(); }).show();
native.execCommand('webapps:features', JSON.stringify(features));
api.asc_registerCallback('asc_onDocumentName', function () {
if ( features.readonly ) {
if ( api.asc_getLocalRestrictions() == Asc.c_oAscLocalRestrictionType.None ) {
features.readonly = false;
header.setDocumentReadOnly(false);
native.execCommand('webapps:features', JSON.stringify(features));
}
}
});
} }
_checkHelpAvailable.call(me); _checkHelpAvailable.call(me);

2
apps/documenteditor/main/app/controller/Print.js
View file

@ -525,6 +525,7 @@ define([
paperOrientation: size ? (size['H'] > size['W'] ? 'portrait' : 'landscape') : null paperOrientation: size ? (size['H'] > size['W'] ? 'portrait' : 'landscape') : null
}); });
this.printSettings.menu.hide();
if ( print ) { if ( print ) {
var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86); var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86);
opts.asc_setAdvancedOptions(this.adjPrintParams); opts.asc_setAdvancedOptions(this.adjPrintParams);
@ -534,7 +535,6 @@ define([
opts.asc_setAdvancedOptions(this.adjPrintParams); opts.asc_setAdvancedOptions(this.adjPrintParams);
this.api.asc_DownloadAs(opts); this.api.asc_DownloadAs(opts);
} }
this.printSettings.menu.hide();
}, },
inputPagesChanging: function (input, value) { inputPagesChanging: function (input, value) {