Skip to content

Commit 875c450

Browse files
skzapskzap
committedFeb 23, 2018
clicks working on safari kinda
1 parent 55725c2 commit 875c450

File tree

6 files changed

+38
-47
lines changed

6 files changed

+38
-47
lines changed
 

‎index.html

+19-21
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
<html>
2+
<head>
3+
<meta name="viewport" content="width=device-width, initial-scale=1">
4+
<link href="videojs.css" rel="stylesheet">
5+
<link href="player.css" rel="stylesheet">
26

3-
<head>
4-
<link href="videojs.css" rel="stylesheet">
5-
<link href="player.css" rel="stylesheet">
6-
7-
<script src="https://cdn.steemjs.com/lib/latest/steem.min.js"></script>
8-
<script src="http://code.jquery.com/jquery-3.3.1.min.js"></script>
9-
<script src="./javascripts/video.js"></script>
10-
<script src="./javascripts/branding.js"></script>
11-
<script src="./javascripts/persistvolume.js"></script>
12-
<script src="./javascripts/resolutionswitcher.js"></script>
13-
<script src="./javascripts/settingsmenubuttons.js"></script>
14-
<script src="./javascripts/settingsmenuitem.js"></script>
15-
<script src="./javascripts/hotkeys.js"></script>
16-
<script src="./javascripts/thumbnails.js"></script>
17-
<script src="./javascripts/player.js"></script>
18-
<script src="./javascripts/statistics.js"></script>
19-
<script src="./javascripts/graph.min.js"></script>
20-
</head>
21-
22-
<body style='margin:0'></body>
23-
7+
<script src="https://cdn.steemjs.com/lib/latest/steem.min.js"></script>
8+
<script src="https://cdnjs.cloudflare.com/ajax/libs/swiftclick/2.1.1/swiftclick.min.js"></script>
9+
<script src="./javascripts/video.js"></script>
10+
<script src="./javascripts/branding.js"></script>
11+
<script src="./javascripts/persistvolume.js"></script>
12+
<script src="./javascripts/resolutionswitcher.js"></script>
13+
<script src="./javascripts/settingsmenubuttons.js"></script>
14+
<script src="./javascripts/settingsmenuitem.js"></script>
15+
<script src="./javascripts/hotkeys.js"></script>
16+
<script src="./javascripts/thumbnails.js"></script>
17+
<script src="./javascripts/player.js"></script>
18+
<script src="./javascripts/statistics.js"></script>
19+
<script src="./javascripts/graph.min.js"></script>
20+
</head>
21+
<body style='margin:0'></body>
2422
</html>

‎javascripts/settingsmenubuttons.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,11 @@ class SettingsMenuButton extends MenuButton {
4444
if (entries) {
4545

4646
const openSubMenu = function() {
47+
console.log('test', this.el_.childNodes[2].childNodes[0])
4748

48-
if (videojs.dom.hasClass(this.el_, 'open')) {
49-
videojs.dom.removeClass(this.el_, 'open');
50-
} else {
51-
videojs.dom.addClass(this.el_, 'open');
52-
}
49+
videojs.dom.removeClass(this.el_.childNodes[2], 'vjs-hidden');
50+
videojs.dom.addClass(this.el_, 'open');
51+
videojs.dom.addClass(this.el_.childNodes[2].childNodes[0], 'vjs-lock-showing');
5352

5453
};
5554

‎javascripts/settingsmenuitem.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,9 @@ class SettingsMenuItem extends MenuItem {
131131
* Hide the sub menu
132132
*/
133133
hideSubMenu() {
134-
if (videojs.dom.hasClass(this.el_, 'open')) {
135-
videojs.dom.addClass(this.settingsSubMenuEl_, 'vjs-hidden');
136-
videojs.dom.removeClass(this.el_, 'open');
137-
}
134+
videojs.dom.addClass(this.el_.childNodes[2], 'vjs-hidden');
135+
videojs.dom.removeClass(this.el_, 'open');
136+
videojs.dom.removeClass(this.el_.childNodes[2].childNodes[0], 'vjs-lock-showing');
138137
}
139138

140139
}

‎javascripts/video.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -20273,9 +20273,11 @@ var Player = function (_Component) {
2027320273
// }
2027420274

2027520275
// iOS Safari has broken hover handling
20276-
if (!IS_IOS) {
20277-
_this.addClass('vjs-workinghover');
20278-
}
20276+
// if (!IS_IOS) {
20277+
//_this.addClass('vjs-workinghover');
20278+
// }
20279+
20280+
var swiftclick = SwiftClick.attach(document.body);
2027920281

2028020282
// Make player easily findable by ID
2028120283
Player.players[_this.id_] = _this;

‎player.css

-7
Original file line numberDiff line numberDiff line change
@@ -616,13 +616,6 @@ a:-webkit-any-link {
616616
max-height: 15em
617617
}
618618

619-
620-
/*
621-
.vjs-workinghover .vjs-menu-button-popup:hover .vjs-menu,
622-
.vjs-menu-button-popup .vjs-menu.vjs-lock-showing {
623-
display: block
624-
} */
625-
626619
.video-js .vjs-menu-button-inline {
627620
-webkit-transition: all 0.0s;
628621
-moz-transition: all 0.0s;

‎videojs.css

+7-7
Original file line numberDiff line numberDiff line change
@@ -650,9 +650,9 @@ body.vjs-full-window {
650650
cursor: default;
651651
}
652652

653-
.vjs-workinghover .vjs-menu-button.vjs-disabled:hover .vjs-menu {
654-
display: none;
655-
}
653+
/* .vjs-workinghover .vjs-menu-button.vjs-disabled:hover .vjs-menu {
654+
display: block;
655+
} */
656656

657657
.vjs-menu .vjs-menu-content {
658658
display: block;
@@ -690,8 +690,8 @@ body.vjs-full-window {
690690
.vjs-menu li.vjs-selected,
691691
.vjs-menu li.vjs-selected:focus,
692692
.vjs-menu li.vjs-selected:hover {
693-
background-color: #fff;
694-
color: #2B333F;
693+
/* background-color: #fff;
694+
color: #2B333F; */
695695
}
696696

697697
.vjs-menu li.vjs-menu-title {
@@ -725,10 +725,10 @@ body.vjs-full-window {
725725
max-height: 15em;
726726
}
727727

728-
.vjs-workinghover .vjs-menu-content:hover .vjs-menu,
728+
/* .vjs-workinghover .vjs-menu-content:hover .vjs-menu,
729729
.vjs-menu-button-popup .vjs-menu.vjs-lock-showing {
730730
display: block;
731-
}
731+
} */
732732

733733
.video-js .vjs-menu-button-inline {
734734
-webkit-transition: all 0.4s;

0 commit comments

Comments
 (0)
Please sign in to comment.