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

[DE] Show Forms tab in fill form mode

Browse source
This commit is contained in:
Julia Radzhabova 2021-02-09 17:21:02 +03:00
parent 6f20bddf01
commit b7089a7344
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -3053,8 +3053,8 @@ define([
onAppShowed: function (config) { onAppShowed: function (config) {
var me = this; var me = this;
var compactview = !config.isEdit; var compactview = !(config.isEdit || config.isRestrictedEdit && config.canFillForms);
if ( config.isEdit ) { if ( config.isEdit || config.isRestrictedEdit && config.canFillForms) {
if ( Common.localStorage.itemExists("de-compact-toolbar") ) { if ( Common.localStorage.itemExists("de-compact-toolbar") ) {
compactview = Common.localStorage.getBool("de-compact-toolbar"); compactview = Common.localStorage.getBool("de-compact-toolbar");
} else } else
@ -3112,6 +3112,8 @@ define([
if (config.isEdit && config.canFeatureContentControl) { if (config.isEdit && config.canFeatureContentControl) {
Array.prototype.push.apply(me.toolbar.toolbarControls, forms.getView('FormsTab').getButtons()); Array.prototype.push.apply(me.toolbar.toolbarControls, forms.getView('FormsTab').getButtons());
me.onChangeSdtGlobalSettings(); me.onChangeSdtGlobalSettings();
} else if (!compactview) {
me.toolbar.setTab('forms');
} }
} }
} }

8
apps/documenteditor/main/app/controller/Viewport.js
View file

@ -165,7 +165,7 @@ define([
me.viewport.$el.attr('applang', me.appConfig.lang.split(/[\-_]/)[0]); me.viewport.$el.attr('applang', me.appConfig.lang.split(/[\-_]/)[0]);
if ( !config.isEdit || if ( !(config.isEdit || config.isRestrictedEdit && config.canFillForms) ||
( !Common.localStorage.itemExists("de-compact-toolbar") && ( !Common.localStorage.itemExists("de-compact-toolbar") &&
config.customization && config.customization.compactToolbar )) { config.customization && config.customization.compactToolbar )) {
@ -205,8 +205,8 @@ define([
onAppReady: function (config) { onAppReady: function (config) {
var me = this; var me = this;
if ( me.header.btnOptions ) { if ( me.header.btnOptions ) {
var compactview = !config.isEdit; var compactview = !(config.isEdit || config.isRestrictedEdit && config.canFillForms);
if ( config.isEdit ) { if ( config.isEdit || config.isRestrictedEdit && config.canFillForms) {
if ( Common.localStorage.itemExists("de-compact-toolbar") ) { if ( Common.localStorage.itemExists("de-compact-toolbar") ) {
compactview = Common.localStorage.getBool("de-compact-toolbar"); compactview = Common.localStorage.getBool("de-compact-toolbar");
} else } else
@ -223,7 +223,7 @@ define([
if (!config.isEdit) { if (!config.isEdit) {
me.header.mnuitemCompactToolbar.hide(); me.header.mnuitemCompactToolbar.hide();
Common.NotificationCenter.on('tab:visible', _.bind(function(action, visible){ Common.NotificationCenter.on('tab:visible', _.bind(function(action, visible){
if ((action=='plugins' || action=='review') && visible) { if ((action=='plugins' || action=='review' || action=='forms') && visible) {
me.header.mnuitemCompactToolbar.show(); me.header.mnuitemCompactToolbar.show();
} }
}, this)); }, this));

2
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -1281,7 +1281,7 @@ define([
me.$el.html(me.rendererComponents(me.$layout)); me.$el.html(me.rendererComponents(me.$layout));
} else { } else {
me.$layout.find('.canedit').hide(); me.$layout.find('.canedit').hide();
me.$layout.addClass('folded'); me.isCompactView && me.$layout.addClass('folded');
me.$el.html(me.$layout); me.$el.html(me.$layout);
} }