Merge branch 'master' of https://github.com/videojs/video.js into 636…

…-incompatible

CHANGELOG.md

@@ -2,7 +2,12 @@ CHANGELOG
 =========
 
 ## Unreleased (HEAD)
-_(none)_
+* Added LESS as a CSS preprocessor for the default skin ([view](https://github.com/videojs/video.js/pull/644))
+* Exported MenuButtons for use in the API ([view](https://github.com/videojs/video.js/pull/648))
+* Fixed ability to remove listeners added with one() ([view](https://github.com/videojs/video.js/pull/659))
+* Updated buffered() to account for multiple loaded ranges ([view](https://github.com/videojs/video.js/pull/643))
+* Exported createItems() for custom menus ([view](https://github.com/videojs/video.js/pull/654))
+* Preventing media events from bubbling up the DOM ([view](https://github.com/videojs/video.js/pull/630))
 
 --------------------
 

Gruntfile.js

@@ -61,7 +61,7 @@ module.exports = function(grunt) {
       minified_api: ['test/minified-api.html']
     },
     watch: {
-      files: [ 'src/**/*.js', 'test/unit/*.js' ],
+      files: [ 'src/**/*', 'test/unit/*.js', 'Gruntfile.js' ],
       tasks: 'dev'
     },
     copy: {
@@ -111,6 +111,13 @@ module.exports = function(grunt) {
         dest: 'build/files/',
         ext: '.min.css'
       }
+    },
+    less: {
+      dev: {
+        files: {
+          'build/files/video-js.css': 'src/css/video-js.less'
+        }
+      }
     }
   });
 
@@ -120,14 +127,15 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-contrib-cssmin');
+  grunt.loadNpmTasks('grunt-contrib-less');
   grunt.loadNpmTasks('grunt-s3');
   grunt.loadNpmTasks('contribflow');
 
   // Default task.
-  grunt.registerTask('default', ['jshint', 'build', 'minify', 'dist']);
+  grunt.registerTask('default', ['jshint', 'less', 'build', 'minify', 'dist']);
   // Development watch task
-  grunt.registerTask('dev', ['jshint', 'build', 'qunit:source']);
-  grunt.registerTask('test', ['jshint', 'build', 'minify', 'qunit']);
+  grunt.registerTask('dev', ['jshint', 'less', 'build', 'qunit:source']);
+  grunt.registerTask('test', ['jshint', 'less', 'build', 'minify', 'qunit']);
 
   var fs = require('fs'),
       gzip = require('zlib').gzip;
@@ -157,8 +165,7 @@ module.exports = function(grunt) {
     grunt.file.write('build/files/combined.video.js', combined);
 
     // Copy over other files
-    grunt.file.copy('src/css/video-js.css', 'build/files/video-js.css');
-    grunt.file.copy('src/css/video-js.png', 'build/files/video-js.png');
+    // grunt.file.copy('src/css/video-js.png', 'build/files/video-js.png');
     grunt.file.copy('src/swf/video-js.swf', 'build/files/video-js.swf');
 
     // Inject version number into css file

README.md

@@ -1,50 +1,18 @@
 
-# [Video.js - HTML5 and Flash Video Player](http://videojs.com)  [![Build Status](https://travis-ci.org/zencoder/video-js.png?branch=master)](https://travis-ci.org/zencoder/video-js)
+# [Video.js - HTML5 Video Player](http://videojs.com)  [![Build Status](https://travis-ci.org/zencoder/video-js.png?branch=master)](https://travis-ci.org/zencoder/video-js)
 
-Visit the main site at [videojs.com](http://videojs.com) for download options and instructions.
+> Video.js is a web video player built from the ground up for an HTML5 world. It supports HTML5 and Flash video, as well as YouTube and Vimeo (through [plugins](https://github.com/videojs/video.js/wiki/Plugins)). It supports video playback on desktops and mobile devices. This project was started mid 2010, and the player is now used on over 50,000 websites.
 
-### PLEASE EXCUSE OUR DUST
-
-We're finishing up a big overhaul of the libary which includes
-
-* Closure compiler advanced mode support for drastically better minification over previous versions
-* Flashy new automated builds and test using node.js and grunt
-
-Check out our [contributing guide](https://github.com/zencoder/video-js/blob/master/CONTRIBUTING.md) for info on building a local version.
-
-## About
-
-Video.js was built to provide a fast and easy way to embed and work with video in a web page.
-It was built from the ground up with the assumption that HTML5 is the future of web video, however it supports Flash equally well for older browsers and for advanced features not yet supported in HTML5.
-
-Some of the focuses of Video.js are:
-
-- Universal browser and device support
-- Fast player loading
-- Easily skinned (themed/chromed) using just CSS
-- A JavaScript API for controlling the video that works consistently across video platforms (HTML5, Flash, and soon other players like youtube) as well as devices
-
-## Getting Started
-
-Check out our [getting started guide](http://videojs.com/#section5).
+Visit [videojs.com](http://videojs.com) for an overview, download options, and instructions on how to use the player on your site.
 
 ## Contributing
+Video.js is a free and open source library, and we appreciate any help you're willing to give. Check out the [contributing guide](CONTRIBUTING.md).
 
-Check out our [contributing guide](https://github.com/zencoder/video-js/blob/master/CONTRIBUTING.md).
+## Building your own Video.js from source
+To build your own custom version read the section on [contributing code](CONTRIBUTING.md#contributing-code) and ["Building your own copy"](CONTRIBUTING.md#building-your-own-copy-of-videojs) in the contributing guide.
 
 ## License
 
-Copyright 2013 Brightcove, Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+Video.js is licensed under the Apache License, Version 2.0. [View the license file](LICENSE)
 
+Copyright 2013 Brightcove, Inc.

docs/api.md

@@ -186,6 +186,14 @@ myPlayer.cancelFullScreen();
 ```
 
 
+### dispose() ###
+Destroys the video player and does any necessary cleanup. This is especially helpful if you are dynamically adding and removing videos to/from the DOM. Use after removing videos from the DOM.
+```js
+myPlayer.dispose();
+```
+
+
+
 Events
 ------
 You can attach event listeners to the player similarly to how you would for a video element.

docs/index.md

@@ -2,7 +2,7 @@
 
 <h1>Video.js Documentation</h1>
 
-The Video.js documentation is here to help you setup and use the player. These docs can be found and contributed to in the [Video.js library repository](https://github.com/zencoder/video-js/tree/master/docs).
+The Video.js documentation is here to help you setup and use the player. These docs can be found and contributed to in the [Video.js library repository](https://github.com/videojs/video.js/tree/master/docs).
 
 ## Getting Started
 
@@ -24,4 +24,4 @@ The Video.js documentation is here to help you setup and use the player. These d
 
 ## Resources
 
-* [Glossary](glossary.md) - Some helpful definitions.
+* [Glossary](glossary.md) - Some helpful definitions.

docs/setup.md

@@ -12,8 +12,8 @@ You can download the Video.js source and host it on your own servers, or use the
 
 ### CDN Version ###
 ```html
-<link href="http://vjs.zencdn.net/4.0/video-js.css" rel="stylesheet">
-<script src="http://vjs.zencdn.net/4.0/video.js"></script>
+<link href="http://vjs.zencdn.net/4.1/video-js.css" rel="stylesheet">
+<script src="http://vjs.zencdn.net/4.1/video.js"></script>
 ```
 
 ### Self Hosted. ###

docs/skins.md

@@ -1,21 +1,23 @@
 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.
+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.
 
-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/videojs/video.js/blob/master/src/css/video-js.css) on Github.
+New in version 4.0 is the use of font icons. All of the icons (play, pause, etc.) use the new custom font, which allows the icons to be scaled and colored just like any other text font.
 
-You can either override styles in the default skin:
+The easiest way to try this out is by using the [player skin designer](http://designer.videojs.com/).
+
+When you create a new skin, you can either override styles in the default skin:
 
 ```css
 .vjs-default-skin .vjs-play-progress { background: #900; }
 ```
 
-Or remove the 'vjs-default-skin' class from the video tag and create your own skin.
+Or remove the 'vjs-default-skin' class from the video tag and create a new skin from scratch.
 
 ```html
 <video class="video-js my-custom-skin" ...>
 ```
 
-More custom skins will be available for download soon. If you have one you'd like to contribute back, please email it to skins at videojs.
+More custom skins will be available for download soon. If you have one you like you can share it by forking [this example on CodePen.io](http://codepen.io/heff/pen/EarCt), and adding a link on the [Skins wiki page](https://github.com/videojs/video.js/wiki/Skins).
 

package.json

@@ -32,7 +32,8 @@
     "grunt-s3": "~0.2.0-alpha",
     "semver": "~1.1.4",
     "grunt-contrib-cssmin": "~0.6.0",
-    "uglify-js": "~2.3.6"
+    "uglify-js": "~2.3.6",
+    "grunt-contrib-less": "~0.6.4"
   },
   "testling": {
     "browsers": [

sandbox/index.html.example

@@ -4,7 +4,7 @@
   <meta charset="utf-8" />
   <title>Video.js Sandbox</title>
 
-  <link href="../src/css/video-js.css" rel="stylesheet" type="text/css">
+  <link href="../build/files/video-js.css" rel="stylesheet" type="text/css">
 
   <!-- LOAD VIDEO.JS SOURCE FILES IN ORDER -->
   <script src="../build/source-loader.js"></script>

sandbox/plugin.html.example

@@ -4,7 +4,7 @@
   <meta charset="utf-8" />
   <title>Video.js Plugin Example</title>
 
-  <link href="../src/css/video-js.css" rel="stylesheet" type="text/css">
+  <link href="../build/files/video-js.css" rel="stylesheet" type="text/css">
 
   <!-- LOAD VIDEO.JS SOURCE FILES IN ORDER -->
   <script src="../build/source-loader.js"></script>