Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix close bug

Browse source
This commit is contained in:
Felix Niklas 2015-10-15 15:28:30 +02:00
parent 7e4c374cdc
commit 843e1e5a9c
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
public/assets/chat/chat.coffee
View file

@ -130,7 +130,7 @@ do($ = window.jQuery, window) ->
close: -> close: ->
remainerHeight = @el.height() - @el.find('.zammad-chat-header').outerHeight() remainerHeight = @el.height() - @el.find('.zammad-chat-header').outerHeight()
@el.animate { bottom: -remainerHeight }, 500, onCloseAnimationEnd @el.animate { bottom: -remainerHeight }, 500, @onCloseAnimationEnd
onCloseAnimationEnd: => onCloseAnimationEnd: =>
@el.removeClass('zammad-chat-is-open') @el.removeClass('zammad-chat-is-open')
@ -143,7 +143,7 @@ do($ = window.jQuery, window) ->
show: -> show: ->
@el.addClass('zammad-chat-is-visible') @el.addClass('zammad-chat-is-visible')
remainerHeight = @el.height() - @el.find('.zammad-chat-header').outerHeight() remainerHeight = @el.outerHeight() - @el.find('.zammad-chat-header').outerHeight()
@el.css 'bottom', -remainerHeight @el.css 'bottom', -remainerHeight

5
public/assets/chat/chat.js
View file

@ -222,7 +222,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
remainerHeight = this.el.height() - this.el.find('.zammad-chat-header').outerHeight(); remainerHeight = this.el.height() - this.el.find('.zammad-chat-header').outerHeight();
return this.el.animate({ return this.el.animate({
bottom: -remainerHeight bottom: -remainerHeight
}, 500, onCloseAnimationEnd); }, 500, this.onCloseAnimationEnd);
}; };
ZammadChat.prototype.onCloseAnimationEnd = function() { ZammadChat.prototype.onCloseAnimationEnd = function() {
@ -238,7 +238,8 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
ZammadChat.prototype.show = function() { ZammadChat.prototype.show = function() {
var remainerHeight; var remainerHeight;
this.el.addClass('zammad-chat-is-visible'); this.el.addClass('zammad-chat-is-visible');
remainerHeight = this.el.height() - this.el.find('.zammad-chat-header').outerHeight(); console.log(this.el.outerHeight(), this.el.find('.zammad-chat-header').outerHeight());
remainerHeight = this.el.outerHeight() - this.el.find('.zammad-chat-header').outerHeight();
return this.el.css('bottom', -remainerHeight); return this.el.css('bottom', -remainerHeight);
}; };

2
public/assets/chat/chat.min.js vendored
View file

File diff suppressed because one or more lines are too long