Skip to content

Commit

Permalink
@mmcc added a VERSION key to the videojs object. closes #1798
Browse files Browse the repository at this point in the history
  • Loading branch information
mmcc authored and heff committed Jan 22, 2015
1 parent 300eeb7 commit 67c4eed
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ CHANGELOG
* @gkatsev Fixed issue where ManualTimeUpdatesOff was not de-registering events ([view](https://github.com/videojs/video.js/pull/1793))
* @brycefisher Added a guide on player disposal ([view](https://github.com/videojs/video.js/pull/1803))
* @toniher added a Catalan translation ([view](https://github.com/videojs/video.js/pull/1794))
* @mmcc added a VERSION key to the videojs object ([view](https://github.com/videojs/video.js/pull/1798))

--------------------

Expand Down
1 change: 1 addition & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,7 @@ module.exports = function(grunt) {
});
// Replace CDN version ref in js. Use major/minor version.
combined = combined.replace(/GENERATED_CDN_VSN/g, version.majorMinor);
combined = combined.replace(/GENERATED_FULL_VSN/g, version.full);

grunt.file.write('build/files/combined.video.js', combined);

Expand Down
6 changes: 6 additions & 0 deletions src/js/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ var videojs = window['videojs'] = vjs;
vjs.CDN_VERSION = 'GENERATED_CDN_VSN';
vjs.ACCESS_PROTOCOL = ('https:' == document.location.protocol ? 'https://' : 'http://');

/**
* Full player version
* @type {string}
*/
vjs['VERSION'] = 'GENERATED_FULL_VSN';

/**
* Global Player instance options, surfaced from vjs.Player.prototype.options_
* vjs.options = vjs.Player.prototype.options_
Expand Down

0 comments on commit 67c4eed

Please sign in to comment.