sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

fix issues with automatically opening annotation folders; add annotations option to video player to make find work for all layers

Browse source
This commit is contained in:
rlx 2012-02-19 10:49:52 +00:00
commit 94cfbdb45c
7 changed files with 108 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

19
source/Ox.UI/js/Panel/Ox.CollapsePanel.js
View file

@ -20,6 +20,7 @@ Ox.CollapsePanel = function(options, self) {
self = self || {};
var that = Ox.Panel({}, self)
.defaults({
animate: true,
collapsed: false,
extras: [],
size: 16,
@ -92,11 +93,18 @@ Ox.CollapsePanel = function(options, self) {
!self.options.collapsed && that.$content.css({
marginTop: -that.$content.height() + 'px'
}).show();
that.$content.animate({
marginTop: marginTop + 'px'
}, 250, function() {
if (self.options.animate) {
that.$content.animate({
marginTop: marginTop + 'px'
}, 250, function() {
self.options.collapsed && that.$content.hide();
});
} else {
that.$content.css({
marginTop: marginTop + 'px'
});
self.options.collapsed && that.$content.hide();
});
}
that.triggerEvent('toggle', {
collapsed: self.options.collapsed
});
@ -110,7 +118,8 @@ Ox.CollapsePanel = function(options, self) {
if (key == 'collapsed') {
// will be toggled again in toggleCollapsed
self.options.collapsed = !self.options.collapsed;
self.$button.trigger('click');
self.$button.toggle();
toggleCollapsed();
} else if (key == 'title') {
self.$title.html(self.options.title);
}