From 1d13caaf8890155672c208e4d4b8393110071393 Mon Sep 17 00:00:00 2001 From: rolux Date: Tue, 17 May 2011 20:04:26 +0200 Subject: [PATCH] highlight results in timeline tooltip --- source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js | 1 + source/Ox.UI/js/Video/Ox.VideoPlayer.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js b/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js index 024cf7d1..0427bb7d 100644 --- a/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js +++ b/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js @@ -6,6 +6,7 @@ Ox.SmallVideoTimeline = function(options, self) { _offset: 0, // hack for cases where all these position: absolute elements have to go into a float: left duration: 0, editing: false, + find: '', 'in': 0, out: 0, paused: false, diff --git a/source/Ox.UI/js/Video/Ox.VideoPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPlayer.js index 0bd0ce89..88b487db 100644 --- a/source/Ox.UI/js/Video/Ox.VideoPlayer.js +++ b/source/Ox.UI/js/Video/Ox.VideoPlayer.js @@ -1274,6 +1274,7 @@ Ox.VideoPlayer = function(options, self) { var $timeline = Ox.SmallVideoTimeline({ _offset: getTimelineLeft(), duration: self.options.duration, + find: self.options.find, 'in': self.options['in'], out: self.options.out, paused: self.options.paused, @@ -1682,6 +1683,7 @@ Ox.VideoPlayer = function(options, self) { self.results = find(self.options.find); self.$results.html(self.results.length); self.$timeline && self.$timeline.options({ + find: self.options.find, results: self.results }); if (self.results.length) {