0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

make video editor and player trigger find events

Browse source
This commit is contained in:
rlx 2011-10-30 09:49:58 +00:00
parent abb1c73214
commit 462b335416
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/Ox.UI/js/Video/Ox.VideoEditor.js
View file

@ -521,7 +521,7 @@ Ox.VideoEditor = function(options, self) {
value: self.options.find, value: self.options.find,
width: 96 width: 96
}) })
.css({float: 'right'}) .css({float: 'right', background: 'transparent'})
.bindEvent({ .bindEvent({
change: function(data) { change: function(data) {
submitFindInput(data.value, false); submitFindInput(data.value, false);
@ -531,7 +531,7 @@ Ox.VideoEditor = function(options, self) {
} }
}) })
.appendTo(self.$videobar); .appendTo(self.$videobar);
self.$findInput.find('input').css({background: 'transparent'}); self.$findInput.find('input').css({background: 'rgb(48, 48, 48)'});
self.$findButton = Ox.Button({ self.$findButton = Ox.Button({
//disabled: true, //disabled: true,
@ -988,6 +988,7 @@ Ox.VideoEditor = function(options, self) {
self.results.length ? self.results.length ?
setPosition(getNextPosition('result', 1)) : setPosition(getNextPosition('result', 1)) :
self.$findInput.focusInput(); self.$findInput.focusInput();
that.triggerEvent('find', {find: self.options.find});
} }
} }

4
source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js
View file

@ -17,6 +17,7 @@ Ox.VideoPanelPlayer = function(options, self) {
annotationsSize: 256, annotationsSize: 256,
censored: [], censored: [],
duration: 0, duration: 0,
find: '',
height: 0, height: 0,
'in': 0, 'in': 0,
loop: false, loop: false,
@ -72,6 +73,7 @@ Ox.VideoPanelPlayer = function(options, self) {
enableFind: true, enableFind: true,
enableKeyboard: true, enableKeyboard: true,
enableMouse: true, enableMouse: true,
find: self.options.find,
height: getPlayerHeight(), height: getPlayerHeight(),
'in': self.options['in'], 'in': self.options['in'],
muted: self.options.muted, muted: self.options.muted,
@ -88,6 +90,7 @@ Ox.VideoPanelPlayer = function(options, self) {
.bindEvent({ .bindEvent({
find: function(data) { find: function(data) {
self.$timeline.options({find: data.find}); self.$timeline.options({find: data.find});
that.triggerEvent('find', data);
}, },
position: setPosition, position: setPosition,
muted: function(data) { muted: function(data) {
@ -109,6 +112,7 @@ Ox.VideoPanelPlayer = function(options, self) {
self.$timeline = Ox.LargeVideoTimeline({ self.$timeline = Ox.LargeVideoTimeline({
duration: self.options.duration, duration: self.options.duration,
find: self.options.find,
getImageURL: self.options.getTimelineImageURL, getImageURL: self.options.getTimelineImageURL,
position: self.options.position, position: self.options.position,
subtitles: self.options.subtitles, subtitles: self.options.subtitles,