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

misc fixes

Browse source
This commit is contained in:
rolux 2012-01-02 19:35:14 +05:30
commit b77852296b
7 changed files with 28 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

25
source/Ox.UI/js/Video/Ox.AnnotationPanel.js
View file

@ -20,14 +20,14 @@ Ox.AnnotationPanel = function(options, self) {
self = self || {};
var that = Ox.Element({}, self)
.defaults({
id: '',
items: [],
title: '',
type: 'text',
width: 0
})
.options(options || {});
.defaults({
id: '',
items: [],
title: '',
type: 'text',
width: 0
})
.options(options || {});
self.selected = -1;
@ -58,6 +58,8 @@ Ox.AnnotationPanel = function(options, self) {
self.$annotations = Ox.List({
construct: function(data) {
var $item = Ox.Element()
.addClass('OxAnnotation OxTarget')
.css({padding: '4px 4px 0 4px'})
.append(
Ox.Editable({
type: 'textarea',
@ -73,9 +75,7 @@ Ox.AnnotationPanel = function(options, self) {
}
})
)
.append($('<div>').css({height: '4px'}))
.css({padding: '4px 4px 0 4px'})
.addClass('OxAnnotation OxTarget');
.append($('<div>').css({height: '4px'}));
return $item;
},
items: self.options.items,
@ -155,8 +155,7 @@ Ox.AnnotationPanel = function(options, self) {
deselectItems <f> deselectItems
@*/
that.deselectItems = function() {
if(self.$annotations.options('selected'))
self.$annotations.options('selected',[]);
self.$annotations.options('selected', []);
};
return that;

6
source/Ox.UI/js/Video/Ox.LargeVideoTimeline.js
View file

@ -175,8 +175,8 @@ Ox.LargeVideoTimeline = function(options, self) {
function setSubtitles() {
self.$subtitles = [];
self.options.subtitles.forEach(function(subtitle, i) {
var found = self.options.find &&
subtitle.text.toLowerCase().indexOf(self.options.find.toLowerCase()) > -1;
var found = self.options.find
&& subtitle.text.toLowerCase().indexOf(self.options.find.toLowerCase()) > -1;
self.$subtitles[i] = $('<div>')
.addClass('OxSubtitle' + (found ? ' OxHighlight' : ''))
.css({
@ -227,7 +227,7 @@ Ox.LargeVideoTimeline = function(options, self) {
} else if (key == 'position') {
setPosition();
} else if (key == 'subtitles') {
// ...
} else if (key == 'width') {
setWidth();
}