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

[DE] FIx Bug 51065

Browse source
This commit is contained in:
Julia Radzhabova 2021-07-04 15:40:17 +03:00
parent a45913fe79
commit c738f33055
3 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/common/main/resources/less/toolbar.less
View file

@ -224,6 +224,12 @@
margin-left: 10px;
}
}
&.no-group-mask {
.elset {
position: relative;
}
}
}
.elset {

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

@ -3051,9 +3051,11 @@ define([
var toolbar = this.toolbar;
if(disable) {
if (reviewmode) {
mask = $("<div class='toolbar-group-mask'>").appendTo(toolbar.$el.find('.toolbar section.panel .group:not(.no-mask):not(.no-group-mask.review)'));
mask = $("<div class='toolbar-group-mask'>").appendTo(toolbar.$el.find('.toolbar section.panel .group:not(.no-mask):not(.no-group-mask.review):not(.no-group-mask.inner-elset)'));
mask = $("<div class='toolbar-group-mask'>").appendTo(toolbar.$el.find('.toolbar section.panel .group.no-group-mask.inner-elset .elset'));
} 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)'));
mask = $("<div class='toolbar-group-mask'>").appendTo(toolbar.$el.find('.toolbar section.panel .group:not(.no-mask):not(.no-group-mask.form-view):not(.no-group-mask.inner-elset)'));
mask = $("<div class='toolbar-group-mask'>").appendTo(toolbar.$el.find('.toolbar section.panel .group.no-group-mask.inner-elset .elset:not(.no-group-mask.form-view)'));
} else
mask = $("<div class='toolbar-mask'>").appendTo(toolbar.$el.find('.toolbar'));
} else {
@ -3061,10 +3063,19 @@ define([
}
$('.no-group-mask').each(function(index, item){
var $el = $(item);
if ($el.find('.toolbar-group-mask').length>0)
if ($el.find('> .toolbar-group-mask').length>0)
$el.css('opacity', 0.4);
else {
$el.css('opacity', reviewmode || fillformmode || !disable ? 1 : 0.4);
$el.find('.elset').each(function(index, elitem){
var $elset = $(elitem);
if ($elset.find('> .toolbar-group-mask').length>0) {
$elset.css('opacity', 0.4);
} else {
$elset.css('opacity', reviewmode || fillformmode || !disable ? 1 : 0.4);
}
$el.css('opacity', 1);
});
}
});

4
apps/documenteditor/main/app/view/FormsTab.js
View file

@ -58,8 +58,8 @@ define([
'<span class="btn-slot text x-huge" id="slot-btn-form-image"></span>' +
'</div>' +
'<div class="separator long forms" style="display: none;"></div>' +
'<div class="group no-group-mask form-view small" style="display: none;">' +
'<div class="elset">' +
'<div class="group no-group-mask inner-elset small" style="display: none;">' +
'<div class="elset no-group-mask form-view">' +
'<span class="btn-slot text" id="slot-form-clear-fields"></span>' +
'</div>' +
'<div class="elset">' +