From 60281a666bf9ca9219892d3e2ff0443c4dc61322 Mon Sep 17 00:00:00 2001
From: rlx <0x0073@0x2620.org>
Date: Thu, 22 Dec 2011 17:37:31 +0000
Subject: [PATCH] misc bugfixes

---
 source/Ox.UI/js/Form/Ox.Select.js       | 8 ++++----
 source/Ox.UI/js/Video/Ox.VideoEditor.js | 2 +-
 source/Ox.UI/js/Video/Ox.VideoPlayer.js | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/Ox.UI/js/Form/Ox.Select.js b/source/Ox.UI/js/Form/Ox.Select.js
index c9efbf4f..866ea941 100644
--- a/source/Ox.UI/js/Form/Ox.Select.js
+++ b/source/Ox.UI/js/Form/Ox.Select.js
@@ -159,11 +159,11 @@ Ox.Select = function(options, self) {
             self.options.title ? self.options.title : getItem(self.options.value).title
         );
         that.triggerEvent('change', {
-            title: Ox.isString(self.options.value)
-                ? getItem(self.options.value).title
-                : self.options.value.map(function(value) {
+            title: Ox.isArray(self.options.value)
+                ? self.options.value.map(function(value) {
                     return getItem(value).title;
-                }),
+                })
+                : getItem(self.options.value).title,
             value: self.options.value
         });
     }
diff --git a/source/Ox.UI/js/Video/Ox.VideoEditor.js b/source/Ox.UI/js/Video/Ox.VideoEditor.js
index 6c3831d8..5a97b031 100644
--- a/source/Ox.UI/js/Video/Ox.VideoEditor.js
+++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js
@@ -440,7 +440,7 @@ Ox.VideoEditor = function(options, self) {
                         width: 256
                     }).open();
                 } else if (id == 'resolution') {
-                    self.options.resolution = parseInt(value);
+                    self.options.resolution = parseInt(data.value);
                     self.$player[0].options({resolution: self.options.resolution});
                 }
             }
diff --git a/source/Ox.UI/js/Video/Ox.VideoPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPlayer.js
index 78d9ad59..cba62310 100644
--- a/source/Ox.UI/js/Video/Ox.VideoPlayer.js
+++ b/source/Ox.UI/js/Video/Ox.VideoPlayer.js
@@ -1702,7 +1702,7 @@ Ox.VideoPlayer = function(options, self) {
                         title: resolution + 'p'
                     }
                 }),
-                self.options.subtitles
+                self.options.subtitles.length
                     ? [{}, {
                         checked: self.options.enableSubtitles,
                         title: 'Subtitles'