use new Ox.VideoElement, add inital player to edits and view as video results view
This commit is contained in:
parent
15be34955e
commit
9cd9611306
16 changed files with 218 additions and 80 deletions
|
|
@ -78,7 +78,7 @@ class MetaClip:
|
|||
for a in annotations]
|
||||
for key in keys:
|
||||
if key not in self.clip_keys and key not in j:
|
||||
value = self.item.get(key)
|
||||
value = self.item.get(key) or self.item.json.get(key)
|
||||
if not value and hasattr(self.item.sort, key):
|
||||
value = getattr(self.item.sort, key)
|
||||
j[key] = value
|
||||
|
|
|
|||
|
|
@ -678,7 +678,7 @@
|
|||
//{"id": "maps", "title": "with Maps"},
|
||||
//{"id": "calendars", "title": "with Calendars"},
|
||||
{"id": "clip", "title": "as Clips"},
|
||||
//{"id": "video", "title": "as Video"},
|
||||
{"id": "video", "title": "as Video"},
|
||||
{"id": "map", "title": "on Map"},
|
||||
{"id": "calendar", "title": "on Calendar"}
|
||||
],
|
||||
|
|
|
|||
|
|
@ -691,6 +691,7 @@
|
|||
{"id": "timelines", "title": "with Timelines"},
|
||||
{"id": "clips", "title": "with Clips"},
|
||||
{"id": "clip", "title": "as Clips"},
|
||||
{"id": "video", "title": "as Videos"},
|
||||
{"id": "map", "title": "on Map"},
|
||||
{"id": "calendar", "title": "on Calendar"}
|
||||
],
|
||||
|
|
|
|||
|
|
@ -575,6 +575,7 @@
|
|||
{"id": "timelines", "title": "with Timelines"},
|
||||
{"id": "clips", "title": "with Clips"},
|
||||
{"id": "clip", "title": "as Clips"},
|
||||
{"id": "video", "title": "as Video"},
|
||||
{"id": "map", "title": "on Map"},
|
||||
{"id": "calendar", "title": "on Calendar"}
|
||||
],
|
||||
|
|
|
|||
|
|
@ -494,6 +494,7 @@
|
|||
{"id": "timelines", "title": "with Timelines"},
|
||||
{"id": "clips", "title": "with Clips"},
|
||||
{"id": "clip", "title": "as Clips"},
|
||||
{"id": "video", "title": "as Video"},
|
||||
{"id": "map", "title": "on Map"},
|
||||
{"id": "calendar", "title": "on Calendar"}
|
||||
],
|
||||
|
|
|
|||
|
|
@ -297,10 +297,14 @@ class Clip(models.Model):
|
|||
data['annotation'] = self.annotation.public_id
|
||||
data['in'] = self.annotation.start
|
||||
data['out'] = self.annotation.end
|
||||
data['parts'] = self.annotation.item.json['parts']
|
||||
data['durations'] = self.annotation.item.json['durations']
|
||||
else:
|
||||
data['item'] = self.item.itemId
|
||||
data['in'] = self.start
|
||||
data['out'] = self.end
|
||||
data['parts'] = self.item.json['parts']
|
||||
data['durations'] = self.item.json['durations']
|
||||
data['duration'] = data['out'] - data['in']
|
||||
return data
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue