Compare commits

...

8 commits

Author SHA1 Message Date
Lea 4eebaab5e6
Enable mobile editing 2023-01-12 14:28:17 +01:00
papacarlo ddec589b37 Merge branch hotfix/v7.2.2 into master 2022-12-20 08:00:10 +00:00
Maxim Kadushkin 7b03f08adc [desktop] for bug 60014 2022-12-07 16:54:48 +03:00
Maxim Kadushkin 3208a4bdf2 [desktop] hide panel before "print" command 2022-12-07 16:48:55 +03:00
Maxim Kadushkin 9e608f168d [desktop] for bug 60014 2022-12-06 21:43:43 +03:00
Maxim Kadushkin f91bc6e50e [desktop] for bug 60025 2022-12-06 20:24:15 +03:00
maxkadushkin b5c282872d
Merge pull request #2105 from ONLYOFFICE/fix/bug-59971
For Bug 59971
2022-12-04 22:50:14 +03:00
Julia Radzhabova 37b37425af For Bug 59971 2022-12-04 16:56:12 +03:00
6 changed files with 17 additions and 6 deletions

View file

@ -281,6 +281,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));
}
}
});
} }
} }
}); });
@ -340,6 +352,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'}));

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;

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) {

View file

@ -4,7 +4,7 @@ const EditorUIController = () => {
}; };
EditorUIController.isSupportEditFeature = () => { EditorUIController.isSupportEditFeature = () => {
return false return true
}; };
EditorUIController.getToolbarOptions = () => { EditorUIController.getToolbarOptions = () => {

View file

@ -1,6 +1,6 @@
const EditorUIController = () => null; const EditorUIController = () => null;
EditorUIController.isSupportEditFeature = () => false; EditorUIController.isSupportEditFeature = () => true;
export default EditorUIController; export default EditorUIController;

View file

@ -1,6 +1,6 @@
const EditorUIController = () => null; const EditorUIController = () => null;
EditorUIController.isSupportEditFeature = () => false; EditorUIController.isSupportEditFeature = () => true;
export default EditorUIController; export default EditorUIController;