sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

make video editor handle internal links (fixes #494)

Browse source
This commit is contained in:
rlx 2012-02-17 16:13:08 +00:00
commit e8f370ab7c
5 changed files with 38 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

31
source/Ox.UI/js/Video/Ox.VideoPlayer.js
View file

@ -1085,6 +1085,13 @@ Ox.VideoPlayer = function(options, self) {
self.$copyrightIcon[self.censored ? 'show' : 'hide']();
}
function changeVolumeBy(num) {
showVolume();
self.options.volume = Ox.limit(self.options.volume + num, 0, 1);
setVolume(self.options.volume);
self.$volumeInput && self.$volumeInput.value(self.options.volume);
}
function clearInterfaceTimeout() {
clearTimeout(self.interfaceTimeout);
self.interfaceTimeout = 0;
@ -1853,6 +1860,14 @@ Ox.VideoPlayer = function(options, self) {
}
}
function setCensored() {
var censored = getCensored();
if (censored != self.censored) {
self.censored = censored;
censor();
}
}
function setMarkers() {
//Ox.Log('Video', 'SET MARKERS', self.options.position, self.options['in'], self.options.out, self.$pointMarker);
Ox.forEach(self.$posterMarker, function(marker) {
@ -1877,6 +1892,7 @@ Ox.VideoPlayer = function(options, self) {
function setPosition(position, from) {
self.options.position = Ox.limit(position, self['in'], self.out);
/*
// disabled
self.options.position = Math.round(
position * self.options.fps
) / self.options.fps;
@ -1989,14 +2005,6 @@ Ox.VideoPlayer = function(options, self) {
}
}
function setCensored() {
var censored = getCensored();
if (censored != self.censored) {
self.censored = censored;
censor();
}
}
function setSubtitle() {
var subtitle = getSubtitle();
if (subtitle != self.subtitle) {
@ -2024,13 +2032,6 @@ Ox.VideoPlayer = function(options, self) {
self.$video.css(self.videoCSS);
};
function changeVolumeBy(num) {
showVolume();
self.options.volume = Ox.limit(self.options.volume + num, 0, 1);
setVolume(self.options.volume);
self.$volumeInput && self.$volumeInput.value(self.options.volume);
}
function setVolume(volume) {
self.options.volume = volume;
if (!!self.options.volume == self.options.muted) {