web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-02-08 12:05:47 +02:00
Code Releases Activity

@gkatsev added get and set global options methods. closes #2115

Browse Source
This commit is contained in:
Gary Katsevman 2015-05-06 14:12:17 -04:00 committed by heff
parent e5595b1e38
commit b65bad8f20
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -28,6 +28,7 @@ CHANGELOG
* @gkatsev added a sensible toJSON function ([view](https://github.com/videojs/video.js/pull/2114)) * @gkatsev added a sensible toJSON function ([view](https://github.com/videojs/video.js/pull/2114))
* @bc-bbay fixed instance where progress bars would go passed 100% ([view](https://github.com/videojs/video.js/pull/2040)) * @bc-bbay fixed instance where progress bars would go passed 100% ([view](https://github.com/videojs/video.js/pull/2040))
* @eXon began Tech 2.0 work, improved how tech events are handled by the player ([view](https://github.com/videojs/video.js/pull/2057)) * @eXon began Tech 2.0 work, improved how tech events are handled by the player ([view](https://github.com/videojs/video.js/pull/2057))
* @gkatsev added get and set global options methods ([view](https://github.com/videojs/video.js/pull/2115))
-------------------- --------------------

6
sandbox/index.html.example
View File

@ -10,7 +10,11 @@
<!-- Set the location of the flash SWF --> <!-- Set the location of the flash SWF -->
<script> <script>
videojs.options.flash.swf = '../build/temp/video-js.swf'; videojs.setGlobalOptions({
flash: {
swf: '../build/temp/video-js.swf'
}
});
</script> </script>
</head> </head>

6
src/js/video.js
View File

@ -18,6 +18,7 @@ import * as Util from './util.js';
import Player from './player'; import Player from './player';
import extendsFn from './extends.js'; import extendsFn from './extends.js';
import plugin from './plugins.js'; import plugin from './plugins.js';
import options from './options.js';
if (typeof HTMLVideoElement === 'undefined') { if (typeof HTMLVideoElement === 'undefined') {
document.createElement('video'); document.createElement('video');
@ -42,6 +43,11 @@ videojs.players = Player.players;
videojs.extends = extendsFn; videojs.extends = extendsFn;
videojs.getGlobalOptions = () => options;
videojs.setGlobalOptions = function(newOptions) {
Lib.util.mergeOptions(options, newOptions);
};
videojs.plugin = plugin; videojs.plugin = plugin;
// REMOVING: We probably should not include this in 5.0 thought it would make it // REMOVING: We probably should not include this in 5.0 thought it would make it