From 0df1056d3fb8245714ca85f4f1df3f31088a8417 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Sat, 1 Feb 2014 15:09:05 +0530 Subject: [PATCH] make AnnotatoinFolder slightly async #2125 --- source/Ox.UI/js/Video/AnnotationFolder.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/source/Ox.UI/js/Video/AnnotationFolder.js b/source/Ox.UI/js/Video/AnnotationFolder.js index b3594503..6ccb53e2 100644 --- a/source/Ox.UI/js/Video/AnnotationFolder.js +++ b/source/Ox.UI/js/Video/AnnotationFolder.js @@ -268,9 +268,6 @@ Ox.AnnotationFolder = function(options, self) { : null, globalAttributes: ['lang'], highlight: self.options.highlight, - items: self.annotations, - placeholder: getPlaceholder(), - selected: self.options.selected, separator: ';', sort: self.sort, submitOnBlur: false, @@ -303,6 +300,7 @@ Ox.AnnotationFolder = function(options, self) { insert: function(data) { that.triggerEvent('insert', data); }, + placeholder: Ox._('Loading...'), open: function() { that.triggerEvent('open'); }, @@ -323,6 +321,13 @@ Ox.AnnotationFolder = function(options, self) { ? self.$outer : that.$content ); + setTimeout(function() { + self.$annotations.options({ + items: self.annotations, + placeholder: getPlaceholder(), + selected: self.options.selected + }); + }); [ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'b', 'backslash', 'closebracket', 'comma', 'dot',