1
0
mirror of https://github.com/videojs/video.js.git synced 2024-11-28 08:58:46 +02:00

Merge branch 'stable'

This commit is contained in:
Gary Katsevman 2016-03-29 16:29:10 -04:00
commit a74b92643d
2 changed files with 2 additions and 1 deletions

View File

@ -12,6 +12,7 @@ CHANGELOG
* fix IE8 tests for VIDEOJS_NO_DYNAMIC_STYLE ([view](https://github.com/videojs/video.js/pull/3215))
* @llun fixed menus from throwing when focused when empty ([view](https://github.com/videojs/video.js/pull/3218))
* @mister-ben added dir=ltr to control bar and loading spinner ([view](https://github.com/videojs/video.js/pull/3221))
* @avreg fixed notSupportedMessage saying video when meaning media ([view](https://github.com/videojs/video.js/pull/3222))
--------------------

View File

@ -2788,7 +2788,7 @@ Player.prototype.options_ = {
languages: {},
// Default message to show when a video cannot be played.
notSupportedMessage: 'No compatible source was found for this video.'
notSupportedMessage: 'No compatible source was found for this media.'
};
/**