From b0853447d16191b845922f19c507275cafdb6239 Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Mon, 14 Dec 2015 12:16:13 +0000 Subject: [PATCH] AnnotationPanel: allow sorting by creation time fixes #2865 --- source/UI/js/Video/AnnotationFolder.js | 3 ++- source/UI/js/Video/AnnotationPanel.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source/UI/js/Video/AnnotationFolder.js b/source/UI/js/Video/AnnotationFolder.js index 93fadd93..dc873c1c 100644 --- a/source/UI/js/Video/AnnotationFolder.js +++ b/source/UI/js/Video/AnnotationFolder.js @@ -520,7 +520,8 @@ Ox.AnnotationFolder = function(options, self) { return ({ duration: ['-duration', '+in', self.options.type == 'text' ? '+created' : '+value'], position: ['+in', '+duration', self.options.type == 'text' ? '+created' : '+value'], - text: ['+value', '+in', '+duration'] + text: ['+value', '+in', '+duration'], + created: ['+created', '+in', '+duration', '+value'] })[self.options.sort]; } diff --git a/source/UI/js/Video/AnnotationPanel.js b/source/UI/js/Video/AnnotationPanel.js index a5a8b9b7..f9347af6 100644 --- a/source/UI/js/Video/AnnotationPanel.js +++ b/source/UI/js/Video/AnnotationPanel.js @@ -462,7 +462,8 @@ Ox.AnnotationPanel = function(options, self) { {group: 'sort', min: 1, max: 1, items: [ {id: 'position', title: Ox._('By Position'), checked: self.options.sort == 'position'}, {id: 'duration', title: Ox._('By Duration'), checked: self.options.sort == 'duration'}, - {id: 'text', title: Ox._('By Text'), checked: self.options.sort == 'text'} + {id: 'text', title: Ox._('By Text'), checked: self.options.sort == 'text'}, + {id: 'created', title: Ox._('By Creation Time'), checked: self.options.sort == 'created'} ]} ], self.languages.length > 1 ? [