Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated to newest version of Flash player. Preparing for final release.

  • Loading branch information...
commit 90956059f65fe417e7b3816f74b503e41897a1ad 1 parent ab07612
@heff heff authored
View
8 build.sh
@@ -31,6 +31,7 @@ cat src/tracks.js >> dist/video.js
# h5swf temporarily requires swfobject
cat flash/swfobject.js >> dist/video.js
+cat src/setup.js >> dist/video.js
cat src/_end.js >> dist/video.js
@@ -39,6 +40,9 @@ cp design/video-js.css dist/video-js.css
cp design/video-js.png dist/video-js.png
cp flash/video-js.swf dist/video-js.swf
-cp build/files/README.md dist/README.md
-cp build/files/demo.html dist/demo.html
+cp build/release-files/README.md dist/README.md
+cp build/release-files/demo.html dist/demo.html
cp LGPLv3-LICENSE.txt dist/LGPLv3-LICENSE.txt
+
+java -jar build/lib/yuicompressor-2.4.7.jar dist/video.js -o dist/video.min.js
+java -jar build/lib/yuicompressor-2.4.7.jar dist/video-js.css -o dist/video-js.min.css
View
39 build/combine_sources.sh
@@ -1,39 +0,0 @@
-#! /bin/csh
-# Combines Source Files. In terminal, sh combine_sources.sh
-# It will put a new video.js file under dist/
-
-# FILES=../src/*
-# for f in $FILES
-# do
-# echo "Processing $f file..."
-# # take action on each file. $f store current file name
-# cat $f
-# done
-
-cat ../src/_begin.js > ../dist/video.js
-
-cat ../src/core.js >> ../dist/video.js
-cat ../src/api.js >> ../dist/video.js
-
-cat ../src/lib.js >> ../dist/video.js
-cat ../src/log.js >> ../dist/video.js
-
-cat ../src/ecma.js >> ../dist/video.js
-cat ../src/json.js >> ../dist/video.js
-cat ../src/events.js >> ../dist/video.js
-cat ../src/tracks.js >> ../dist/video.js
-
-cat ../src/tech/html5.js >> ../dist/video.js
-cat ../src/tech/flowplayer.js >> ../dist/video.js
-
-# h5swf temporarily requires swfobject
-cat ../src/tech/h5swf.js >> ../dist/video.js
-cat ../flash/swfobject.js >> ../dist/video.js
-# So does Youtube
-cat ../src/tech/youtube.js >> ../dist/video.js
-
-cat ../src/components.js >> ../dist/video.js
-
-cat ../src/autoload.js >> ../dist/video.js
-
-cat ../src/_end.js >> ../dist/video.js
View
BIN  build/lib/yuicompressor-2.4.7.jar
Binary file not shown
View
34 build/files/README.md → build/release-files/README.md
@@ -1,10 +1,9 @@
-VideoJS - [HTML5 Video Player](http://videojs.com)
+Video.js - [HTML5 Video Player](http://videojs.com)
==================================================
Version 3.0 BETA
---
-BETA NOTES
-Version 3 is almost a complete rewrite of the previous versions of VideoJS. New features includes:
+Version 3 is almost a complete rewrite of the previous versions of Video.js. New features includes:
- HTML/CSS Controls and API now work for both the HTML5 and Flash versions.
- Custom Super-lightweight Flash Fallback
@@ -14,9 +13,9 @@ Version 3 is almost a complete rewrite of the previous versions of VideoJS. New
---
-View [VideoJS.com](http://videojs.com) for a demo and overview.
+View [videojs.com](http://videojs.com) for a demo and overview.
-VideoJS is an HTML5 video player that uses the HTML5 video tag built into modern browsers, and uses javascript to add custom controls, new functionality, and to fix cross browser bugs. For browsers that don't support HTML5, it will fallback to a Flash player.
+Video.js is an HTML5 video player that uses the HTML5 video tag built into modern browsers, and uses javascript to add custom controls, new functionality, and to fix cross browser bugs. For browsers that don't support HTML5, it will fallback to a Flash player.
View demo.html for an example of how to use it.
@@ -30,7 +29,7 @@ heff, dz0ny, sentientbit, tvdeyen, brandonarbini, gordonbrander, Shraymonks, alb
Getting Started
---------------
-### Step 1: Include the VideoJS Javascript and CSS files in the head of your page.
+### Step 1: Include the Video.js Javascript and CSS files in the head of your page.
Change the file urls to point to the files on your server.
<script src="video.js"></script>
@@ -38,12 +37,12 @@ Change the file urls to point to the files on your server.
### Step 2: Add an HTML5 video tag to your page.
-Use the video tag as normal, with a few extra pieces for VideoJS:
+Use the video tag as normal, with a few extra pieces for Video.js:
- 1. The 'data-setup' Atrribute tells VideoJS to automatically set up the video when the page is ready, and read any options (in JSON format) from the attribute.
+ 1. The 'data-setup' attribute tells Video.js to automatically set up the video when the page is ready, and read any options (in JSON format) from the attribute.
2. The 'id' Attribute: Should be used and unique for every video on the same page.
3. The 'class' attribute contains two classes:
- - 'video-js' applies styles that are required for VideoJS functionality, like fullscreen and subtitles.
+ - 'video-js' applies styles that are required for Video.js functionality, like fullscreen and subtitles.
- 'vjs-default-skin' applies the default skin to the HTML controls, and can be removed or overridden to create your own controls design.
Otherwise include/exclude attributes, settings, sources, and tracks exactly as you would for HTML5 video.
@@ -57,18 +56,19 @@ Otherwise include/exclude attributes, settings, sources, and tracks exactly as y
### Step 3: Nada!
-That's all it take to get started. See the docs for more advanced uses.
+That's all it take to get started. See the [docs](http://videojs.com/docs/) for more advanced uses.
-Coming Next
------------
-- Stable Release
-
Changelog
---------
-3.0b
-
-- Complete rewrite in progress
+3.0
+
+- Complete rewrite
+- HTML/CSS Controls and API now work for both the HTML5 and Flash versions
+- Custom Super-lightweight Flash Fallback
+- Embed Code is much simpler.
+ - No more "vjs-box" div required, just use the video tag.
+ - No more embedding of Flash fallback within the video tag HTML.
2.0.3
View
3  build/files/demo.html → build/release-files/demo.html
@@ -13,9 +13,10 @@
<video id="example_video_1" class="video-js vjs-default-skin" controls preload="none" width="640" height="264"
poster="http://video-js.zencoder.com/oceans-clip.png"
- data-setup="">
+ data-setup="{}">
<source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4' />
<source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm' />
+ <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg' />
</video>
</body>
View
9 dev.html.example
@@ -24,6 +24,8 @@
<script src="flash/swfobject.js"></script>
+ <script src="src/setup.js"></script>
+
<script type="text/javascript" charset="utf-8">
// Easy access to test Flash over HTML5. Add ?flash to URL
if (window.location.href.indexOf("?flash") !== -1) {
@@ -34,15 +36,12 @@
</head>
<body>
- <video id="vid1" class="video-js vjs-default-skin" controls preload="none" width="640" height="264"
+ <video id="vid1" class="video-js vjs-default-skin" controls preload="auto" width="640" height="264"
poster="http://video-js.zencoder.com/oceans-clip.png"
data-setup='{}'>
<source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4'>
<source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm'>
- <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg; codecs="theora, vorbis"'>
- <source src="http://www.youtube.com/watch?v=YjaZNYSt7o0&feature=related" type='video/youtube'>
- <track kind="subtitles" src="http://videojs.com/subtitles/demo-subtitles.srt" srclang="en-US" label="English"></track>
- <!-- <track kind="subtitles" src="demo-subtitles.srt" srclang="en-US" label="English"></track> -->
+ <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg'>
<p>Video Playback Not Supported</p>
</video>
View
BIN  flash/video-js.swf
Binary file not shown
View
10 src/_begin.js
@@ -1,22 +1,22 @@
/*!
-VideoJS - HTML5 Video Player
+Video.js - HTML5 Video Player
Version 3.0 BETA
LGPL v3 LICENSE INFO
-This file is part of VideoJS. Copyright 2011 Zencoder, Inc.
+This file is part of Video.js. Copyright 2011 Zencoder, Inc.
-VideoJS is free software: you can redistribute it and/or modify
+Video.js is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-VideoJS is distributed in the hope that it will be useful,
+Video.js is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
-along with VideoJS. If not, see <http://www.gnu.org/licenses/>.
+along with Video.js. If not, see <http://www.gnu.org/licenses/>.
*/
// Self-executing function to prevent global vars and help with minification
View
7 src/core.js
@@ -146,8 +146,8 @@ _V_.autoSetup = function(){
}
}
- // No videos were found, so keep looping
- } else {
+ // No videos were found, so keep looping unless page is finisehd loading.
+ } else if (!_V_.windowLoaded) {
_V_.autoSetupTimeout(1);
}
};
@@ -156,6 +156,3 @@ _V_.autoSetup = function(){
_V_.autoSetupTimeout = function(wait){
setTimeout(_V_.autoSetup, wait);
};
-
-// Being called at _end now.
-_V_.autoSetupTimeout(1); // Let vjs javascript finish executing
View
1  src/events.js
@@ -292,3 +292,4 @@ _V_.Event.props = "altKey attrChange attrName bubbles button cancelable charCode
function returnTrue(){ return true; }
function returnFalse(){ return false; }
+
View
3  src/lib.js
@@ -160,7 +160,6 @@ _V_.extend({
// Returns the cache object where data for the element is stored
getData: function(elem){
- // _V_.log(arguments.callee.caller.arguments.callee.caller)
var id = elem[_V_.expando];
if (!id) {
id = elem[_V_.expando] = _V_.guid++;
@@ -323,4 +322,4 @@ if ("getBoundingClientRect" in document.documentElement) {
}
return curleft;
};
-}
+}
View
4 src/setup.js
@@ -0,0 +1,4 @@
+_V_.addEvent(window, "load", function(){
+ _V_.windowLoaded = true;
+});
+_V_.autoSetupTimeout();
View
8 src/tech.js
@@ -333,11 +333,7 @@ _V_.flash = _V_.PlaybackTech.extend({
poster: function(){ this.el.vjs_getProperty("poster"); },
buffered: function(){
- try {
- return _V_.createTimeRange(0, this.el.vjs_getProperty("buffered"));
- } catch(e) {
- _V_.log(e, arguments.callee.caller.arguments.callee.caller)
- }
+ return _V_.createTimeRange(0, this.el.vjs_getProperty("buffered"));
},
supportsFullScreen: function(){
@@ -408,7 +404,7 @@ _V_.flash.prototype.support = {
_V_.flash.onSWFReady = function(currSwf){
- _V_.log("swfReady", currSwf)
+ // _V_.log("swfReady", currSwf)
var el = _V_.el(currSwf);
Please sign in to comment.
Something went wrong with that request. Please try again.