diff --git a/source/Ox.UI/js/Video/Ox.VideoEditor.js b/source/Ox.UI/js/Video/Ox.VideoEditor.js index 3a334539..ceab5959 100644 --- a/source/Ox.UI/js/Video/Ox.VideoEditor.js +++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js @@ -521,7 +521,7 @@ Ox.VideoEditor = function(options, self) { value: self.options.find, width: 96 }) - .css({float: 'right'}) + .css({float: 'right', background: 'transparent'}) .bindEvent({ change: function(data) { submitFindInput(data.value, false); @@ -531,7 +531,7 @@ Ox.VideoEditor = function(options, self) { } }) .appendTo(self.$videobar); - self.$findInput.find('input').css({background: 'transparent'}); + self.$findInput.find('input').css({background: 'rgb(48, 48, 48)'}); self.$findButton = Ox.Button({ //disabled: true, @@ -988,6 +988,7 @@ Ox.VideoEditor = function(options, self) { self.results.length ? setPosition(getNextPosition('result', 1)) : self.$findInput.focusInput(); + that.triggerEvent('find', {find: self.options.find}); } } diff --git a/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js index 60f6eb69..7911c94d 100644 --- a/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js +++ b/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js @@ -17,6 +17,7 @@ Ox.VideoPanelPlayer = function(options, self) { annotationsSize: 256, censored: [], duration: 0, + find: '', height: 0, 'in': 0, loop: false, @@ -72,6 +73,7 @@ Ox.VideoPanelPlayer = function(options, self) { enableFind: true, enableKeyboard: true, enableMouse: true, + find: self.options.find, height: getPlayerHeight(), 'in': self.options['in'], muted: self.options.muted, @@ -88,6 +90,7 @@ Ox.VideoPanelPlayer = function(options, self) { .bindEvent({ find: function(data) { self.$timeline.options({find: data.find}); + that.triggerEvent('find', data); }, position: setPosition, muted: function(data) { @@ -109,6 +112,7 @@ Ox.VideoPanelPlayer = function(options, self) { self.$timeline = Ox.LargeVideoTimeline({ duration: self.options.duration, + find: self.options.find, getImageURL: self.options.getTimelineImageURL, position: self.options.position, subtitles: self.options.subtitles,