Skip to content
Browse files

Merge remote-tracking branch 'colinfrei/toolbaranimation'

  • Loading branch information...
2 parents 5ec2d6d + 3a3f128 commit 0489e2ce720c918c5fff35ecc4be06fb5c0a2fff @bergie bergie committed Jan 5, 2012
Showing with 5 additions and 3 deletions.
  1. +5 −3 src/jquery.Midgard.midgardToolbar.js
View
8 src/jquery.Midgard.midgardToolbar.js
@@ -38,13 +38,15 @@
},
hide: function() {
+ jQuery('#midgard-bar-minimized:hidden', this.element).show();
jQuery('#midgard-bar:visible', this.element).slideToggle();
- jQuery('#midgard-bar-minimized:hidden', this.element).slideToggle();
},
show: function() {
- jQuery('#midgard-bar-minimized:visible', this.element).slideToggle();
- jQuery('#midgard-bar:hidden', this.element).slideToggle();
+ var minimizedToolbar = jQuery('#midgard-bar-minimized:visible', this.element);
+ jQuery('#midgard-bar:hidden', this.element).slideToggle(null, function() {
+ minimizedToolbar.hide();
+ });
},
_getMinimized: function() {

0 comments on commit 0489e2c

Please sign in to comment.
Something went wrong with that request. Please try again.