Skip to content

Commit 8a64108

Browse files
committed
Cross browser fixes
1 parent 18503f7 commit 8a64108

File tree

6 files changed

+26
-6
lines changed

6 files changed

+26
-6
lines changed

.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"presets": ["es2015", "react"],
3-
"plugins": ["transform-object-rest-spread"]
3+
"plugins": ["transform-runtime", "transform-object-rest-spread"]
44
}

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,10 @@
6666
"babel-jest": "^18.0.0",
6767
"babel-loader": "^6.2.7",
6868
"babel-plugin-transform-object-rest-spread": "^6.19.0",
69+
"babel-plugin-transform-runtime": "^6.23.0",
6970
"babel-preset-es2015": "^6.18.0",
7071
"babel-preset-react": "^6.16.0",
72+
"babel-runtime": "^6.23.0",
7173
"case-sensitive-paths-webpack-plugin": "^1.1.4",
7274
"chalk": "^1.1.3",
7375
"css-loader": "^0.25.0",

src/DefaultPlayer/Captions/Captions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default ({ textTracks, onClick, onItemClick, className }) => {
2121
{ textTracks && [...textTracks].map((track) => (
2222
<li
2323
key={track.language}
24-
className={track.mode === 'showing'
24+
className={track.mode === track.SHOWING || track.mode == 'showing'
2525
? styles.activeTrackItem
2626
: styles.trackItem}
2727
onClick={onItemClick.bind(this, track)}>

src/DefaultPlayer/Overlay/Overlay.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44
right: 0;
55
bottom: 0;
66
left: 0;
7+
height: 100%;
8+
width: 100%;
79
color: #fff;
810
text-align: center;
911
cursor: pointer;
12+
background-color: rgba(0,0,0,0);
1013
}
1114

1215
.inner {

src/video/api.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,20 @@ export const fullscreen = (videoEl) => {
5454

5555
export const showTrack = ({ textTracks }, track) => {
5656
hideTracks({ textTracks });
57-
track.mode = 'showing';
57+
track.mode = track.SHOWING || 'showing';
5858
};
5959

6060
export const hideTracks = ({ textTracks }) => {
6161
for (var i = 0; i < textTracks.length; i++) {
62-
textTracks[i].mode = 'disabled';
62+
textTracks[i].mode = textTracks[i].DISABLED || 'disabled';
6363
}
6464
};
6565

6666
export const toggleTracks = (() => {
6767
let previousTrack;
6868
return ({ textTracks }) => {
69-
let currentTrack = [...textTracks].filter((track) => track.mode === 'showing')[0];
69+
let currentTrack = [...textTracks]
70+
.filter((track) => track.mode === track.SHOWING || track.mode === 'showing')[0];
7071
if (currentTrack) {
7172
hideTracks({ textTracks });
7273
previousTrack = currentTrack;

src/video/api.test.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,16 @@ describe('api', () => {
148148
describe('hideTracks', () => {
149149
it('hides all of the tracks', () => {
150150
expect(textTracksMock[0].mode).toBe('showing');
151-
hideTracks({ textTracks: textTracksMock }, textTracksMock[2]);
151+
hideTracks({ textTracks: textTracksMock });
152152
expect(textTracksMock[0].mode).toBe('disabled');
153153
});
154+
155+
it('uses constants on text tracks if they exist for IE', () => {
156+
textTracksMock[0].DISABLED = 3;
157+
expect(textTracksMock[0].mode).toBe('showing');
158+
hideTracks({ textTracks: textTracksMock });
159+
expect(textTracksMock[0].mode).toBe(3);
160+
});
154161
});
155162

156163
describe('showTrack', () => {
@@ -165,6 +172,13 @@ describe('api', () => {
165172
showTrack({ textTracks: textTracksMock }, textTracksMock[2]);
166173
expect(textTracksMock[2].mode).toBe('showing');
167174
});
175+
176+
it('uses constants on text tracks if they exist for IE', () => {
177+
textTracksMock[2].SHOWING = 2;
178+
expect(textTracksMock[2].mode).toBe('disabled');
179+
showTrack({ textTracks: textTracksMock }, textTracksMock[2]);
180+
expect(textTracksMock[2].mode).toBe(2);
181+
});
168182
});
169183

170184
describe('toggleTracks', () => {

0 commit comments

Comments
 (0)