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

fix tooltip of splitpanel resizebar; allow for setting the showannotations option of video player and editor panels from outside

Browse source
This commit is contained in:
rlx 2011-10-13 10:10:39 +00:00
commit 768dd6c7aa
35 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
source/Ox.UI/js/Panel/Ox.SplitPanel.js
View file

@ -61,11 +61,9 @@ Ox.SplitPanel = function(options, self) {
// create resizebars
self.options.elements.forEach(function(element, i) {
//that.append(element)
//Ox.print('V: ', v, that.$elements[i])
var index = i == 0 ? 0 : 1;
that.$elements[i].appendTo(that.$element); // fixme: that.$content
if (element.collapsible || element.resizable) {
//Ox.print('v.size', v.size)
self.resizebarElements[index] = i < 2 ? [0, 1] : [1, 2];
self.$resizebars[index] = Ox.Resizebar({
collapsed: element.collapsed,
@ -103,7 +101,6 @@ Ox.SplitPanel = function(options, self) {
return false;
}
});
//Ox.print('getPositionById', id, position);
return position;
}
@ -298,6 +295,7 @@ Ox.SplitPanel = function(options, self) {
element.element.triggerEvent('toggle', {
'collapsed': element.collapsed
});
self.$resizebars[pos == 0 ? 0 : 1].options({collapsed: element.collapsed});
element = self.options.elements[pos == 0 ? 1 : pos - 1];
element.element.triggerEvent('resize', {
size: element.element[self.dimensions[0]]()
@ -322,6 +320,7 @@ Ox.SplitPanel = function(options, self) {
};
// fixme: remove!
/*
Ox.SplitPanel_ = function(options, self) {
self = self || {};
@ -507,3 +506,4 @@ Ox.SplitPanel_ = function(options, self) {
return that;
};
*/