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

misc bugfixes

Browse source
This commit is contained in:
rlx 2011-12-22 17:37:31 +00:00
parent 02f53a57c1
commit 60281a666b
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/Ox.UI/js/Form/Ox.Select.js
View file

@ -159,11 +159,11 @@ Ox.Select = function(options, self) {
self.options.title ? self.options.title : getItem(self.options.value).title self.options.title ? self.options.title : getItem(self.options.value).title
); );
that.triggerEvent('change', { that.triggerEvent('change', {
title: Ox.isString(self.options.value) title: Ox.isArray(self.options.value)
? getItem(self.options.value).title ? self.options.value.map(function(value) {
: self.options.value.map(function(value) {
return getItem(value).title; return getItem(value).title;
}), })
: getItem(self.options.value).title,
value: self.options.value value: self.options.value
}); });
} }

2
source/Ox.UI/js/Video/Ox.VideoEditor.js
View file

@ -440,7 +440,7 @@ Ox.VideoEditor = function(options, self) {
width: 256 width: 256
}).open(); }).open();
} else if (id == 'resolution') { } else if (id == 'resolution') {
self.options.resolution = parseInt(value); self.options.resolution = parseInt(data.value);
self.$player[0].options({resolution: self.options.resolution}); self.$player[0].options({resolution: self.options.resolution});
} }
} }

2
source/Ox.UI/js/Video/Ox.VideoPlayer.js
View file

@ -1702,7 +1702,7 @@ Ox.VideoPlayer = function(options, self) {
title: resolution + 'p' title: resolution + 'p'
} }
}), }),
self.options.subtitles self.options.subtitles.length
? [{}, { ? [{}, {
checked: self.options.enableSubtitles, checked: self.options.enableSubtitles,
title: 'Subtitles' title: 'Subtitles'