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

Fix Bug 33354.

Browse source
This commit is contained in:
Julia Radzhabova 2016-11-07 11:45:15 +03:00
parent d2df65b0b6
commit 860a8114ec
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -641,6 +641,11 @@ define([
$(document).on('keydown.' + this.cid, this.binding.keydown); $(document).on('keydown.' + this.cid, this.binding.keydown);
var me = this; var me = this;
setTimeout(function () {
me.fireEvent('animate:before', me);
}, 10);
if (this.options.animate !== false) { if (this.options.animate !== false) {
this.$window.css({ this.$window.css({
'-webkit-transform': 'scale(0.8)', '-webkit-transform': 'scale(0.8)',

14
apps/common/main/lib/view/Comments.js
View file

@ -473,19 +473,17 @@ define([
}); });
me.on({ me.on({
'show': function () { 'show': function () {
// me.calculateSizeOfContent();
me.commentsView.autoHeightTextBox(); me.commentsView.autoHeightTextBox();
me.$window.find('textarea').keydown(function (event) {
var text = me.$window.find('textarea');
if (text && text.length)
text.focus();
text.keydown(function (event) {
if (event.keyCode == Common.UI.Keys.ESC) { if (event.keyCode == Common.UI.Keys.ESC) {
me.hide(); me.hide();
} }
}); });
},
'animate:before': function () {
var text = me.$window.find('textarea');
if (text && text.length)
text.focus();
} }
}); });
} }