From 0883bc7127563de51d678a84db33d6780e745f44 Mon Sep 17 00:00:00 2001 From: rlx <0x0073@0x2620.org> Date: Sun, 19 Feb 2012 07:41:19 +0000 Subject: [PATCH] fix a bug in subtitle display on small timeline --- source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js | 2 +- source/Ox.UI/js/Video/Ox.VideoEditor.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js b/source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js index f6929229..80f07d24 100644 --- a/source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js +++ b/source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js @@ -179,7 +179,7 @@ Ox.SmallVideoTimelineImage = function(options, self) { data[index] = color[0]; data[index + 1] = color[1]; data[index + 2] = color[2]; - data[index + 3] = color[3]; + data[index + 3] = alpha; }); }); }); diff --git a/source/Ox.UI/js/Video/Ox.VideoEditor.js b/source/Ox.UI/js/Video/Ox.VideoEditor.js index b739dbdb..390b6bda 100644 --- a/source/Ox.UI/js/Video/Ox.VideoEditor.js +++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js @@ -192,7 +192,7 @@ Ox.VideoEditor = function(options, self) { self.results = []; self.words = getWords(); - //Ox.print('VIDEO EDITOR OPTIONS', self.options) + Ox.print('VIDEO EDITOR OPTIONS', self.options) self.$editor = Ox.Element() .addClass('OxVideoEditor')