forked from 0x2620/oxjs
fix tooltip of splitpanel resizebar; allow for setting the showannotations option of video player and editor panels from outside
This commit is contained in:
parent
126fb3956e
commit
768dd6c7aa
35 changed files with 20 additions and 24 deletions
|
|
@ -14,11 +14,9 @@ Ox.Resizebar <f:Ox.Element> Resizebar
|
|||
resizeable <b|true> can bar be resized
|
||||
resize <a|[]> array with possible sizes
|
||||
size <n|0> default size
|
||||
tooltop <b|s|false> tooltip or not
|
||||
tooltip <b|s|false> tooltip or not
|
||||
self <o> Shared private variable
|
||||
@*/
|
||||
/**
|
||||
*/
|
||||
Ox.Resizebar = function(options, self) {
|
||||
|
||||
self = self || {};
|
||||
|
|
@ -162,24 +160,6 @@ Ox.Resizebar = function(options, self) {
|
|||
that.css({cursor: getCursor()});
|
||||
self.$tooltip.options({title: getTitle()});
|
||||
}
|
||||
/*
|
||||
//Ox.print('toggle');
|
||||
if (Ox.isUndefined(self.options.position)) {
|
||||
self.options.position = parseInt(self.options.parent.css(self.options.edge)) +
|
||||
(self.options.collapsed ? self.options.size : 0);
|
||||
}
|
||||
var size = self.options.position -
|
||||
(self.options.collapsed ? 0 : self.options.size),
|
||||
animate = {};
|
||||
//Ox.print('s.o.e', self.options.edge);
|
||||
animate[self.options.edge] = size;
|
||||
self.options.parent.animate(animate, 200, function() {
|
||||
var i = (self.options.edge == 'left' || self.options.edge == 'top') ? 0 : 1;
|
||||
self.options.collapsed = !self.options.collapsed;
|
||||
Ox.Event.trigger(self.ids[i], 'toggle', self.options.collapsed);
|
||||
Ox.Event.trigger(self.ids[1 - i], 'resize', self.options.elements[1 - i][self.dimensions[1]]());
|
||||
});
|
||||
*/
|
||||
}
|
||||
|
||||
function triggerEvents(event) {
|
||||
|
|
@ -195,6 +175,13 @@ Ox.Resizebar = function(options, self) {
|
|||
});
|
||||
}
|
||||
|
||||
self.setOption = function(key, value) {
|
||||
if (key == 'collapsed') {
|
||||
that.css({cursor: getCursor()});
|
||||
self.$tooltip.options({title: getTitle()});
|
||||
}
|
||||
}
|
||||
|
||||
return that;
|
||||
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue