From 062547daa12733adf51f6f020d8cac5660d80b0d Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Thu, 29 Dec 2011 02:52:51 +0530 Subject: [PATCH] set default results in Ox.SmallVideoTimeline, make sure self.results is defined in Ox.VideoPlayer --- source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js | 3 ++- source/Ox.UI/js/Video/Ox.VideoPlayer.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js b/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js index 4b9c0c1a..6eb3c95b 100644 --- a/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js +++ b/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js @@ -13,6 +13,7 @@ Ox.SmallVideoTimeline = function(options, self) { 'in': 0, out: 0, paused: false, + results: [], showMilliseconds: 0, timeline: '', type: 'player', @@ -239,4 +240,4 @@ Ox.SmallVideoTimeline = function(options, self) { return that; -}; \ No newline at end of file +}; diff --git a/source/Ox.UI/js/Video/Ox.VideoPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPlayer.js index 8c7d698f..12e0ac15 100644 --- a/source/Ox.UI/js/Video/Ox.VideoPlayer.js +++ b/source/Ox.UI/js/Video/Ox.VideoPlayer.js @@ -173,6 +173,7 @@ Ox.VideoPlayer = function(options, self) { self.height = self.options.fullscreen ? window.innerHeight : self.options.height; self.videoWidth = self.options.width; self.videoHeight = self.options.height; + self.results = []; /* ----------------------------------------------------------------------------