1
0
mirror of https://github.com/videojs/video.js.git synced 2025-01-02 06:32:07 +02:00

@heff added back the default cdn url for the swf

closes #2533
fixes #2488
This commit is contained in:
heff 2015-09-03 14:31:24 -07:00
parent 63e21bdadd
commit 5624adb75d
3 changed files with 13 additions and 0 deletions

View File

@ -117,6 +117,7 @@ CHANGELOG
* @gkatsev made the sass files available via npm in src/css ([view](https://github.com/videojs/video.js/pull/2546))
* @heff removed playerOptions from plugin options because it created an inconsistency in plugin inits ([view](https://github.com/videojs/video.js/pull/2532))
* @heff added a default data attribute to fix the progress handle display in IE8 ([view](https://github.com/videojs/video.js/pull/2547))
* @heff added back the default cdn url for the swf ([view](https://github.com/videojs/video.js/pull/2533))
--------------------

View File

@ -259,6 +259,10 @@ module.exports = function(grunt) {
['browserify-versionify', {
placeholder: '__VERSION_NO_PATCH__',
version: version.majorMinor
}],
['browserify-versionify', {
placeholder: '__SWF_VERSION__',
version: pkg.dependencies['videojs-swf']
}]
]
},

View File

@ -69,6 +69,14 @@ class Flash extends Tech {
createEl() {
let options = this.options_;
// If video.js is hosted locally you should also set the location
// for the hosted swf, which should be relative to the page (not video.js)
// Otherwise this adds a CDN url.
// The CDN also auto-adds a swf URL for that specific version.
if (!options.swf) {
options.swf = '//vjs.zencdn.net/swf/__SWF_VERSION__/video-js.swf';
}
// Generate ID for swf object
let objId = options.techId;