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

fix video editor bugs

Browse source
This commit is contained in:
rlx 2012-02-04 11:44:19 +00:00
commit 76466e7eeb
6 changed files with 63 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

10
source/Ox.UI/js/Video/Ox.AnnotationFolder.js
View file

@ -285,7 +285,9 @@ Ox.AnnotationFolder = function(options, self) {
}
function crossesPoint() {
var sort = [self.position, self.options.position].sort(),
var sort = [self.position, self.options.position].sort(function(a, b) {
return a - b
}),
positionA = sort[0],
positionB = sort[1];
return self.points.some(function(point) {
@ -389,9 +391,9 @@ Ox.AnnotationFolder = function(options, self) {
function getSort() {
return ({
duration: ['-duration', '+in', '+value'],
position: ['+in', '-duration', '+value'],
text: ['+value', '+in', '-duration']
duration: ['+duration', '+in', '+value'],
position: ['+in', '+duration', '+value'],
text: ['+value', '+in', '+duration']
})[self.options.sort];
}