Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: videojs/video.js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v5.15.1
Choose a base ref
...
head repository: videojs/video.js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v5.16.0
Choose a head ref
  • 17 commits
  • 165 files changed
  • 7 contributors

Commits on Jan 3, 2017

  1. Copy the full SHA
    9c74116 View commit details
  2. Copy the full SHA
    e5a240a View commit details
  3. Copy the full SHA
    83d453b View commit details
  4. chore: better dev experience (#3896)

    npm start now runs `grunt dev` which in turn runs the connect server,
    sets up babel watching, browserify watching (for both src and test
    files), and css and alternate builds watching.
    
    Additionally, it will copy over the dev build files into the dist folder
    so that if you're linking videojs and you have a project that gets
    video.js from the dist, you can link and develop with more easy without
    rerunning all of `grunt dist` each time.
    
    Additionally, this specifically does not run more time consumming
    operations like minification.
    gkatsev authored Jan 3, 2017
    Copy the full SHA
    9ec5587 View commit details
  5. Copy the full SHA
    b547214 View commit details

Commits on Jan 4, 2017

  1. Copy the full SHA
    c239bd5 View commit details
  2. Copy the full SHA
    d120ea2 View commit details

Commits on Jan 5, 2017

  1. docs(troubleshooting): updates to troubleshooting doc (#3912)

    * Fixed (and simplified) the codecs header.
    * Elaborated slightly on codecs and flash in v6
    * Changed case of 'Video.js' throughout and some other capilatisation to be consistent with the doc
    mister-ben authored and gkatsev committed Jan 5, 2017
    Copy the full SHA
    0ce7cd4 View commit details

Commits on Jan 6, 2017

  1. chore(development): fix npm start file watching (#3922)

    A invalid argument (`--w`) was being passed to the babel cli in the grunt task `shell:babel`. This argument has been changed to `--watch` to get the babel cli to watch files for changes as intended.
    brandonocasey authored Jan 6, 2017
    Copy the full SHA
    02da697 View commit details

Commits on Jan 11, 2017

  1. Copy the full SHA
    f35de1c View commit details
  2. refactor: require videojs-vtt.js via require rather than concat (#3919

    )
    
    Using aliasify and require, we can generate the dist/video.js and dist/alt/video.novtt.js files each with and without vttjs while having the require-able version of video.js available to require vttjs and have it work with bundlers like browserify and webpack.
    brandonocasey authored and gkatsev committed Jan 11, 2017
    Copy the full SHA
    d290db1 View commit details
  3. fix: player el ingest when parent doesn't have hasAttribute method (#…

    …3929)
    
    For elements which parent doesn't have `hasAttribute` it needs do another check to prevent erroring out. One case of this is when video.js is created inside a documentFragment, the parent node won't have a `hasAttribute` method.
    stramel authored and gkatsev committed Jan 11, 2017
    Copy the full SHA
    bbe8253 View commit details
  4. fix: Pause player before seeking in seek bar mousedown (#3921)

    Previously, seek bar's mousedown handler would first seek the video,
    then pause it. This can trigger a bug in Chrome 55 where seeking
    backwards and then immediately pausing can break the video player.
    
    Instead, call the super handler last so that we pause the video before
    we start seeking.
    
    Fixes #3839. This reverts commit e92db4f (#3886)
    MattiasBuelens authored and gkatsev committed Jan 11, 2017
    Copy the full SHA
    2ceed0a View commit details
  5. fix: give techs a name (#3934)

    This helps with debugging to know what a component's name is.
    We try to look up the tech's name via the constructor's name property,
    otherwise, we set it to 'Unknown Tech'. Can be overridden by setting
    `this.name_` after calling `super()` in the constructor.
    
    Fixes #1786.
    gkatsev authored Jan 11, 2017
    Copy the full SHA
    94fd5c1 View commit details
  6. fix: showing custom poster with controls disabled (#3933)

    We previously hid the poster image when controls were disabled because
    the poster image had a click handler on it. However, this meant that in
    the case of Flash, which doesn't have a native poster image ability, we
    lost the poster.
    
    Fixes #1625.
    gkatsev authored Jan 11, 2017
    Copy the full SHA
    305e5ea View commit details

Commits on Jan 12, 2017

  1. v5.16.0

    gkatsev committed Jan 12, 2017
    Copy the full SHA
    bb9b710 View commit details
  2. v5.16.0 dist

    gkatsev committed Jan 12, 2017
    Copy the full SHA
    aa0fe37 View commit details
Showing with 84,276 additions and 99 deletions.
  1. +33 −0 CHANGELOG.md
  2. +1 −1 COLLABORATOR_GUIDE.md
  3. +19 −0 build/docs-only.js
  4. +71 −56 build/grunt.js
  5. +1 −1 component.json
  6. +2 −2 contrib.json
  7. +1,295 −0 dist/alt/video-js-cdn.css
  8. +1 −0 dist/alt/video-js-cdn.min.css
  9. +24,732 −0 dist/alt/video.novtt.js
  10. +15 −0 dist/alt/video.novtt.min.js
  11. +330 −0 dist/examples/elephantsdream/captions.ar.vtt
  12. +334 −0 dist/examples/elephantsdream/captions.en.vtt
  13. +326 −0 dist/examples/elephantsdream/captions.ja.vtt
  14. +356 −0 dist/examples/elephantsdream/captions.ru.vtt
  15. +349 −0 dist/examples/elephantsdream/captions.sv.vtt
  16. +44 −0 dist/examples/elephantsdream/chapters.en.vtt
  17. +280 −0 dist/examples/elephantsdream/descriptions.en.vtt
  18. +46 −0 dist/examples/elephantsdream/index.html
  19. +41 −0 dist/examples/shared/example-captions.vtt
  20. +27 −0 dist/examples/simple-embed/index.html
  21. BIN dist/font/VideoJS.eot
  22. +102 −0 dist/font/VideoJS.svg
  23. BIN dist/font/VideoJS.ttf
  24. BIN dist/font/VideoJS.woff
  25. +2,600 −0 dist/ie8/videojs-ie8.js
  26. +1 −0 dist/ie8/videojs-ie8.min.js
  27. +34 −0 dist/lang/ar.js
  28. +26 −0 dist/lang/ba.js
  29. +26 −0 dist/lang/bg.js
  30. +26 −0 dist/lang/ca.js
  31. +26 −0 dist/lang/cs.js
  32. +26 −0 dist/lang/da.js
  33. +40 −0 dist/lang/de.js
  34. +40 −0 dist/lang/el.js
  35. +40 −0 dist/lang/en.js
  36. +26 −0 dist/lang/es.js
  37. +26 −0 dist/lang/fa.js
  38. +26 −0 dist/lang/fi.js
  39. +40 −0 dist/lang/fr.js
  40. +26 −0 dist/lang/hr.js
  41. +26 −0 dist/lang/hu.js
  42. +26 −0 dist/lang/it.js
  43. +26 −0 dist/lang/ja.js
  44. +26 −0 dist/lang/ko.js
  45. +26 −0 dist/lang/nb.js
  46. +37 −0 dist/lang/nl.js
  47. +26 −0 dist/lang/nn.js
  48. +34 −0 dist/lang/pl.js
  49. +26 −0 dist/lang/pt-BR.js
  50. +40 −0 dist/lang/ru.js
  51. +26 −0 dist/lang/sr.js
  52. +26 −0 dist/lang/sv.js
  53. +34 −0 dist/lang/tr.js
  54. +40 −0 dist/lang/uk.js
  55. +26 −0 dist/lang/vi.js
  56. +27 −0 dist/lang/zh-CN.js
  57. +40 −0 dist/lang/zh-TW.js
  58. BIN dist/video-js-5.16.0.zip
  59. +1,307 −0 dist/video-js.css
  60. +1 −0 dist/video-js.min.css
  61. BIN dist/video-js.swf
  62. +26,804 −0 dist/video.js
  63. +20 −0 dist/video.min.js
  64. +45 −0 docs/faq.md
  65. +13 −13 docs/troubleshooting.md
  66. +80 −0 es5/big-play-button.js
  67. +176 −0 es5/button.js
  68. +316 −0 es5/clickable-component.js
  69. +97 −0 es5/close-button.js
  70. +1,816 −0 es5/component.js
  71. +116 −0 es5/control-bar/audio-track-controls/audio-track-button.js
  72. +121 −0 es5/control-bar/audio-track-controls/audio-track-menu-item.js
  73. +105 −0 es5/control-bar/control-bar.js
  74. +116 −0 es5/control-bar/fullscreen-toggle.js
  75. +102 −0 es5/control-bar/live-display.js
  76. +154 −0 es5/control-bar/mute-toggle.js
  77. +132 −0 es5/control-bar/play-toggle.js
  78. +235 −0 es5/control-bar/playback-rate-menu/playback-rate-menu-button.js
  79. +106 −0 es5/control-bar/playback-rate-menu/playback-rate-menu-item.js
  80. +122 −0 es5/control-bar/progress-control/load-progress-bar.js
  81. +194 −0 es5/control-bar/progress-control/mouse-time-display.js
  82. +101 −0 es5/control-bar/progress-control/play-progress-bar.js
  83. +67 −0 es5/control-bar/progress-control/progress-control.js
  84. +260 −0 es5/control-bar/progress-control/seek-bar.js
  85. +99 −0 es5/control-bar/progress-control/tooltip-progress-bar.js
  86. +71 −0 es5/control-bar/spacer-controls/custom-control-spacer.js
  87. +64 −0 es5/control-bar/spacer-controls/spacer.js
  88. +85 −0 es5/control-bar/text-track-controls/caption-settings-menu-item.js
  89. +138 −0 es5/control-bar/text-track-controls/captions-button.js
  90. +240 −0 es5/control-bar/text-track-controls/chapters-button.js
  91. +108 −0 es5/control-bar/text-track-controls/chapters-track-menu-item.js
  92. +138 −0 es5/control-bar/text-track-controls/descriptions-button.js
  93. +91 −0 es5/control-bar/text-track-controls/off-text-track-menu-item.js
  94. +87 −0 es5/control-bar/text-track-controls/subtitles-button.js
  95. +102 −0 es5/control-bar/text-track-controls/text-track-button.js
  96. +170 −0 es5/control-bar/text-track-controls/text-track-menu-item.js
  97. +108 −0 es5/control-bar/time-controls/current-time-display.js
  98. +118 −0 es5/control-bar/time-controls/duration-display.js
  99. +114 −0 es5/control-bar/time-controls/remaining-time-display.js
  100. +52 −0 es5/control-bar/time-controls/time-divider.js
  101. +78 −0 es5/control-bar/track-button.js
  102. +181 −0 es5/control-bar/volume-control/volume-bar.js
  103. +91 −0 es5/control-bar/volume-control/volume-control.js
  104. +51 −0 es5/control-bar/volume-control/volume-level.js
  105. +243 −0 es5/control-bar/volume-menu-button.js
  106. +100 −0 es5/error-display.js
  107. +169 −0 es5/event-target.js
  108. +100 −0 es5/extend.js
  109. +55 −0 es5/fullscreen-api.js
  110. +51 −0 es5/loading-spinner.js
  111. +211 −0 es5/media-error.js
  112. +340 −0 es5/menu/menu-button.js
  113. +135 −0 es5/menu/menu-item.js
  114. +202 −0 es5/menu/menu.js
  115. +492 −0 es5/modal-dialog.js
  116. +3,637 −0 es5/player.js
  117. +26 −0 es5/plugins.js
  118. +122 −0 es5/popup/popup-button.js
  119. +98 −0 es5/popup/popup.js
  120. +181 −0 es5/poster-image.js
  121. +144 −0 es5/setup.js
  122. +353 −0 es5/slider/slider.js
  123. +202 −0 es5/tech/flash-rtmp.js
  124. +1,157 −0 es5/tech/flash.js
  125. +1,769 −0 es5/tech/html5.js
  126. +88 −0 es5/tech/loader.js
  127. +1,369 −0 es5/tech/tech.js
  128. +181 −0 es5/tracks/audio-track-list.js
  129. +129 −0 es5/tracks/audio-track.js
  130. +148 −0 es5/tracks/html-track-element-list.js
  131. +169 −0 es5/tracks/html-track-element.js
  132. +152 −0 es5/tracks/text-track-cue-list.js
  133. +350 −0 es5/tracks/text-track-display.js
  134. +102 −0 es5/tracks/text-track-list-converter.js
  135. +104 −0 es5/tracks/text-track-list.js
  136. +601 −0 es5/tracks/text-track-settings.js
  137. +432 −0 es5/tracks/text-track.js
  138. +66 −0 es5/tracks/track-enums.js
  139. +233 −0 es5/tracks/track-list.js
  140. +142 −0 es5/tracks/track.js
  141. +193 −0 es5/tracks/video-track-list.js
  142. +128 −0 es5/tracks/video-track.js
  143. +89 −0 es5/utils/browser.js
  144. +49 −0 es5/utils/buffer.js
  145. +42 −0 es5/utils/computed-style.js
  146. +897 −0 es5/utils/dom.js
  147. +459 −0 es5/utils/events.js
  148. +75 −0 es5/utils/fn.js
  149. +52 −0 es5/utils/format-time.js
  150. +24 −0 es5/utils/guid.js
  151. +140 −0 es5/utils/log.js
  152. +48 −0 es5/utils/merge-options.js
  153. +136 −0 es5/utils/obj.js
  154. +48 −0 es5/utils/stylesheet.js
  155. +145 −0 es5/utils/time-ranges.js
  156. +26 −0 es5/utils/to-title-case.js
  157. +173 −0 es5/utils/url.js
  158. +721 −0 es5/video.js
  159. +7 −4 package.json
  160. +5 −0 src/css/components/_big-play.scss
  161. +0 −6 src/css/components/_poster.scss
  162. +2 −12 src/js/control-bar/progress-control/seek-bar.js
  163. +1 −1 src/js/player.js
  164. +4 −1 src/js/poster-image.js
  165. +21 −2 src/js/tech/tech.js
33 changes: 33 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,36 @@
<a name="5.16.0"></a>
# [5.16.0](https://github.com/videojs/video.js/compare/v5.15.1...v5.16.0) (2017-01-12)

### Features

* Show big play button on pause if specified ([#3892](https://github.com/videojs/video.js/issues/3892)) ([b547214](https://github.com/videojs/video.js/commit/b547214))

### Bug Fixes

* give techs a name ([#3934](https://github.com/videojs/video.js/issues/3934)) ([94fd5c1](https://github.com/videojs/video.js/commit/94fd5c1)), closes [#1786](https://github.com/videojs/video.js/issues/1786)
* Pause player before seeking in seek bar mousedown ([#3921](https://github.com/videojs/video.js/issues/3921)) ([2ceed0a](https://github.com/videojs/video.js/commit/2ceed0a)), closes [#3839](https://github.com/videojs/video.js/issues/3839) [#3886](https://github.com/videojs/video.js/issues/3886)
* player el ingest when parent doesn't have `hasAttribute` method ([#3929](https://github.com/videojs/video.js/issues/3929)) ([bbe8253](https://github.com/videojs/video.js/commit/bbe8253))
* showing custom poster with controls disabled ([#3933](https://github.com/videojs/video.js/issues/3933)) ([305e5ea](https://github.com/videojs/video.js/commit/305e5ea)), closes [#1625](https://github.com/videojs/video.js/issues/1625)

### Chores

* better dev experience ([#3896](https://github.com/videojs/video.js/issues/3896)) ([9ec5587](https://github.com/videojs/video.js/commit/9ec5587))
* don't run tests on travis if only docs were changed ([#3908](https://github.com/videojs/video.js/issues/3908)) ([c239bd5](https://github.com/videojs/video.js/commit/c239bd5))
* **development:** fix `npm start` file watching ([#3922](https://github.com/videojs/video.js/issues/3922)) ([02da697](https://github.com/videojs/video.js/commit/02da697))
* **release:** add es5 folder to the tagged commit ([#3913](https://github.com/videojs/video.js/issues/3913)) ([d120ea2](https://github.com/videojs/video.js/commit/d120ea2))
* **sass:** upgrade to latest version of grunt-sass ([#3897](https://github.com/videojs/video.js/issues/3897)) ([83d453b](https://github.com/videojs/video.js/commit/83d453b)), closes [#3692](https://github.com/videojs/video.js/issues/3692)
* fix typo in collaborator guide ([#3931](https://github.com/videojs/video.js/issues/3931)) ([f35de1c](https://github.com/videojs/video.js/commit/f35de1c))

### Code Refactoring

* require `videojs-vtt.js` via require rather than concat ([#3919](https://github.com/videojs/video.js/issues/3919)) ([d290db1](https://github.com/videojs/video.js/commit/d290db1))

### Documentation

* **faq:** add a question about autoplay ([#3898](https://github.com/videojs/video.js/issues/3898)) ([e5a240a](https://github.com/videojs/video.js/commit/e5a240a))
* **faq:** add FAQ question about RTMP url ([#3899](https://github.com/videojs/video.js/issues/3899)) ([9c74116](https://github.com/videojs/video.js/commit/9c74116))
* **troubleshooting:** updates to troubleshooting doc ([#3912](https://github.com/videojs/video.js/issues/3912)) ([0ce7cd4](https://github.com/videojs/video.js/commit/0ce7cd4))

<a name="5.15.1"></a>
## [5.15.1](https://github.com/videojs/video.js/compare/v5.15.0...v5.15.1) (2016-12-23)

2 changes: 1 addition & 1 deletion COLLABORATOR_GUIDE.md
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@

## Issues and Pull Requests

Full courtesey should always be shown in video.js projects.
Full courtesy should always be shown in video.js projects.

Collaborators may manage issues they feel qualified to handle, being mindful of our guidelines.

19 changes: 19 additions & 0 deletions build/docs-only.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import sh from 'shelljs';
import path from 'path';


export default function(commit, commitRange) {
const SINGLE_COMMIT = `git diff-tree --no-commit-id --name-only -r ${commit}`;
const COMMIT_RANGE = `git diff --name-only ${commitRange}`;

let command = SINGLE_COMMIT;

if (commitRange) {
command = COMMIT_RANGE
}

const output = sh.exec(command, {async: false, silent: true}).stdout;

const files = output.split('\n').filter(Boolean);
return files.every((file) => file.startsWith('docs') || path.extname(file) === '.md');
};
127 changes: 71 additions & 56 deletions build/grunt.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {gruntCustomizer, gruntOptionsMaker} from './options-customizer.js';
import chg from 'chg';
import npmRun from 'npm-run';
import isDocsOnly from './docs-only.js';

module.exports = function(grunt) {
require('time-grunt')(grunt);
@@ -127,9 +128,14 @@ module.exports = function(grunt) {
},
dist: {},
watch: {
novtt: {
files: ['build/temp/video.js'],
tasks: ['concat:novtt']
dist: {
files: [
'build/temp/video.js',
'build/temp/alt/video.novtt.js',
'build/temp/video-js.css',
'build/temp/alt/video-js-cdn.css'
],
tasks: ['copy:dist']
},
minify: {
files: ['build/temp/video.js'],
@@ -139,14 +145,6 @@ module.exports = function(grunt) {
files: ['src/css/**/*'],
tasks: ['skin']
},
babel: {
files: ['src/js/**/*.js'],
tasks: ['babel:es5']
},
jshint: {
files: ['src/**/*', 'test/unit/**/*.js', 'Gruntfile.js'],
tasks: 'jshint'
}
},
connect: {
dev: {
@@ -320,32 +318,39 @@ module.exports = function(grunt) {
}
},
browserify: {
options: browserifyGruntOptions(),
build: {
options: browserifyGruntOptions(),
files: {
'build/temp/video.js': ['es5/video.js']
}
},
dist: {
buildnovtt: {
options: browserifyGruntOptions({transform: [
['aliasify', {aliases: {'videojs-vtt.js': false}}]
]}),
files: {
'build/temp/alt/video.novtt.js': ['es5/video.js']
}
},
watch: {
options: browserifyGruntOptions({
transform: [
['browserify-versionify', {
placeholder: '../node_modules/videojs-vtt.js/dist/vtt.js',
version: 'https://cdn.rawgit.com/gkatsev/vtt.js/vjs-v0.12.1/dist/vtt.min.js'
}],
]
watch: true,
keepAlive: true,
}),
files: {
'build/temp/video.js': ['es5/video.js']
}
},
watch: {
options: {
watchnovtt: {
options: browserifyGruntOptions({
transform: [
['aliasify', {aliases: {'videojs-vtt.js': false}}]
],
watch: true,
keepAlive: true
},
keepAlive: true,
}),
files: {
'build/temp/video.js': ['es5/video.js']
'build/temp/alt/video.novtt.js': ['es5/video.js']
}
},
tests: {
@@ -384,14 +389,6 @@ module.exports = function(grunt) {
options: {
separator: '\n'
},
novtt: {
src: ['build/temp/video.js'],
dest: 'build/temp/alt/video.novtt.js'
},
vtt: {
src: ['build/temp/video.js', 'node_modules/videojs-vtt.js/dist/vtt.js'],
dest: 'build/temp/video.js'
},
ie8_addition: {
src: ['build/temp/video-js.css', 'src/css/ie8.css'],
dest: 'build/temp/video-js.css'
@@ -402,14 +399,23 @@ module.exports = function(grunt) {
logConcurrentOutput: true
},
tests: [
'watch:babel',
'shell:babel',
'browserify:tests'
],
dev: [
'shell:babel',
'browserify:watch',
'browserify:watchnovtt',
'browserify:tests',
'watch:skin',
'watch:dist'
],
// Run multiple watch tasks in parallel
// Needed so watchify can cache intelligently
watchAll: [
'watch',
'browserify:watch',
'browserify:watchnovtt',
'browserify:tests',
'karma:watch'
],
@@ -437,6 +443,12 @@ module.exports = function(grunt) {
}
},
shell: {
babel: {
command: 'npm run babel -- --watch',
options: {
preferLocal: true
}
},
lint: {
command: 'npm run lint',
options: {
@@ -486,17 +498,15 @@ module.exports = function(grunt) {
require('load-grunt-tasks')(grunt);
grunt.loadNpmTasks('videojs-doc-generator');
grunt.loadNpmTasks('chg');
grunt.loadNpmTasks('gkatsev-grunt-sass');
grunt.loadNpmTasks('grunt-accessibility');

const buildDependents = [
grunt.registerTask('build', [
'shell:lint',
'clean:build',

'babel:es5',
'browserify:build',
'concat:novtt',
'concat:vtt',
'browserify:buildnovtt',
'usebanner:novtt',
'usebanner:vtt',
'uglify',
@@ -509,18 +519,11 @@ module.exports = function(grunt) {
'copy:swf',
'copy:ie8',
'vjslanguages'
];

grunt.registerTask('build', buildDependents);

grunt.registerTask(
'build:dist',
buildDependents.map(task => task === 'browserify:build' ? 'browserify:dist' : task)
);
]);

grunt.registerTask('dist', [
'clean:dist',
'build:dist',
'build',
'copy:dist',
'copy:examples',
'zip:dist'
@@ -532,19 +535,31 @@ module.exports = function(grunt) {
grunt.registerTask('default', ['test']);

// The test script includes coveralls only when the TRAVIS env var is set.
grunt.registerTask('test', [
'build',
'shell:noderequire',
'shell:browserify',
'shell:webpack',
'karma:defaults',
'test-a11y'].concat(process.env.TRAVIS && 'coveralls').filter(Boolean));
grunt.registerTask('test', function() {
const tasks = [
'build',
'shell:noderequire',
'shell:browserify',
'shell:webpack',
'karma:defaults',
'test-a11y'
];

// Run while developing
grunt.registerTask('dev', ['build', 'connect:dev', 'concurrent:watchSandbox']);
if (process.env.TRAVIS) {
if (isDocsOnly(process.env.TRAVIS_COMMIT, process.env.TRAVIS_COMMIT_RANGE)) {
grunt.log.write('Not running any tests because only docs were changed');
return;
}

grunt.registerTask('watchAll', ['build', 'connect:dev', 'concurrent:watchAll']);
tasks.concat(process.env.TRAVIS && 'coveralls').filter(Boolean);
}

grunt.task.run(tasks);
});

// Run while developing
grunt.registerTask('dev', ['connect:dev', 'concurrent:dev']);
grunt.registerTask('watchAll', ['build', 'connect:dev', 'concurrent:watchAll']);
grunt.registerTask('test-a11y', ['copy:a11y', 'accessibility']);

// Pick your testing, or run both in different terminals
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "video.js",
"description": "An HTML5 and Flash video player with a common API and skin for both.",
"version": "5.15.1",
"version": "5.16.0",
"keywords": [
"videojs",
"html5",
4 changes: 2 additions & 2 deletions contrib.json
Original file line number Diff line number Diff line change
@@ -287,7 +287,7 @@
[ "git push upstream master", "Push the dev branch changes to the repo" ],
[ "git checkout temp-release-branch", "Checkout the temp branch again" ],
[ "grunt dist", "Build the dist" ],
[ "git add dist --force", "Add the (otherwise ignored) release files" ],
[ "git add es5 dist --force", "Add the (otherwise ignored) release files" ],
[ "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" ],
@@ -311,7 +311,7 @@
[ "git push upstream stable", "Push the release branch changes to the repo" ],
[ "git checkout -b temp-release-branch stable","Create a temporary branch for the dist" ],
[ "grunt dist", "Build the dist" ],
[ "git add dist --force", "Add the (otherwise ignored) release files" ],
[ "git add es5 dist --force", "Add the (otherwise ignored) release files" ],
[ "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" ],
Loading