Skip to content

Commit

Permalink
@OwenEdwards fixed menu closing on ios, specifically ipad. closes vid…
Browse files Browse the repository at this point in the history
  • Loading branch information
OwenEdwards authored and gkatsev committed Mar 7, 2016
1 parent 2105153 commit f82a3d1
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ CHANGELOG
* @BrandonOCasey updated text track unit tests to use full es6 syntax ([view](https://github.com/videojs/video.js/pull/3148))
* @defli added missing var to sandbox index.html example ([view](https://github.com/videojs/video.js/pull/3155))
* @defli fixed typo and updated Turkish translations ([view](https://github.com/videojs/video.js/pull/3156))
* @OwenEdwards fixed menu closing on ios, specifically ipad ([view](https://github.com/videojs/video.js/pull/3158))

--------------------

Expand Down
2 changes: 1 addition & 1 deletion src/css/components/menu/_menu-popup.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
max-height: 15em;
}

.vjs-menu-button-popup:hover .vjs-menu,
.vjs-workinghover .vjs-menu-button-popup:hover .vjs-menu,
.vjs-menu-button-popup .vjs-menu.vjs-lock-showing {
display: block;
}
5 changes: 5 additions & 0 deletions src/js/player.js
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,11 @@ class Player extends Component {
// this.addClass('vjs-touch-enabled');
// }

// iOS Safari has broken hover handling
if (!browser.IS_IOS) {
this.addClass('vjs-workinghover');
}

// Make player easily findable by ID
Player.players[this.id_] = this;

Expand Down

0 comments on commit f82a3d1

Please sign in to comment.