Merge branch 'hotfix/fixing-ie8-poster-bug' into stable

Adding line to CHANGELOG: Fixed an ie8 breaking bug with the poster
Bumping version to 3.0.7.
2012-01-12 17:40:44 -08:00 · 2012-01-12 17:40:44 -08:00 · 2012-01-12 17:40:24 -08:00 · 2012-01-12 17:39:25 -08:00 · 2012-01-12 16:35:16 -08:00 · 2012-01-12 16:35:16 -08:00
@@ -1,4 +1,5 @@
 .DS_Store
 dist/*
 dev.html
-projects
+projects
+.zenflow-log
@@ -0,0 +1,10 @@
+--- 
+confirm_review: true
+backup_remote: false
+release_branch: stable
+project: videojs
+qa_branch: false
+staging_branch: false
+development_branch: master
+remote: origin
+confirm_staging: false
@@ -0,0 +1,21 @@
+--------------------------------------------------------------------------------
+                          ^ ADD NEW CHANGES ABOVE ^
+--------------------------------------------------------------------------------
+
+CHANGELOG
+=========
+
+---- 3.0.3 / 2012-01-12 / doc-change -------------------------------------------
+* Added line to docs to test zenflow
+
+---- 3.0.4 / 2012-01-12 / undefined-source-fix ---------------------------------
+* Fixing an undefined source when no sources exist on load
+
+---- 3.0.5 / 2012-01-12 / event-layer-x-deprecation-fix ------------------------
+* Removed deprecated event.layerX and layerY
+
+---- 3.0.6 / 2012-01-12 / docs-url-fix -----------------------------------------
+* Fixed wrong URL for CDN in docs
+
+---- 3.0.7 / 2012-01-12 / fixing-ie8-poster-bug --------------------------------
+* Fixed an ie8 breaking bug with the poster
@@ -0,0 +1,4 @@
+--- 
+major: 3
+patch: 7
+minor: 0
@@ -1,3 +1,7 @@
+Deploying Version
+-----------------
+- Update SWF location for CDN
+
 Version Numbers
 ---------------
 http://en.wikipedia.org/wiki/Software_versioning#Sequence-based_identifiers
@@ -10,9 +14,9 @@ http://en.wikipedia.org/wiki/Software_versioning#Sequence-based_identifiers

 ### Revision Versions

- Beta (3.1-b1)
- Release Candidate (3.1-rc1)
- Release with revisions (3.1-r1)
+- Beta (3.1b1)
+- Release Candidate (3.1rc1)
+- Release with revisions (3.1r1)

 Notes:
 The last level of one revision type (beta/release candidate) should match the first level of the next revision type. 4.0-b10 should match 4.0-rc1, assuming b10 is the last beta version.
@@ -21,4 +25,4 @@ Release revisions means bug fixes. The CDN url should not reflect the revision n

 Tagging a Release
 -----------------
-git tag -a v[version number] [commit]
+git tag -a [version number] [commit]
@@ -1,6 +1,6 @@
 Video.js - [HTML5 Video Player](http://videojs.com)
 ==================================================
-Version 3.0 BETA
+Version 3.0

 ---
 Version 3 is almost a complete rewrite of the previous versions of Video.js. New features includes:
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>VideoJS | HTML5 Video Player</title>
+  <title>Video.js | HTML5 Video Player</title>

  <link href="video-js.css" rel="stylesheet" type="text/css">

@@ -226,6 +226,7 @@ You can also remove the listeners later.


 ### Event Types
+List of player events you can add listeners for.

 <table border="0" cellspacing="5" cellpadding="5">
  <tr><th>Name</th><th>Description</th></tr>
@@ -8,3 +8,23 @@ body_class: docs subpage

 Options
 =======
+
+The Video.js emebed code is simply an HTML5 video tag with the video.js classes. So for many of the options you can use the standard tag attributes to set video.js options.
+
+{% highlight html %}
+<video controls autoplay preload="auto" ...>
+{% endhighlight %}
+
+Alternatively, you can use the data-setup attribute to provide options in the JSON format. This is also how you would set options that aren't standard to the video tag.
+
+{% highlight html %}
+<video data-setup='{ "controls": true, "autoplay": false, "preload": "auto" }'...>
+{% endhighlight %}
+
+Finally, if you're not using the data-setup attribute to trigger the player setup, you can pass in an object with the player options as the second argument in the setup function.
+
+{% highlight javascript %}
+_V_("myVideoID", { "controls": true, "autoplay": false, "preload": "auto" });
+{% endhighlight %}
+
+(More options documentation coming soon.)
@@ -17,13 +17,11 @@ You can download the Video.js source and host it on your own servers, or use the

 {% highlight html %}

-<script src="http://vjs.zencdn.com/c/video.js"></script>
-<link href="http://vjs.zencdn.com/c/video-js.css" rel="stylesheet">
+<script src="http://vjs.zencdn.net/c/video.js"></script>
+<link href="http://vjs.zencdn.net/c/video-js.css" rel="stylesheet">

 {% endhighlight %}

-It's often recommended now to include JavaScript before the end \</body\> tag instead of the \<head\>, but Video.js includes an 'HTML5 Shiv', which needs to be in the \<head\> for older IE versions.
-

 Step 2: Add an HTML5 video tag to your page.
 --------------------------------------------
@@ -8,3 +8,26 @@ body_class: docs subpage

 Skins
 =====
+
+The default Video.js skin is made using HTML and CSS, so there's no need to learn a complicated skinning language to update colors or even create an entirely new skin. New in version 3.0 is the use of a sprites image file (video-js.png). The image allows for a little bit more classy design, as well as compatibility with older versions of IE now that the HTML skin also shows when Flash is used for those browsers.
+
+You can view the uncompressed CSS for the default skin by downloading the latest version of Video.js or viewing [the source version](https://github.com/zencoder/video-js/blob/master/design/video-js.css) on Github.
+
+You can either override styles in the default skin:
+
+{% highlight css %}
+
+.vjs-default-skin .vjs-play-progress { background: #900; }
+
+{% endhighlight %}
+
+Or remove the 'vjs-default-skin' class from the video tag and create your own skin.
+
+{% highlight html %}
+
+<video class="video-js my-custom-skin" ...>
+
+{% endhighlight %}
+
+More custom skins will be available for download soon. If you have one you'd like to contribute back, please email it to <script type="text/javascript">eval(decodeURIComponent('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%73%6b%69%6e%73%40%76%69%64%65%6f%6a%73%2e%63%6f%6d%22%3e%73%6b%69%6e%73%40%76%69%64%65%6f%6a%73%2e%63%6f%6d%3c%2f%61%3e%27%29%3b'))</script>.
+
@@ -1,6 +1,6 @@
 /*!
 Video.js - HTML5 Video Player
-Version 3.0 BETA
+Version 3.0

 LGPL v3 LICENSE INFO
 This file is part of Video.js. Copyright 2011 Zencoder, Inc.
@@ -409,14 +409,16 @@ _V_.Slider = _V_.Component.extend({
    // On HTML5 browsers scrubbing is really smooth, but some flash players are slow, so we might want to utilize this later.
    // var progress =  (this.player.scrubbing) ? this.player.values.currentTime / this.player.duration() : this.player.currentTime() / this.player.duration();

-    var progress = this.getPercent();
+    var barProgress,
+        progress = this.getPercent();
        handle = this.handle,
-        bar = this.bar,
-        barProgress = progress;
+        bar = this.bar;

    // Protect against no duration and other division issues
    if (isNaN(progress)) { progress = 0; }

+    barProgress = progress;
+
    // If there is a handle, we need to account for the handle in our calculation for progress bar
    // so that it doesn't fall short of or extend past the handle.
    if (handle) {
@@ -424,7 +426,8 @@ _V_.Slider = _V_.Component.extend({
          boxWidth = box.offsetWidth,

          // The width of the handle in percent of the containing box
-          handlePercent = handle.el.offsetWidth / boxWidth,
+          // In IE, widths may not be ready yet causing NaN
+          handlePercent = (handle.el.offsetWidth) ? handle.el.offsetWidth / boxWidth : 0,

          // Get the adjusted size of the box, considering that the handle's center never touches the left or right side.
          // There is a margin of half the handle's width on both sides.
@@ -723,7 +726,7 @@ _V_.Poster = _V_.Button.extend({
  },

  createElement: function(){
-    return this._super("img", {
+    return _V_.createElement("img", {
      className: "vjs-poster",
      src: this.player.options.poster,

@@ -50,7 +50,7 @@ VideoJS.options = {

  html5: {},
  flash: {
-    swf: "flash/video-js.swf"
+    swf: "http://vjs.zencdn.net/c/video-js.swf"
    // swf: "https://s3.amazonaws.com/video-js/3.0b/video-js.swf"
    // swf: "http://video-js.zencoder.com/3.0b/video-js.swf"
    // swf: "http://video-js.com/test/video-js.swf"
@@ -288,7 +288,7 @@ _V_.Event.prototype = {
  isPropagationStopped: returnFalse,
  isImmediatePropagationStopped: returnFalse
 };
-_V_.Event.props = "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" ");
+_V_.Event.props = "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" ");

 function returnTrue(){ return true; }
 function returnFalse(){ return false; }
@@ -199,11 +199,11 @@ _V_.Player = _V_.Component.extend({
    // Grab tech-specific options from player options and add source and parent element to use.
    var techOptions = _V_.merge({ source: source, parentEl: this.el }, this.options[techName])

-    if (source.src == this.values.src && this.values.currentTime > 0) {
-      techOptions.startTime = this.values.currentTime;
-    }
-
    if (source) {
+      if (source.src == this.values.src && this.values.currentTime > 0) {
+        techOptions.startTime = this.values.currentTime;
+      }
+
      this.values.src = source.src;
    }

@@ -404,8 +404,6 @@ _V_.flash.prototype.support = {

 _V_.flash.onSWFReady = function(currSwf){

-  // _V_.log("swfReady", currSwf)
-
  var el = _V_.el(currSwf);

  // Get player from box
Autor	SHA1	Mensagem	Data
Steve Heffernan	3708b1b6a5	Merge branch 'hotfix/fixing-ie8-poster-bug' into stable	2012-01-12 17:40:44 -08:00
Steve Heffernan	386161c5b9	Adding line to CHANGELOG: Fixed an ie8 breaking bug with the poster	2012-01-12 17:40:44 -08:00
Steve Heffernan	aa72d9b050	Bumping version to 3.0.7.	2012-01-12 17:40:24 -08:00
Steve Heffernan	c345889535	Fixed an issue where ie8 was borking on a bad image attribute.	2012-01-12 17:39:25 -08:00
Steve Heffernan	c6153f7556	Merge branch 'hotfix/docs-url-fix' into stable	2012-01-12 16:35:16 -08:00
Steve Heffernan	11a75fe74f	Adding line to CHANGELOG: Fixed wrong URL for CDN in docs	2012-01-12 16:35:16 -08:00
Steve Heffernan	8a5f667159	Bumping version to 3.0.6.	2012-01-12 16:35:03 -08:00
Steve Heffernan	a2651b9ab5	Fixed wrong url for CDN	2012-01-12 16:34:34 -08:00
Steve Heffernan	2dc3de9de1	Merge branch 'hotfix/event-layer-x-deprecation-fix' into stable	2012-01-12 15:44:51 -08:00
Steve Heffernan	d1824d7c28	Adding line to CHANGELOG: Removed deprecated event.layerX and layerY	2012-01-12 15:44:51 -08:00
Steve Heffernan	a9c9722647	Bumping version to 3.0.5.	2012-01-12 15:44:34 -08:00
Steve Heffernan	534fb39e89	Removed event.layerX and layerY which weren't used and were throwing deprecation warnings.	2012-01-12 15:41:30 -08:00
Steve Heffernan	ff2d59fcf8	Merge branch 'hotfix/undefined-source-fix' into stable	2012-01-12 14:30:14 -08:00
Steve Heffernan	855f513d5f	Adding line to CHANGELOG: Fixing an undefined source when no sources exist on load	2012-01-12 14:30:14 -08:00
Steve Heffernan	62bb873ddd	Bumping version to 3.0.4.	2012-01-12 14:29:46 -08:00
Raymond Cohen	55ac829fb1	If there are no sources when the player is initialized, loadTech is called with an undefined source. It would then error on source.src	2012-01-12 14:26:27 -08:00
Steve Heffernan	6def502496	Merge branch 'hotfix/doc-change' into stable	2012-01-12 13:30:59 -08:00
Steve Heffernan	dff355dda9	Adding line to CHANGELOG: Added line to docs to test zenflow	2012-01-12 13:30:59 -08:00
Steve Heffernan	1d65860227	Bumping version to 3.0.3.	2012-01-12 13:29:23 -08:00
Steve Heffernan	ee740c619f	Added description of events.	2012-01-12 13:05:06 -08:00
Steve Heffernan	a1a0e351c1	Set up zenflow workflow management config.	2012-01-12 12:59:53 -08:00
Steve Heffernan	44b02529ba	Poster was wrongly removed from setup change. Fixed. Upated docs.	2012-01-10 15:52:20 -08:00
Steve Heffernan	a83433f655	Updated options docs. Full URL to flash SWF.	2012-01-10 13:15:49 -08:00
Steve Heffernan	d80e3e328a	Updated version number.	2012-01-10 10:10:07 -08:00
Steve Heffernan	166bd0b44f	Fixed an offset width bug with IE that was causing player to break.	2012-01-09 16:28:26 -08:00
Steve Heffernan	7b7c8a497f	Updated skins doc	2012-01-09 13:32:10 -08:00
Steve Heffernan	42c9e43736	Removed beta references	2012-01-09 12:38:43 -08:00