From 4c6a6333b288215cc1d83c1dba801f2ce331d55d Mon Sep 17 00:00:00 2001
From: rlx <0x0073@0x2620.org>
Date: Wed, 19 Oct 2011 10:49:19 +0000
Subject: [PATCH] some changes to enable clips view in pandora; fix video
 player to allow for paused=false and playInToOut=true

---
 source/Ox.UI/js/List/Ox.IconItem.js       |  4 ++--
 source/Ox.UI/js/List/Ox.InfoList.js       |  8 ++++----
 source/Ox.UI/js/Video/Ox.VideoPlayer.js   | 11 ++++++++++-
 source/Ox.UI/themes/modern/css/modern.css |  6 +++---
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/source/Ox.UI/js/List/Ox.IconItem.js b/source/Ox.UI/js/List/Ox.IconItem.js
index 1e2c0b47..b19f8b93 100644
--- a/source/Ox.UI/js/List/Ox.IconItem.js
+++ b/source/Ox.UI/js/List/Ox.IconItem.js
@@ -73,7 +73,7 @@ Ox.IconItem = function(options, self) {
     that.$icon = $('<div>')
         .addClass('OxIcon')
         .css({
-            top: self.options._isInfoList
+            top: self.options.________isInfoList
                 ? 0 : self.options.iconWidth == 64 ? -64 : -124,
             width: (self.options.iconWidth + 4) + 'px',
             height: (self.options.iconHeight + 4) + 'px'
@@ -95,7 +95,7 @@ Ox.IconItem = function(options, self) {
     that.$textBox = $('<div>')
         .addClass('OxText')
         .css({
-            top: self.options._isInfoList
+            top: self.options.________isInfoList
                 ? self.options.iconHeight
                 : self.options.iconHeight - self.options.itemWidth / 2 + 'px',
             width: self.options.itemWidth + 4 + 'px',
diff --git a/source/Ox.UI/js/List/Ox.InfoList.js b/source/Ox.UI/js/List/Ox.InfoList.js
index 21e3abad..8254a424 100644
--- a/source/Ox.UI/js/List/Ox.InfoList.js
+++ b/source/Ox.UI/js/List/Ox.InfoList.js
@@ -172,6 +172,10 @@ Ox.InfoList = function(options, self) {
         return that;
     };
 
+    that.infoOptions = function(id, options) {
+        // ...
+    }
+
     that.paste = function(data) {
         that.$element.paste(data);
         return that;
@@ -201,10 +205,6 @@ Ox.InfoList = function(options, self) {
         return that;
     };
 
-    that.updateInfo = function(id, options) {
-        // ...
-    }
-
     that.value = function(id, key, value) {
         // fixme: make this accept id, {k: v, ...}
         if (arguments.length == 1) {
diff --git a/source/Ox.UI/js/Video/Ox.VideoPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPlayer.js
index ebb9a679..55dccc07 100644
--- a/source/Ox.UI/js/Video/Ox.VideoPlayer.js
+++ b/source/Ox.UI/js/Video/Ox.VideoPlayer.js
@@ -278,10 +278,12 @@ Ox.VideoPlayer = function(options, self) {
         });
 
         self.$video = Ox.VideoElement(
+                // autoplay seems to always play from the beginning,
+                // and poster doesn't seem to work at all
                 Ox.extend({
                     preload: self.options.preload,
                     src: self.video
-                }, !self.options.paused ? {
+                }, !self.options.paused && !self.options.playInToOut ? {
                     autoplay: 'autoplay'
                 } : {}/*, self.options.poster ? {
                     poster: self.options.poster
@@ -1491,6 +1493,13 @@ Ox.VideoPlayer = function(options, self) {
         //self.options.position = Ox.limit(self.options.position, self['in'], self.out);
         self.$video.currentTime(self.options.position);
 
+        // if not paused, but playInToOut, we haven't set autoplay before,
+        // since autoplay seems to always play from the beginning
+        if (!self.options.paused && self.options.playInToOut) {
+            self.options.paused = true;
+            togglePaused('button');
+        }
+
         self.options.paused && self.options.showMarkers && setMarkers();
         self.options.paused && self.playOnLoad && togglePaused('button');
         self.$playButton && self.$playButton.options({
diff --git a/source/Ox.UI/themes/modern/css/modern.css b/source/Ox.UI/themes/modern/css/modern.css
index 01b839de..343cfb74 100644
--- a/source/Ox.UI/themes/modern/css/modern.css
+++ b/source/Ox.UI/themes/modern/css/modern.css
@@ -386,9 +386,9 @@ Lists
 .OxThemeModern .OxInfoList .OxItem .OxText > div > .OxInfo {
     color: rgb(128, 128, 128);
 }
-.OxThemeModern .OxInfoList .OxItem.OxSelected .OxIconList .OxIcon > img,
-.OxThemeModern .OxInfoList .OxItem.OxSelected .OxIconList .OxIcon .OxVideoPlayer,
-.OxThemeModern .OxInfoList .OxItem.OxSelected .OxIconList .OxText > div {
+.OxThemeModern .OxInfoList .OxItem.OxSelected .OxInfoElement .OxIcon > img,
+.OxThemeModern .OxInfoList .OxItem.OxSelected .OxInfoElement .OxIcon .OxVideoPlayer,
+.OxThemeModern .OxInfoList .OxItem.OxSelected .OxInfoElement .OxText > div {
     border-color: rgba(0, 0, 0, 0);
     background: rgba(0, 0, 0, 0);
     -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0);