ONLYOFFICE/web-apps
1
0
Fork 0
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2025-04-18 14:44:08 +03:00
Code

Merge branch hotfix/v8.3.3 into master

Browse Source
This commit is contained in:
papacarlo 2025-04-16 07:39:12 +00:00
commit 64a59dd53c
12 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/ci-build-upload.yml vendored
View File

@ -1,6 +1,7 @@
name: "Build and upload helps"
on:
on:
workflow_dispatch:
create:
push:

8
apps/api/documents/api.js
View File

@ -168,7 +168,13 @@
home: {
mailmerge: false/true // mail merge button // deprecated, button is moved to collaboration tab. use toolbar->collaboration->mailmerge instead
},
layout: false / true, // layout tab
insert: {
file: false/true // text from file button in de
field: false/true // field button in de
}, false / true, // insert tab
layout: {
pagecolor: false/true // page color button in de
}, false / true, // layout tab
references: false / true, // de references tab
collaboration: {
mailmerge: false/true // mail merge button in de

8
apps/common/main/lib/component/TabBar.js
View File

@ -212,6 +212,7 @@ define([
});
}
event.dataTransfer.effectAllowed = 'copyMove';
this.bar.preventCutTab = false;
this.bar.trigger('tab:dragstart', event.dataTransfer, this.bar.selectTabs);
}, this),
dragenter: $.proxy(function (e) {
@ -246,11 +247,7 @@ define([
this.bar.isDragDrop = true;
}
var event = e.originalEvent;
if (event.dataTransfer.dropEffect === 'move' && !event.dataTransfer.mozUserCancelled) {
this.bar.trigger('tab:dragend', true);
} else {
this.bar.trigger('tab:dragend', false);
}
this.bar.trigger('tab:dragend', !this.bar.preventCutTab && event.dataTransfer.dropEffect === 'move' && !event.dataTransfer.mozUserCancelled);
this.bar.$el.find('.mousemove').removeClass('mousemove right');
}, this),
drop: $.proxy(function (e) {
@ -262,6 +259,7 @@ define([
this.bar.$el.find('.mousemove').removeClass('mousemove right');
this.bar.trigger('tab:drop', event.dataTransfer, index, (event.ctrlKey || Common.Utils.isMac && event.altKey));
this.bar.isDrop = true;
this.bar.preventCutTab = true;
}, this)
});
};

2
apps/common/main/lib/view/Header.js
View File

@ -497,7 +497,7 @@ define([
if (me.btnQuickAccess) {
me.btnQuickAccess.updateHint(me.tipCustomizeQuickAccessToolbar);
var arr = [];
if (me.btnSave) {
if (me.btnSave && Common.UI.LayoutManager.isElementVisible('header-save')) {
arr.push({
caption: appConfig.canSaveToFile || appConfig.isDesktopApp && appConfig.isOffline ? me.tipSave : me.textDownload,
value: 'save',

4
apps/documenteditor/main/app/controller/Main.js
View File

@ -1377,6 +1377,7 @@ define([
me.api.asc_registerCallback('asc_onEndAction', _.bind(me.onLongActionEnd, me));
me.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(me.onCoAuthoringDisconnect, me));
me.api.asc_registerCallback('asc_onDisconnectEveryone', _.bind(me.onDisconnectEveryone, me));
me.api.asc_registerCallback('asc_onCompletePreparingOForm', _.bind(me.onCompletePreparingOForm, me));
me.api.asc_registerCallback('asc_onPrint', _.bind(me.onPrint, me));
me.api.asc_registerCallback('asc_onConfirmAction', _.bind(me.onConfirmAction, me));
@ -1960,6 +1961,9 @@ define([
msg : this.warnStartFilling,
buttons: ['ok']
});
},
onCompletePreparingOForm: function() {
Common.Gateway.startFilling();
},

6
apps/documenteditor/main/app/template/Toolbar.template
View File

@ -119,8 +119,8 @@
<span class="btn-slot text x-huge" id="slot-btn-instextart"></span>
<span class="btn-slot text x-huge" id="slot-btn-dropcap"></span>
<span class="btn-slot text x-huge" id="slot-btn-datetime"></span>
<span class="btn-slot text x-huge" id="slot-btn-text-from-file"></span>
<span class="btn-slot text x-huge" id="slot-btn-insfield"></span>
<span class="btn-slot text x-huge" id="slot-btn-text-from-file" data-layout-name="toolbar-insert-file"></span>
<span class="btn-slot text x-huge" id="slot-btn-insfield" data-layout-name="toolbar-insert-field"></span>
</div>
<div class="separator long"></div>
<div class="group">
@ -175,7 +175,7 @@
<div class="separator long"></div>
<div class="group">
<span class="btn-slot text x-huge" id="slot-btn-watermark"></span>
<span class="btn-slot text x-huge" id="slot-btn-pagecolor"></span>
<span class="btn-slot text x-huge" id="slot-btn-pagecolor" data-layout-name="toolbar-layout-pagecolor"></span>
</div>
<div class="separator long"></div>
<div class="group">

2
apps/documenteditor/main/app/view/FileMenuPanels.js
View File

@ -1118,7 +1118,7 @@ define([], function () {
customizeQuickAccess: function () {
if (this.dlgQuickAccess && this.dlgQuickAccess.isVisible()) return;
this.dlgQuickAccess = new Common.Views.CustomizeQuickAccessDialog({
showSave: this.mode.showSaveButton,
showSave: this.mode.showSaveButton && Common.UI.LayoutManager.isElementVisible('header-save'),
showPrint: this.mode.canPrint && this.mode.twoLevelHeader,
showQuickPrint: this.mode.canQuickPrint && this.mode.twoLevelHeader,
mode: this.mode,

12
apps/documenteditor/mobile/src/controller/Main.jsx
View File

@ -444,11 +444,13 @@ class MainController extends Component {
let oform = this.api.asc_GetOForm();
let role = new AscCommon.CRestrictionSettings();
const _userOptions = this.props.storeAppOptions.user;
if (oform && _userOptions && _userOptions.roles && _userOptions.roles.length>0 && oform.asc_canFillRole(_userOptions.roles[0])) {
role.put_OFormRole(_userOptions.roles[0]);
} else {
role.put_OFormNoRole(true);
Common.Notifications.trigger('toolbar:deactivateeditcontrols');
if (oform && _userOptions && _userOptions.roles) {
if (_userOptions.roles.length>0 && oform.asc_canFillRole(_userOptions.roles[0])) {
role.put_OFormRole(_userOptions.roles[0]);
} else {
role.put_OFormNoRole(true);
Common.Notifications.trigger('toolbar:deactivateeditcontrols');
}
}
this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyForms, role);
}

2
apps/pdfeditor/main/app/view/FileMenuPanels.js
View File

@ -922,7 +922,7 @@ define([], function () {
customizeQuickAccess: function () {
if (this.dlgQuickAccess && this.dlgQuickAccess.isVisible()) return;
this.dlgQuickAccess = new Common.Views.CustomizeQuickAccessDialog({
showSave: this.mode.showSaveButton,
showSave: this.mode.showSaveButton && Common.UI.LayoutManager.isElementVisible('header-save'),
showPrint: this.mode.canPrint && this.mode.twoLevelHeader,
showQuickPrint: this.mode.canQuickPrint && this.mode.twoLevelHeader,
mode: this.mode,

2
apps/presentationeditor/main/app/view/FileMenuPanels.js
View File

@ -889,7 +889,7 @@ define([], function () {
customizeQuickAccess: function () {
if (this.dlgQuickAccess && this.dlgQuickAccess.isVisible()) return;
this.dlgQuickAccess = new Common.Views.CustomizeQuickAccessDialog({
showSave: this.mode.showSaveButton,
showSave: this.mode.showSaveButton && Common.UI.LayoutManager.isElementVisible('header-save'),
showPrint: this.mode.canPrint && this.mode.twoLevelHeader,
showQuickPrint: this.mode.canQuickPrint && this.mode.twoLevelHeader,
mode: this.mode,

2
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View File

@ -1413,7 +1413,7 @@ define([], function () {
customizeQuickAccess: function () {
if (this.dlgQuickAccess && this.dlgQuickAccess.isVisible()) return;
this.dlgQuickAccess = new Common.Views.CustomizeQuickAccessDialog({
showSave: this.mode.showSaveButton,
showSave: this.mode.showSaveButton && Common.UI.LayoutManager.isElementVisible('header-save'),
showPrint: this.mode.canPrint && this.mode.twoLevelHeader,
showQuickPrint: this.mode.canQuickPrint && this.mode.twoLevelHeader,
mode: this.mode,

2
apps/visioeditor/main/app/view/FileMenuPanels.js
View File

@ -610,7 +610,7 @@ define([], function () {
customizeQuickAccess: function () {
if (this.dlgQuickAccess && this.dlgQuickAccess.isVisible()) return;
this.dlgQuickAccess = new Common.Views.CustomizeQuickAccessDialog({
showSave: this.mode.showSaveButton,
showSave: this.mode.showSaveButton && Common.UI.LayoutManager.isElementVisible('header-save'),
showPrint: this.mode.canPrint && this.mode.twoLevelHeader,
showQuickPrint: this.mode.canQuickPrint && this.mode.twoLevelHeader,
mode: this.mode,