From bd3ebf5e338aa3a5c91caf9902b2476e971dcf18 Mon Sep 17 00:00:00 2001
From: rlx <0x0073@0x2620.org>
Date: Thu, 20 Oct 2011 13:04:04 +0000
Subject: [PATCH] make subtitles on BlockVideoTimeline optional

---
 source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js | 3 ++-
 source/Ox.UI/js/Video/Ox.VideoEditor.js        | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js b/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js
index 439d9d28..e4d60780 100644
--- a/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js
+++ b/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js
@@ -13,6 +13,7 @@ Ox.BlockVideoTimeline = function(options, self) {
             position: 0,
             results: [],
             showPointMarkers: false,
+            showSubtitles: false,
             subtitles: [],
             width: 0
         })
@@ -52,7 +53,7 @@ Ox.BlockVideoTimeline = function(options, self) {
             'in': self.options['in'],
             out: self.options.out,
             results: self.options.results,
-            subtitles: self.options.subtitles,
+            subtitles: self.options.showSubtitles ? self.options.subtitles : [],
             timeline: self.options.getImageURL,
             width: Math.round(self.options.duration),
             type: self.options.type
diff --git a/source/Ox.UI/js/Video/Ox.VideoEditor.js b/source/Ox.UI/js/Video/Ox.VideoEditor.js
index ebc43bf2..8b18dd86 100644
--- a/source/Ox.UI/js/Video/Ox.VideoEditor.js
+++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js
@@ -242,6 +242,7 @@ Ox.VideoEditor = function(options, self) {
             out: self.options.out,
             position: self.options.position,
             showPointMarkers: true,
+            showSubtitles: true,
             subtitles: self.options.subtitles,
             videoId: self.options.videoId,
             width: self.sizes.timeline[1].width