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

[DE] Turn on/off fill form mode from Forms tab

Browse source
This commit is contained in:
Julia Radzhabova 2020-10-08 11:11:34 +03:00
parent d5875737ba
commit 0a9d8773cd
5 changed files with 44 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/controller/ReviewChanges.js
View file

@ -739,7 +739,7 @@ define([
leftMenu.setPreviewMode(disable); leftMenu.setPreviewMode(disable);
if (this.view) { if (this.view) {
this.view.$el.find('.no-group-mask').css('opacity', 1); this.view.$el.find('.no-group-mask.review').css('opacity', 1);
this.view.btnsDocLang && this.view.btnsDocLang.forEach(function(button) { this.view.btnsDocLang && this.view.btnsDocLang.forEach(function(button) {
if ( button ) { if ( button ) {

8
apps/common/main/lib/view/ReviewChanges.js
View file

@ -57,7 +57,7 @@ define([
Common.Views.ReviewChanges = Common.UI.BaseView.extend(_.extend((function(){ Common.Views.ReviewChanges = Common.UI.BaseView.extend(_.extend((function(){
var template = var template =
'<section id="review-changes-panel" class="panel" data-tab="review">' + '<section id="review-changes-panel" class="panel" data-tab="review">' +
'<div class="group no-group-mask">' + '<div class="group no-group-mask review">' +
'<span id="slot-btn-sharing" class="btn-slot text x-huge"></span>' + '<span id="slot-btn-sharing" class="btn-slot text x-huge"></span>' +
'<span id="slot-btn-coauthmode" class="btn-slot text x-huge"></span>' + '<span id="slot-btn-coauthmode" class="btn-slot text x-huge"></span>' +
'</div>' + '</div>' +
@ -70,7 +70,7 @@ define([
'<div class="group">' + '<div class="group">' +
'<span id="btn-review-on" class="btn-slot text x-huge"></span>' + '<span id="btn-review-on" class="btn-slot text x-huge"></span>' +
'</div>' + '</div>' +
'<div class="group no-group-mask" style="padding-left: 0;">' + '<div class="group no-group-mask review" style="padding-left: 0;">' +
'<span id="btn-review-view" class="btn-slot text x-huge"></span>' + '<span id="btn-review-view" class="btn-slot text x-huge"></span>' +
'</div>' + '</div>' +
'<div class="group move-changes" style="padding-left: 0;">' + '<div class="group move-changes" style="padding-left: 0;">' +
@ -84,11 +84,11 @@ define([
'<span id="btn-compare" class="btn-slot text x-huge"></span>' + '<span id="btn-compare" class="btn-slot text x-huge"></span>' +
'</div>' + '</div>' +
'<div class="separator long compare"></div>' + '<div class="separator long compare"></div>' +
'<div class="group no-group-mask">' + '<div class="group no-group-mask review form-view">' +
'<span id="slot-btn-chat" class="btn-slot text x-huge"></span>' + '<span id="slot-btn-chat" class="btn-slot text x-huge"></span>' +
'</div>' + '</div>' +
'<div class="separator long chat"></div>' + '<div class="separator long chat"></div>' +
'<div class="group no-group-mask">' + '<div class="group no-group-mask review form-view">' +
'<span id="slot-btn-history" class="btn-slot text x-huge"></span>' + '<span id="slot-btn-history" class="btn-slot text x-huge"></span>' +
'</div>' + '</div>' +
'</section>'; '</section>';

25
apps/documenteditor/main/app/controller/FormsTab.js
View file

@ -220,7 +220,8 @@ define([
onModeClick: function(state) { onModeClick: function(state) {
if (this.api) { if (this.api) {
this.disableEditing(state);
this.api.asc_setRestriction(state ? Asc.c_oAscRestrictionType.OnlyForms : Asc.c_oAscRestrictionType.None);
} }
Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.NotificationCenter.trigger('edit:complete', this.toolbar);
}, },
@ -250,6 +251,28 @@ define([
this.api.asc_SetGlobalContentControlShowHighlight(true, clr.get_r(), clr.get_g(), clr.get_b()); this.api.asc_SetGlobalContentControlShowHighlight(true, clr.get_r(), clr.get_g(), clr.get_b());
} }
Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.NotificationCenter.trigger('edit:complete', this.toolbar);
},
disableEditing: function(disable) {
if (this._state.DisabledEditing != disable) {
this._state.DisabledEditing = disable;
var app = this.getApplication();
var rightMenuController = app.getController('RightMenu');
rightMenuController.getView('RightMenu').clearSelection();
rightMenuController.SetDisabled(disable);
app.getController('Toolbar').DisableToolbar(disable, false, false, true);
app.getController('Statusbar').getView('Statusbar').SetDisabled(disable);
app.getController('Common.Controllers.ReviewChanges').SetDisabled(disable);
app.getController('DocumentHolder').getView().SetDisabled(disable);
app.getController('Navigation') && app.getController('Navigation').SetDisabled(disable);
app.getController('LeftMenu').setPreviewMode(disable);
var comments = app.getController('Common.Controllers.Comments');
if (comments)
comments.setPreviewMode(disable);
if (this.view)
this.view.$el.find('.no-group-mask.form-view').css('opacity', 1);
}
} }
}, DE.Controllers.FormsTab || {})); }, DE.Controllers.FormsTab || {}));

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

@ -2896,27 +2896,36 @@ define([
this.DisableToolbar(true, true); this.DisableToolbar(true, true);
}, },
DisableToolbar: function(disable, viewMode, reviewmode) { DisableToolbar: function(disable, viewMode, reviewmode, fillformmode) {
if (viewMode!==undefined) this.editMode = !viewMode; if (viewMode!==undefined) this.editMode = !viewMode;
disable = disable || !this.editMode; disable = disable || !this.editMode;
var toolbar_mask = $('.toolbar-mask'), var toolbar_mask = $('.toolbar-mask'),
group_mask = $('.toolbar-group-mask'), group_mask = $('.toolbar-group-mask'),
mask = reviewmode ? group_mask : toolbar_mask; mask = (reviewmode || fillformmode) ? group_mask : toolbar_mask;
if (disable && mask.length>0 || !disable && mask.length==0) return; if (disable && mask.length>0 || !disable && mask.length==0) return;
var toolbar = this.toolbar; var toolbar = this.toolbar;
if(disable) { if(disable) {
if (reviewmode) { if (reviewmode) {
mask = $("<div class='toolbar-group-mask'>").appendTo(toolbar.$el.find('.toolbar section.panel .group:not(.no-mask):not(.no-group-mask)')); mask = $("<div class='toolbar-group-mask'>").appendTo(toolbar.$el.find('.toolbar section.panel .group:not(.no-mask):not(.no-group-mask.review)'));
} else if (fillformmode) {
mask = $("<div class='toolbar-group-mask'>").appendTo(toolbar.$el.find('.toolbar section.panel .group:not(.no-mask):not(.no-group-mask.form-view)'));
} else } else
mask = $("<div class='toolbar-mask'>").appendTo(toolbar.$el.find('.toolbar')); mask = $("<div class='toolbar-mask'>").appendTo(toolbar.$el.find('.toolbar'));
} else { } else {
mask.remove(); mask.remove();
} }
$('.no-group-mask').css('opacity', (reviewmode || !disable) ? 1 : 0.4); $('.no-group-mask').each(function(index, item){
var $el = $(item);
if ($el.find('.toolbar-group-mask').length>0)
$el.css('opacity', 0.4);
else {
$el.css('opacity', reviewmode || fillformmode || !disable ? 1 : 0.4);
}
});
disable = disable || (reviewmode ? toolbar_mask.length>0 : group_mask.length>0); disable = disable || ((reviewmode || fillformmode) ? toolbar_mask.length>0 : group_mask.length>0);
toolbar.$el.find('.toolbar').toggleClass('masked', disable); toolbar.$el.find('.toolbar').toggleClass('masked', disable);
if ( toolbar.synchTooltip ) if ( toolbar.synchTooltip )
toolbar.synchTooltip.hide(); toolbar.synchTooltip.hide();

2
apps/documenteditor/main/app/template/Toolbar.template
View file

@ -180,7 +180,7 @@
</div> </div>
</div> </div>
<div class="separator long"></div> <div class="separator long"></div>
<div class="group"> <div class="group no-group-mask form-view">
<span class="btn-slot text x-huge" id="slot-btn-form-view"></span> <span class="btn-slot text x-huge" id="slot-btn-form-view"></span>
</div> </div>
</section> </section>