0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

remove subtitles.sort from 0xdb config, duration should always be >=0

Browse source
This commit is contained in:
j 2012-02-15 22:55:17 +05:30
parent f3d20abe99
commit fbe8c9160b
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandora/0xdb.jsonc
View file

@ -540,10 +540,6 @@
"hasPlaces": true, "hasPlaces": true,
"item": "Subtitle", "item": "Subtitle",
"overlay": true, "overlay": true,
"sort": [
{"id": "words", "title": "Words", "type": "words"},
{"id": "wordsperminute", "title": "Words per Minute", "type": "wordsperminute"}
],
"type": "text" "type": "text"
} }
], ],

2
pandora/annotation/models.py
View file

@ -188,7 +188,7 @@ class Annotation(models.Model):
'saturation': 'clip__saturation', 'saturation': 'clip__saturation',
'volume': 'clip__volume', 'volume': 'clip__volume',
}.get(key, key)) }.get(key, key))
j['duration'] = j['out'] - j['in'] j['duration'] = abs(j['out'] - j['in'])
if user: if user:
j['editable'] = self.editable(user) j['editable'] = self.editable(user)

2
static/js/pandora/utils.js
View file

@ -803,7 +803,7 @@ pandora.getVideoOptions = function(data) {
pandora.site.layers.forEach(function(layer, i) { pandora.site.layers.forEach(function(layer, i) {
options.layers[i] = Ox.extend({}, layer, { options.layers[i] = Ox.extend({}, layer, {
items: data.layers[layer.id].map(function(annotation) { items: data.layers[layer.id].map(function(annotation) {
annotation.duration = annotation.out - annotation['in']; annotation.duration = Math.abs(annotation.out - annotation['in']);
annotation.editable = annotation.editable annotation.editable = annotation.editable
|| annotation.user == pandora.user.username || annotation.user == pandora.user.username
|| pandora.site.capabilities['canEditAnnotations'][pandora.user.level]; || pandora.site.capabilities['canEditAnnotations'][pandora.user.level];