v5.4.0 dist

CHANGELOG.md

@@ -2,20 +2,6 @@ CHANGELOG
 =========
 
 ## HEAD (Unreleased)
-_(none)_
-
---------------------
-
-## 5.4.4 (2015-12-09)
-* @gkatsev switched to use custom vtt.js from npm ([view](https://github.com/videojs/video.js/pull/2905))
-
-## 5.4.3 (2015-12-08)
-* @gkatsev updated options customizer and github-release options ([view](https://github.com/videojs/video.js/pull/2903))
-
-## 5.4.2 (2015-12-08)
-* @gkatsev updated grunt-release config ([view](https://github.com/videojs/video.js/pull/2900))
-
-## 5.4.1 (2015-12-08)
 * @misteroneill updated videojs-ie8 to 1.1.1 ([view](https://github.com/videojs/video.js/pull/2869))
 * @gkatsev added Player#tech. Fixes #2617 ([view](https://github.com/videojs/video.js/pull/2883))
 * @nick11703 changed multiline comments in sass with single-line comments ([view](https://github.com/videojs/video.js/pull/2827))
@@ -23,7 +9,8 @@ _(none)_
 * @chemoish emulated HTMLTrackElement to enable track load events ([view](https://github.com/videojs/video.js/pull/2804))
 * @gkatsev added nullcheck for cues in updateForTrack. Fixes #2870 ([view](https://github.com/videojs/video.js/pull/2896))
 * @gkatsev added ability to release next tag from master ([view](https://github.com/videojs/video.js/pull/2894))
-* @gkatsev added chg- and github- release for next releases ([view](https://github.com/videojs/video.js/pull/2899))
+
+--------------------
 
 ## 5.3.0 (2015-11-25)
 * @forbesjo updated formatTime to not go negative ([view](https://github.com/videojs/video.js/pull/2821))

build/grunt.js

@@ -1,4 +1,3 @@
-import {gruntCustomizer, gruntOptionsMaker} from './options-customizer.js';
 module.exports = function(grunt) {
   require('time-grunt')(grunt);
 
@@ -42,19 +41,6 @@ module.exports = function(grunt) {
     ]
   };
 
-  const githubReleaseDefaults = {
-    options: {
-      release: {
-        tag_name: 'v'+ version.full,
-        name: version.full,
-        body: require('chg').find(version.full).changesRaw
-      },
-    },
-    files: {
-      src: [`dist/video-js-${version.full}.zip`] // Files that you want to attach to Release
-    }
-  };
-
   /**
    * Customizes _.merge behavior in `browserifyGruntOptions` to concatenate
    * arrays. This can be overridden on a per-call basis to
@@ -66,7 +52,11 @@ module.exports = function(grunt) {
    * @param  {Mixed} sourceValue
    * @return {Object}
    */
-  const browserifyGruntCustomizer = gruntCustomizer;
+  function browserifyGruntCustomizer(objectValue, sourceValue) {
+    if (Array.isArray(objectValue)) {
+      return objectValue.concat(sourceValue);
+    }
+  }
 
   /**
    * Creates a unique object of Browserify Grunt task options.
@@ -80,10 +70,9 @@ module.exports = function(grunt) {
    *
    * @return {Object}
    */
-  const browserifyGruntOptions = gruntOptionsMaker(browserifyGruntDefaults, browserifyGruntCustomizer);
-
-  const githubReleaseCustomizer = gruntCustomizer;
-  const githubReleaseOptions = gruntOptionsMaker(githubReleaseDefaults, githubReleaseCustomizer);
+  function browserifyGruntOptions(options = null, customizer = browserifyGruntCustomizer) {
+    return _.merge({}, browserifyGruntDefaults, options, customizer);
+  }
 
   /**
    * Creates processor functions for license banners.
@@ -305,16 +294,16 @@ module.exports = function(grunt) {
         auth: {
           user: process.env.VJS_GITHUB_USER,
           password: process.env.VJS_GITHUB_TOKEN
+        },
+        release: {
+          tag_name: 'v'+ version.full,
+          name: version.full,
+          body: require('chg').find(version.full).changesRaw
         }
       },
-      release: githubReleaseOptions(),
-      prerelease: githubReleaseOptions({
-        options: {
-          release: {
-            prerelease: true
-          }
-        }
-      })
+      files: {
+        src: [`dist/video-js-${version.full}.zip`] // Files that you want to attach to Release
+      }
     },
     browserify: {
       options: browserifyGruntOptions(),
@@ -327,7 +316,7 @@ module.exports = function(grunt) {
         options: browserifyGruntOptions({
           transform: [
             ['browserify-versionify', {
-              placeholder: '../node_modules/videojs-vtt.js/dist/vtt.js',
+              placeholder: '../node_modules/vtt.js/dist/vtt.js',
               version: 'https://cdn.rawgit.com/gkatsev/vtt.js/vjs-v0.12.1/dist/vtt.min.js'
             }],
           ]

build/options-customizer.js

@@ -1,49 +0,0 @@
-import _ from 'lodash-compat';
-/**
- * Customizes _.merge behavior in `gruntOptions` to concatenate
- * arrays. This can be overridden on a per-call basis to
- *
- * @see https://lodash.com/docs#merge
- * @function GruntCustomizer
- * @private
- * @param  {Mixed} objectValue
- * @param  {Mixed} sourceValue
- * @return {Object}
- */
-function gruntCustomizer(objectValue, sourceValue) {
-  if (Array.isArray(objectValue)) {
-    return objectValue.concat(sourceValue);
-  }
-}
-
-/**
- * Creates a gruntOptions instance for the specific defaultOptions and gruntCustomizer
- *
- * @function browserifyGruntOptions
- * @private
- * @param  {Object} [options]
- * @param  {Function} [customizer=gruntCustomizer]
- *         If the default array-concatenation behavior is not desireable,
- *         pass _.noop or a unique customizer (https://lodash.com/docs#merge).
- *
- * @return {Function}
- */
-function gruntOptionsMaker(defaultOptions, gruntCustomizer) {
-  /**
-   * Creates a unique object of Browserify Grunt task options.
-   *
-   * @function gruntOptions
-   * @private
-   * @param  {Object} [options]
-   * @param  {Function} [customizer=browserifyGruntCustomizer]
-   *         If the default array-concatenation behavior is not desireable,
-   *         pass _.noop or a unique customizer (https://lodash.com/docs#merge).
-   *
-   * @return {Object}
-   */
-  return function gruntOptions(options = null, customizer = gruntCustomizer) {
-    return _.merge({}, defaultOptions, options, customizer);
-  }
-};
-
-export { gruntCustomizer, gruntOptionsMaker };

component.json

@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "5.4.4",
+  "version": "5.4.0",
   "keywords": [
     "videojs",
     "html5",

contrib.json

@@ -280,7 +280,6 @@
         [ "git checkout -b temp-release-branch master","Create a temporary branch for the dist" ],
         [ "grunt version:{{release_type}}",            "Bump package versions" ],
         [ "./build/bin/version",                       "Return the current VJS Version from the package.json file", "version" ],
-        [ "grunt chg-release:{{version}}",             "Update the changelog with the new release" ],
         [ "git commit -am 'v{{version}}'",             "Add and commit the package changes" ],
         [ "git checkout master",                       "Checkout the developmet branch" ],
         [ "git merge temp-release-branch",             "Merge package changes into the dev brach" ],
@@ -291,7 +290,6 @@
         [ "git commit -m 'v{{version}} dist'",         "Commit the dist changes" ],
         [ "git tag -a v{{version}} -m 'v{{version}}'", "Tag the release" ],
         [ "git push upstream --tags",                  "Push the new tag to the repo" ],
-        [ "grunt github-release:prerelease",           "Create a new pre-release on Github" ],
         [ "npm publish --tag next",                    "Publish to npm as 'next'" ],
         [ "git checkout master",                       "Checkout the developmet branch" ],
         [ "git branch -D temp-release-branch",         "Delete the temp release branch" ]
@@ -316,7 +314,7 @@
         [ "git tag -a v{{version}} -m 'v{{version}}'", "Tag the release" ],
         [ "git push upstream --tags",                  "Push the new tag to the repo" ],
         [ "npm publish",                               "Publish to npm" ],
-        [ "grunt github-release:release",              "Create a new release on Github" ],
+        [ "grunt github-release",                      "Create a new release on Github" ],
         [ "git checkout stable",                       "Checkout the developmet branch" ],
         [ "git branch -D temp-release-branch",         "Delete the temp release branch" ]
       ]

dist/alt/video.novtt.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Video.js 5.4.4 <http://videojs.com/>
+ * Video.js 5.4.0 <http://videojs.com/>
  * Copyright Brightcove, Inc. <https://www.brightcove.com/>
  * Available under Apache License Version 2.0
  * <https://github.com/videojs/video.js/blob/master/LICENSE>
@@ -19071,7 +19071,7 @@ setup.autoSetupTimeout(1, videojs);
  *
  * @type {String}
  */
-videojs.VERSION = '5.4.4';
+videojs.VERSION = '5.4.0';
 
 /**
  * The global options object. These are the settings that take effect

dist/video.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Video.js 5.4.4 <http://videojs.com/>
+ * Video.js 5.4.0 <http://videojs.com/>
  * Copyright Brightcove, Inc. <https://www.brightcove.com/>
  * Available under Apache License Version 2.0
  * <https://github.com/videojs/video.js/blob/master/LICENSE>
@@ -19075,7 +19075,7 @@ setup.autoSetupTimeout(1, videojs);
  *
  * @type {String}
  */
-videojs.VERSION = '5.4.4';
+videojs.VERSION = '5.4.0';
 
 /**
  * The global options object. These are the settings that take effect

package.json

@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "5.4.4",
+  "version": "5.4.0",
   "copyright": "Copyright Brightcove, Inc. <https://www.brightcove.com/>",
   "license": "Apache-2.0",
   "keywords": [
@@ -31,7 +31,7 @@
     "videojs-font": "1.4.0",
     "videojs-ie8": "1.1.1",
     "videojs-swf": "5.0.1",
-    "videojs-vtt.js": "^0.12.1",
+    "vtt.js": "git+https://github.com/gkatsev/vtt.js.git#vjs-v0.12.1",
     "xhr": "~2.2.0"
   },
   "devDependencies": {

src/js/tech/tech.js

@@ -326,7 +326,7 @@ class Tech extends Component {
 
     if (!window['WebVTT'] && this.el().parentNode != null) {
       let script = document.createElement('script');
-      script.src = this.options_['vtt.js'] || '../node_modules/videojs-vtt.js/dist/vtt.js';
+      script.src = this.options_['vtt.js'] || '../node_modules/vtt.js/dist/vtt.js';
       this.el().parentNode.appendChild(script);
       window['WebVTT'] = true;
     }