From 962362adb21acf1637d54963f6a4ab4709f43677 Mon Sep 17 00:00:00 2001 From: Sanj Date: Fri, 30 Dec 2011 21:43:56 +0530 Subject: [PATCH] show overlay on small timeline on in / out options change --- source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js | 4 ++-- source/Ox.UI/js/Video/Ox.VideoPlayer.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js b/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js index 6eb3c95b..c28b807a 100644 --- a/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js +++ b/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js @@ -213,12 +213,12 @@ Ox.SmallVideoTimeline = function(options, self) { self.$image.options({ 'in': value }); - setPointMarker('in'); + self.options.type == 'editor' && setPointMarker('in'); } else if (key == 'out') { self.$image.options({ out: value }); - setPointMarker('out'); + self.options.type == 'editor' && setPointMarker('out'); } else if (key == 'paused') { self.$positionMarker[ self.options.paused ? 'addClass' : 'removeClass' diff --git a/source/Ox.UI/js/Video/Ox.VideoPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPlayer.js index 05f496de..bcbebec3 100644 --- a/source/Ox.UI/js/Video/Ox.VideoPlayer.js +++ b/source/Ox.UI/js/Video/Ox.VideoPlayer.js @@ -2337,6 +2337,7 @@ Ox.VideoPlayer = function(options, self) { setSizes(); } else if (key == 'in' || key == 'out') { self.options.paused && setMarkers(); + self.$timeline.options(key, value); } else if (key == 'muted') { toggleMuted(); } else if (key == 'paused') {