From ce18a9af740eb2a01f2b0efe2d10299de32818ce Mon Sep 17 00:00:00 2001 From: Matthew McClure Date: Tue, 28 Oct 2014 15:00:34 -0700 Subject: [PATCH] updated options to include sans-children, and included self-hosted font blurb updated used by count --- README.md | 2 +- docs/guides/options.md | 11 +++++++++++ docs/guides/setup.md | 4 +++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index eac7e4155..0fe22ca64 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # [Video.js - HTML5 Video Player](http://videojs.com) [![Build Status](https://travis-ci.org/videojs/video.js.png?branch=master)](https://travis-ci.org/videojs/video.js) -> 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. +> 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~~ 100,000 websites. ## Quick start Thanks to the awesome folks over at [Fastly](http://www.fastly.com/), there's a free, CDN hosted version of Video.js that anyone can use. Simply add these includes to your document's diff --git a/docs/guides/options.md b/docs/guides/options.md index 5da894b5c..37f2477d5 100644 --- a/docs/guides/options.md +++ b/docs/guides/options.md @@ -131,6 +131,17 @@ var player = videojs('video-id', { }); ``` +All the children can start getting a little verbose, so to simplify things, you can also set options for child components directly on the parent options. +This is functionally the exact same as the above, for instance. + +```javascript +var player = videojs('video-id', { + controlBar: { + muteToggle: false + } +}); +``` + This also works using the `data-setup` attribute on the video element, just remember the options need to use proper JSON notation. diff --git a/docs/guides/setup.md b/docs/guides/setup.md index a39075d75..80b637567 100644 --- a/docs/guides/setup.md +++ b/docs/guides/setup.md @@ -25,7 +25,9 @@ You can download the Video.js source and host it on your own servers, or use the ``` ### Self Hosted. ### -With the self hosted option you'll also want to update the location of the video-js.swf file. +To entirely self-host, you'll need to pull in the font files and let Video.js know where the swf is located. If you simply copy the dist folder or zip file contents into your project everything +should Just Work™, but the paths can easily be changed by editing the LESS file and re-building, or by modifying the generated CSS file. + ```html