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

add tooltip option to Ox.Element

Browse source
This commit is contained in:
rolux 2011-05-17 20:44:53 +02:00
commit 2842ec8d09
4 changed files with 54 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

9
source/Ox.UI/js/Video/Ox.VideoPlayer.js
View file

@ -144,8 +144,7 @@ Ox.VideoPlayer = function(options, self) {
self.out = self.options.playInToOut ? self.options.out : self.options.duration;
self.options.duration = self.out - self['in'];
self.options.position = Ox.limit(self.options.position, self['in'], self.out);
Ox.print('p/d', self.options.position, self.options.duration);
// fixme: this is _relative_, resizing can happen
self.millisecondsPerFrame = 1000 / self.options.fps;
self.secondsPerFrame = 1 / self.options.fps;
self.barHeight = 16;
@ -688,7 +687,9 @@ Ox.VideoPlayer = function(options, self) {
} else if (control == 'resolution') {
self.$resolutionButton = $('<div>')
self.$resolutionButton = Ox.Element({
tooltip: 'Resolution'
})
.css({
float: 'left',
width: '32px',
@ -705,7 +706,7 @@ Ox.VideoPlayer = function(options, self) {
self.$resolution.toggle();
}
})
.appendTo(self['$controls' + titlecase].$element);
.appendTo(self['$controls' + titlecase]);
self.$resolution = $('<div>')
.css({