From 0369eaff141d97b9b0eb178a9cc63bf465d2a490 Mon Sep 17 00:00:00 2001
From: rlx <0x0073@0x2620.org>
Date: Sat, 20 Aug 2011 09:48:28 +0000
Subject: [PATCH] video updates (playlists)
---
source/Ox.UI/js/Video/Ox.VideoElement.js | 311 +++++++++++++++++------
source/Ox.UI/js/Video/Ox.VideoPlayer.js | 133 +++++++---
2 files changed, 334 insertions(+), 110 deletions(-)
diff --git a/source/Ox.UI/js/Video/Ox.VideoElement.js b/source/Ox.UI/js/Video/Ox.VideoElement.js
index 42e2a5f1..33f19715 100644
--- a/source/Ox.UI/js/Video/Ox.VideoElement.js
+++ b/source/Ox.UI/js/Video/Ox.VideoElement.js
@@ -11,77 +11,42 @@ Ox.VideoElement = function(options, self) {
})
.options(options || {});
- self.options.src = Ox.isArray(self.options.src) ? self.options.src : [self.options.src];
-
Ox.print('VIDEO ELEMENT OPTIONS', self.options)
- self.currentPart = 0;
- self.duration = 0;
- self.durations = self.options.src.map(function() {
- return 0;
- });
- self.offsets = [];
- self.parts = self.options.src.length;
+ self.items = [];
self.paused = true;
+ self.$video = $('
');
- self.$videos = self.options.src.map(function(src, i) {
- return $('