0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

make AnnotatoinFolder slightly async #2125

Browse source
This commit is contained in:
j 2014-02-01 15:09:05 +05:30
parent e3d8b5d3b0
commit 0df1056d3f
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -268,9 +268,6 @@ Ox.AnnotationFolder = function(options, self) {
: null, : null,
globalAttributes: ['lang'], globalAttributes: ['lang'],
highlight: self.options.highlight, highlight: self.options.highlight,
items: self.annotations,
placeholder: getPlaceholder(),
selected: self.options.selected,
separator: ';', separator: ';',
sort: self.sort, sort: self.sort,
submitOnBlur: false, submitOnBlur: false,
@ -303,6 +300,7 @@ Ox.AnnotationFolder = function(options, self) {
insert: function(data) { insert: function(data) {
that.triggerEvent('insert', data); that.triggerEvent('insert', data);
}, },
placeholder: Ox._('Loading...'),
open: function() { open: function() {
that.triggerEvent('open'); that.triggerEvent('open');
}, },
@ -323,6 +321,13 @@ Ox.AnnotationFolder = function(options, self) {
? self.$outer : that.$content ? 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', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
'b', 'backslash', 'closebracket', 'comma', 'dot', 'b', 'backslash', 'closebracket', 'comma', 'dot',