diff --git a/CHANGELOG.md b/CHANGELOG.md index 83a70bc61..9948faa16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,11 @@ CHANGELOG -------------------- +## 5.8.8 (2016-04-04) +* @vtytar fixed auto-setup failing if taking too long to load ([view](http://github.com/videojs/video.js/pull/3233)) +* @seescode fixed css failing on IE8 due to incorrect ie8 hack ([view](http://github.com/videojs/video.js/pull/3226)) +* @seescode fixed dragging on mute toggle changing the volume ([view](http://github.com/videojs/video.js/pull/3228)) + ## 5.8.7 (2016-03-29) * @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)) diff --git a/component.json b/component.json index bf7288423..5e3d895d7 100644 --- a/component.json +++ b/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.8.7", + "version": "5.8.8", "keywords": [ "videojs", "html5", diff --git a/package.json b/package.json index 0aa153545..066577600 100644 --- a/package.json +++ b/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.8.7", + "version": "5.8.8", "copyright": "Copyright Brightcove, Inc. ", "license": "Apache-2.0", "keywords": [ diff --git a/src/css/components/_control-bar.scss b/src/css/components/_control-bar.scss index be09029cb..8a3a54cb9 100644 --- a/src/css/components/_control-bar.scss +++ b/src/css/components/_control-bar.scss @@ -46,7 +46,7 @@ // fonts to show/hide properly. // - "\9" IE8 hack didn't work for this // Found in XP IE8 from http://modern.ie. Does not show up in "IE8 mode" in IE9 -$ie8screen: "\0screen"; +$ie8screen: "\\0screen"; .vjs-user-inactive.vjs-playing .vjs-control-bar :before { @media #{$ie8screen} { content: ""; } } diff --git a/src/js/control-bar/volume-menu-button.js b/src/js/control-bar/volume-menu-button.js index f0166e2ff..17b585356 100644 --- a/src/js/control-bar/volume-menu-button.js +++ b/src/js/control-bar/volume-menu-button.js @@ -108,6 +108,7 @@ class VolumeMenuButton extends PopupButton { popup.addChild(vb); + this.menuContent = popup; this.volumeBar = vb; this.attachVolumeBarEvents(); @@ -126,7 +127,7 @@ class VolumeMenuButton extends PopupButton { } attachVolumeBarEvents() { - this.on(['mousedown', 'touchdown'], this.handleMouseDown); + this.menuContent.on(['mousedown', 'touchdown'], Fn.bind(this, this.handleMouseDown)); } handleMouseDown(event) { diff --git a/src/js/setup.js b/src/js/setup.js index 5e5b9277e..4659624aa 100644 --- a/src/js/setup.js +++ b/src/js/setup.js @@ -72,7 +72,10 @@ var autoSetup = function(){ // Pause to let the DOM keep processing var autoSetupTimeout = function(wait, vjs){ - videojs = vjs; + if (vjs) { + videojs = vjs; + } + setTimeout(autoSetup, wait); };