From e60ac585d43b406361102ec85f88f6d213e9f82c Mon Sep 17 00:00:00 2001
From: rolux <rolux@rolux.org>
Date: Tue, 17 May 2011 09:43:20 +0200
Subject: [PATCH] minor fixes

---
 demos/video/js/video.js                 |  2 +-
 source/Ox.UI/js/Video/Ox.VideoPlayer.js | 38 ++++++++++++++-----------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/demos/video/js/video.js b/demos/video/js/video.js
index 163b5da7..844bd9b5 100644
--- a/demos/video/js/video.js
+++ b/demos/video/js/video.js
@@ -160,7 +160,7 @@ Ox.load('UI', {
                                             $videos[2].options({height: size - 48});
                                         }
                                     }),
-                                size: 240,
+                                size: 320,
                                 resizable: true,
                                 resize: [100, 400]
                             },
diff --git a/source/Ox.UI/js/Video/Ox.VideoPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPlayer.js
index 3552f2ad..4e170d3e 100644
--- a/source/Ox.UI/js/Video/Ox.VideoPlayer.js
+++ b/source/Ox.UI/js/Video/Ox.VideoPlayer.js
@@ -476,9 +476,7 @@ Ox.VideoPlayer = function(options, self) {
             })
             .css({float: 'left'})
             .bindEvent({
-                click: function() {
-                    self.$find.hide();
-                }
+                click: toggleFind
             })
             .appendTo(self.$find);
       
@@ -751,8 +749,8 @@ Ox.VideoPlayer = function(options, self) {
                         type: 'image'
                     })
                     .css({float: 'left'})
-                    .bindEvent('click', function() {
-                        self.$volume.toggle();
+                    .bindEvent({
+                        click: toggleVolume
                     })
                     .appendTo(self['$controls' + titlecase]);
 
@@ -792,9 +790,7 @@ Ox.VideoPlayer = function(options, self) {
             })
             .css({float: 'left'})
             .bindEvent({
-                click: function() {
-                    self.$volume.hide();
-                }
+                click: toggleVolume
             })
             .appendTo(self.$volume);
 
@@ -944,14 +940,19 @@ Ox.VideoPlayer = function(options, self) {
                 height: logoHeight + 'px',
             };
         } else if (element == 'player') {
+            var height = self.options.fullscreen ? window.innerHeight : self.height;
+            if (self.options.externalControls) {
+                height += (
+                    !!self.options.controlsTop.length +
+                    !!self.options.controlsBottom.length
+                ) * self.barHeight;
+            }
+            if (self.options.largeTimeline) {
+                height += 64;
+            }
             css = Ox.extend({
                 width: self.width + 'px',
-                height: (self.options.fullscreen
-                    ? window.innerHeight
-                    : self.height + (
-                        self.options.externalControls
-                        ? (!!self.options.controlsTop.length + !!self.options.controlsBottom.length) * self.barHeight
-                        : 0)) + 'px'
+                height: height + 'px'
             }, self.options.fullscreen ? {
                 left: 0,
                 top: 0
@@ -1499,7 +1500,6 @@ Ox.VideoPlayer = function(options, self) {
         if (!found) {
             position = self.results[direction == 1 ? 0 : self.results.length - 1]['in'];
         }
-        Ox.print('>>', self.results, position)
         setPosition(position + self.secondsPerFrame, true);
     }
 
@@ -1519,8 +1519,10 @@ Ox.VideoPlayer = function(options, self) {
     }
 
     function toggleFind() {
+        var show = self.$find.is(':hidden');
+        !show && self.$findInput.blurInput();
         self.$find.toggle();
-        self.$find.is(':visible') && self.$findInput.focusInput(false);
+        show && self.$findInput.focusInput(false);
     }
 
     function toggleFullscreen(toggleButton) {
@@ -1671,6 +1673,10 @@ Ox.VideoPlayer = function(options, self) {
         });
     }
 
+    function toggleVolume() {
+        self.$volume.toggle();
+    }
+
     self.setOption = function(key, value) {
         if (key == 'fullscreen') {
             toggleFullscreen(true);