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

Merge branch 'develop' into feature/word-formulas

Browse source
This commit is contained in:
SergeyLuzyanin 2018-11-27 10:59:33 +03:00
parent 9d4f6905aa ac3862c851
commit 64dcb2029b
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -235,6 +235,21 @@ define([
this.$window.css('top',top);
}
function _setVisible() {
if (window.innerHeight == undefined) {
var main_width = document.documentElement.offsetWidth;
var main_height = document.documentElement.offsetHeight;
} else {
main_width = Common.Utils.innerWidth();
main_height = Common.Utils.innerHeight();
}
if (this.getLeft() + this.getWidth() > main_width)
this.$window.css('left', main_width - this.getWidth());
if (this.getTop() + this.getHeight() > main_height)
this.$window.css('top', main_height - this.getHeight());
}
function _getTransformation(end) {
return {
'-webkit-transition': '0.3s opacity',
@ -653,6 +668,7 @@ define([
} else
if (!this.$window.is(':visible')) {
this.$window.css({opacity: 0});
_setVisible.call(this);
this.$window.show()
}