Merge branch 'stable'

CHANGELOG.md

@@ -14,6 +14,11 @@ CHANGELOG
 
 --------------------
 
+## 5.10.5 (2016-06-07)
+* @gkatsev pinned dependencies to direct versions ([view](https://github.com/videojs/video.js/pull/3338))
+* @gkatsev fixed minified vjs in ie8 when initialized with id string ([view](https://github.com/videojs/video.js/pull/3357))
+* @IJsLauw fixed unhandled exception in deleting poster on ios7 ([view](https://github.com/videojs/video.js/pull/3337))
+
 ## 5.10.4 (2016-05-31)
 * Patch release to fix dist on npm
 

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.10.4",
+  "version": "5.10.5",
   "keywords": [
     "videojs",
     "html5",

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.10.4",
+  "version": "5.10.5",
   "copyright": "Copyright Brightcove, Inc. <https://www.brightcove.com/>",
   "license": "Apache-2.0",
   "keywords": [
@@ -23,16 +23,16 @@
   "main": "./dist/video.js",
   "style": "./dist/video-js.css",
   "dependencies": {
-    "global": "^4.3.0",
+    "global": "4.3.0",
-    "lodash-compat": "^3.9.3",
+    "lodash-compat": "3.10.2",
-    "object.assign": "^4.0.1",
+    "object.assign": "4.0.3",
-    "safe-json-parse": "^4.0.0",
+    "safe-json-parse": "4.0.0",
     "tsml": "1.0.1",
-    "videojs-font": "^2.0.0",
+    "videojs-font": "2.0.0",
     "videojs-ie8": "1.1.2",
     "videojs-swf": "5.0.1",
-    "videojs-vtt.js": "^0.12.1",
+    "videojs-vtt.js": "0.12.1",
-    "xhr": "~2.2.0"
+    "xhr": "2.2.0"
   },
   "devDependencies": {
     "babel": "^5.2.2",

src/js/player.js

@@ -773,7 +773,12 @@ class Player extends Component {
     // In Chrome (15), if you have autoplay + a poster + no controls, the video gets hidden (but audio plays)
     // This fixes both issues. Need to wait for API, so it updates displays correctly
     if (this.src() && this.tag && this.options_.autoplay && this.paused()) {
-      delete this.tag.poster; // Chrome Fix. Fixed in Chrome v16.
+      try {
+        delete this.tag.poster; // Chrome Fix. Fixed in Chrome v16.
+      }
+      catch (e) {
+        log('deleting tag.poster throws in some browsers', e);
+      }
       this.play();
     }
   }

src/js/video.js

@@ -53,7 +53,7 @@ if (typeof HTMLVideoElement === 'undefined') {
  * @mixes videojs
  * @method videojs
  */
-let videojs = function(id, options, ready){
+function videojs(id, options, ready){
   let tag; // Element of ID
 
   // Allow for element or ID to be passed in
@@ -97,7 +97,7 @@ let videojs = function(id, options, ready){
   // Element may have a player attr referring to an already created player instance.
   // If not, set up a new player and return the instance.
   return tag['player'] || Player.players[tag.playerId] || new Player(tag, options, ready);
-};
+}
 
 // Add default styles
 if (window.VIDEOJS_NO_DYNAMIC_STYLE !== true) {