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

[SSE] Fix bug with loading mask in header/footer dialog (can disable mask animation)

Browse source
This commit is contained in:
Julia Radzhabova 2019-05-28 16:08:51 +03:00
parent 24ecdef872
commit 8c463807b0
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/common/main/lib/component/Window.js
View file

@ -639,7 +639,10 @@ define([
show: function(x,y) { show: function(x,y) {
if (this.initConfig.modal) { if (this.initConfig.modal) {
var mask = _getMask(); var mask = _getMask();
if (this.options.animate !== false) { if (this.options.animate === false || this.options.animate && this.options.animate.mask === false) { // animate.mask = false -> don't animate mask
mask.attr('counter', parseInt(mask.attr('counter'))+1);
mask.show();
} else {
var opacity = mask.css('opacity'); var opacity = mask.css('opacity');
mask.css('opacity', 0); mask.css('opacity', 0);
mask.attr('counter', parseInt(mask.attr('counter'))+1); mask.attr('counter', parseInt(mask.attr('counter'))+1);
@ -648,9 +651,6 @@ define([
setTimeout(function () { setTimeout(function () {
mask.css(_getTransformation(opacity)); mask.css(_getTransformation(opacity));
}, 1); }, 1);
} else {
mask.attr('counter', parseInt(mask.attr('counter'))+1);
mask.show();
} }
Common.NotificationCenter.trigger('modal:show', this); Common.NotificationCenter.trigger('modal:show', this);

11
apps/spreadsheeteditor/main/app/view/HeaderFooterDialog.js
View file

@ -50,7 +50,8 @@ define([
options: { options: {
width: 647, width: 647,
style: 'min-width: 350px;', style: 'min-width: 350px;',
cls: 'modal-dlg enable-key-events' cls: 'modal-dlg enable-key-events',
animate: {mask: false}
}, },
initialize : function(options) { initialize : function(options) {
@ -607,10 +608,6 @@ define([
show: function() { show: function() {
Common.UI.Window.prototype.show.apply(this, arguments); Common.UI.Window.prototype.show.apply(this, arguments);
var me = this;
_.delay(function(){
me.onCanvasClick('#header-left-img');
},500);
}, },
close: function() { close: function() {
@ -638,6 +635,10 @@ define([
this.HFObject = new AscCommonExcel.CHeaderFooterEditor(['header-left-img', 'header-center-img', 'header-right-img', 'footer-left-img', 'footer-center-img', 'footer-right-img'], 205); this.HFObject = new AscCommonExcel.CHeaderFooterEditor(['header-left-img', 'header-center-img', 'header-right-img', 'footer-left-img', 'footer-center-img', 'footer-right-img'], 205);
this._setDefaults(this.props); this._setDefaults(this.props);
this.editorCanvas = this.$window.find('#ce-canvas-menu'); this.editorCanvas = this.$window.find('#ce-canvas-menu');
var me = this;
_.delay(function(){
me.onCanvasClick('#header-left-img');
},500);
}, },
_setDefaults: function (props) { _setDefaults: function (props) {