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

update for add and off the window resize event

Browse source
This commit is contained in:
OVSharova 2022-12-15 21:14:53 +03:00
parent a1264c81b2
commit 0b34cbf22c
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -678,10 +678,6 @@ define([
this.$window.find('.header').on('mousedown', this.binding.dragStart); this.$window.find('.header').on('mousedown', this.binding.dragStart);
this.$window.find('.tool.close').on('click', _.bind(doclose, this)); this.$window.find('.tool.close').on('click', _.bind(doclose, this));
this.$window.find('.tool.help').on('click', _.bind(dohelp, this)); this.$window.find('.tool.help').on('click', _.bind(dohelp, this));
if(this.initConfig.automove){
this.binding.windowresize = _.bind(_onResizeMove, this);
$(window).on('resize', this.binding.windowresize);
}
if (!this.initConfig.modal) if (!this.initConfig.modal)
Common.Gateway.on('processmouse', _.bind(_onProcessMouse, this)); Common.Gateway.on('processmouse', _.bind(_onProcessMouse, this));
} else { } else {
@ -765,6 +761,10 @@ define([
} }
$(document).on('keydown.' + this.cid, this.binding.keydown); $(document).on('keydown.' + this.cid, this.binding.keydown);
if(this.initConfig.automove){
this.binding.windowresize = _.bind(_onResizeMove, this);
$(window).on('resize', this.binding.windowresize);
}
var me = this; var me = this;
@ -862,6 +862,7 @@ define([
hide: function() { hide: function() {
$(document).off('keydown.' + this.cid); $(document).off('keydown.' + this.cid);
this.initConfig.automove && $(window).off('resize', this.binding.windowresize);
if (this.$window) { if (this.$window) {
if (this.initConfig.modal) { if (this.initConfig.modal) {
var mask = _getMask(), var mask = _getMask(),

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

@ -2932,7 +2932,7 @@ define([
this.lockToolbar(Common.enumLock.cantPrint, true, {array: [this.btnPrint]}); this.lockToolbar(Common.enumLock.cantPrint, true, {array: [this.btnPrint]});
} else { } else {
this.mode = mode; this.mode = mode;
!mode.canPrint && this.btnPrint.hide(); !mode.canPrint && this.btnPrint && this.btnPrint.hide();
this.lockToolbar(Common.enumLock.cantPrint, !mode.canPrint, {array: [this.btnPrint]}); this.lockToolbar(Common.enumLock.cantPrint, !mode.canPrint, {array: [this.btnPrint]});
} }