Gkatsev karma chameleon

.jshintrc

@@ -39,6 +39,7 @@
         "start",
         "stop",
         "strictEqual",
-        "test"
+        "test",
+        "sinon"
     ]
 }

CHANGELOG.md

@@ -10,6 +10,16 @@ CHANGELOG
 * Fixed extra mousemove events on Windows caused by certain apps, not users [[view](https://github.com/videojs/video.js/pull/1068)]
 * Fixed error due to undefined tech when no source is supported [[view](https://github.com/videojs/video.js/pull/1172)]
 * Fixed the progress bar not finishing when manual timeupdate events are used [[view](https://github.com/videojs/video.js/pull/1173)]
+* Added a more informative and styled fallback message for non-html5 browsers [[view](https://github.com/videojs/video.js/pull/1181)]
+* Added the option to provide an array of child components instead of an object [[view](https://github.com/videojs/video.js/pull/1093)]
+* Fixed casing on webkitRequestFullscreen [[view](https://github.com/videojs/video.js/pull/1101)]
+* Made tap events on mobile less sensitive to touch moves [[view](https://github.com/videojs/video.js/pull/1111)]
+* Fixed the default flag for captions/subtitles tracks [[view](https://github.com/videojs/video.js/pull/1153)]
+* Fixed compilation failures with LESS v1.7.0 and GRUNT v0.4.4 [[view](https://github.com/videojs/video.js/pull/1180)]
+* Added better error handling across the library [[view](https://github.com/videojs/video.js/pull/1197)]
+* Updated captions/subtiles file fetching to support cross-origin requests in older IE browsers [[view](https://github.com/videojs/video.js/pull/1095)]
+* Added support for playback rate switching [[view](https://github.com/videojs/video.js/pull/1132)]
+* Fixed an issue with the loadstart event order that caused the big play button to not hide [[view](https://github.com/videojs/video.js/pull/1209)]
 
 --------------------
 

Gruntfile.js

@@ -57,7 +57,7 @@ module.exports = function(grunt) {
       },
       tests: {
         src: ['build/files/combined.video.js', 'build/compiler/goog.base.js', 'src/js/exports.js', 'test/unit/*.js'],
-        externs: ['src/js/player.externs.js', 'src/js/media/flash.externs.js', 'test/qunit-externs.js'],
+        externs: ['src/js/player.externs.js', 'src/js/media/flash.externs.js', 'test/qunit-externs.js', 'test/sinon-externs.js'],
         dest: 'build/files/test.minified.video.js'
       }
     },

build/demo-files/demo.html

@@ -25,6 +25,7 @@
     <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg' />
     <track kind="captions" src="demo.captions.vtt" srclang="en" label="English"></track><!-- Tracks need an ending tag thanks to IE9 -->
     <track kind="subtitles" src="demo.captions.vtt" srclang="en" label="English"></track><!-- Tracks need an ending tag thanks to IE9 -->
+    <p class="vjs-no-js">To view this video please enable JavaScript, and consider upgrading to a web browser that <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a></p>
   </video>
 
 </body>

build/source-loader.js

@@ -24,6 +24,7 @@ var sourceFiles = [
   "src/js/button.js",
   "src/js/slider.js",
   "src/js/menu.js",
+  "src/js/media-error.js",
   "src/js/player.js",
   "src/js/control-bar/control-bar.js",
   "src/js/control-bar/live-display.js",
@@ -34,9 +35,11 @@ var sourceFiles = [
   "src/js/control-bar/volume-control.js",
   "src/js/control-bar/mute-toggle.js",
   "src/js/control-bar/volume-menu-button.js",
+  "src/js/control-bar/playback-rate-menu-button.js",
   "src/js/poster.js",
   "src/js/loading-spinner.js",
   "src/js/big-play-button.js",
+  "src/js/error-display.js",
   "src/js/media/media.js",
   "src/js/media/html5.js",
   "src/js/media/flash.js",

contrib.json

@@ -84,6 +84,7 @@
   "contributions": {
 
     "feature": {
+      "desc": "Create a new feature or general enhancement",
       "start": {
         "desc": "Start a new feature",
         "steps": [
@@ -132,7 +133,7 @@
           },
           {
             "desc": "Are you sure <%= branch %> is the branch you want to submit",
-            "prompt": "confirm"
+            "confirm": "confirm"
           },
           {
             "id": "user",
@@ -151,7 +152,7 @@
     },
 
     "patch": {
-      "desc": "Urgent fixes for the latest stable version",
+      "desc": "Create an urgent fix for the latest stable version",
       "new": {
         "desc": "Start a new patch",
         "steps": [
@@ -200,7 +201,7 @@
           },
           {
             "desc": "Are you sure <%= branch %> is the branch you want to submit",
-            "prompt": "confirm"
+            "confirm": "confirm"
           },
           {
             "id": "user",
@@ -227,7 +228,7 @@
           },
           {
             "desc": "Confirm you are deleting the correct branch",
-            "prompt": "Delete branch '<%= name %>'?"
+            "confirm": "Delete branch '<%= name %>'?"
           },
           {
             "desc": "Delete the local copy of the branch",
@@ -241,6 +242,79 @@
       }
     },
 
+    "bug": {
+      "desc": "Submit a bug report",
+      "steps": [
+        {
+          "id": "title",
+          "prompt": "Title your bug report"
+        },
+        {
+          "id": "reproduce",
+          "prompt": "What did you do? (steps to reproduce)"
+        },
+        {
+          "id": "expected",
+          "prompt": "What did you expect to happen?"
+        },
+        {
+          "id": "actual",
+          "prompt": "What actually happened?"
+        },
+        {
+          "id": "version",
+          "prompt": "What version of video.js are you using?"
+        },
+        {
+          "id": "plugins",
+          "prompt": "Are you using any video.js plugins?"
+        },
+        {
+          "id": "browsers",
+          "prompt": "What browsers/platforms did you experience this in (e.g. Win 7, IE10; Android 4, Chrome;)?"
+        },
+        {
+          "id": "example",
+          "prompt": "Is there a URL to a live example, or a jsbin (e.g. http://jsbin.com/axedog/9999/edit)?"
+        },
+        {
+          "id": "details",
+          "prompt": "Are there any other details you'd like to provide?"
+        },
+        {
+          "open": "https://github.com/videojs/video.js/issues/new?title=<%= title %>&body=**Steps to reproduce:**\n> <%= reproduce %>\n\n**What was expected:**\n> <%= expected %>\n\n**What Happened:**\n> <%= actual %>\n\n**Video.js Version:**\n> <%= version %>\n\n**Plugins:**\n> <%= plugins %>\n\n**Browsers experienced on:**\n> <%= browsers %>\n\n**Example:**\n> <%= example %>\n\n**Other details:**\n> <%= details %>"
+        }
+      ]
+    },
+
+    "request": {
+      "desc": "Submit a feature/enhancement request",
+      "steps": [
+        {
+          "id": "title",
+          "prompt": "Title your request"
+        },
+        {
+          "id": "describe",
+          "prompt": "Describe the feature/enhancement (be as detailed as possible so it's clear who, why, and how it would be used)"
+        },
+        {
+          "id": "docs",
+          "prompt": "Is there any existing documentation or related specifications?"
+        },
+        {
+          "id": "examples",
+          "prompt": "Are there any existing examples?"
+        },
+        {
+          "confirm": "You will be redirected to Github where you can submit this issue, OK?"
+        },
+        {
+          "open": "https://github.com/videojs/video.js/issues/new?title=<%= title %>&body=**Describe the feature/enhancement:**\n> <%= describe %>\n\n**Existing docs/specs:**\n> <%= docs %>\n\n**Existing examples:**\n> <%= examples %>"
+        }
+      ]
+    },
+
     "release": {
       "desc": "Create and publish a release",
       "steps": [
@@ -254,7 +328,7 @@
         },
         {
           "desc": "Have the changes been merged into the release branch (stable)?",
-          "prompt": "confirm"
+          "confirm": "confirm"
         },
         {
           "id": "type",

docs/guides/setup.md

@@ -47,8 +47,7 @@ With Video.js you just use an HTML5 video tag to embed a video. Video.js will th
     - `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.
-
+Otherwise include/exclude attributes, settings, sources, and tracks exactly as you would for HTML5 video.*
 ```html
 <video id="example_video_1" class="video-js vjs-default-skin"
   controls preload="auto" width="640" height="264"
@@ -57,6 +56,7 @@ Otherwise include/exclude attributes, settings, sources, and tracks exactly as y
  <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' />
+ <p class="vjs-no-js">To view this video please enable JavaScript, and consider upgrading to a web browser that <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a></p>
 </video>
 ```
 
@@ -100,3 +100,5 @@ videojs(document.getElementsByClassName('awesome_video_class')[0], {}, function(
   // if it's an array that you pick one (here we chose the first).
 });
 ```
+
+\* If you have trouble playing back content you know is in the [correct format](http://blog.zencoder.com/2013/09/13/what-formats-do-i-need-for-html5-video/), your HTTP server might not be delivering the content with the correct [MIME type](http://en.wikipedia.org/wiki/Internet_media_type#Type_video). Please double check your content's headers before opening an [issue](https://github.com/videojs/video.js/blob/master/CONTRIBUTING.md).

package.json

@@ -58,6 +58,7 @@
     "qunitjs": "~1.12.0",
     "semver": "~1.1.4",
     "uglify-js": "~2.3.6",
-    "videojs-doc-generator": "0.0.1"
+    "videojs-doc-generator": "0.0.1",
+    "sinon": "~1.9.1"
   }
 }

sandbox/index.html.example

@@ -25,7 +25,7 @@
     <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'>
     <track kind="captions" src="../build/demo-files/demo.captions.vtt" srclang="en" label="English"></track><!-- Tracks need an ending tag thanks to IE9 -->
-    <p>Video Playback Not Supported</p>
+    <p class="vjs-no-js">To view this video please enable JavaScript, and consider upgrading to a web browser that <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a></p>
   </video>
 
   <script>