Skip to content

Commit 7d1842b

Browse files
committed
Merge pull request #13 from mderrick/iefixes
Some small IE fixes
2 parents cd80af9 + abae60c commit 7d1842b

File tree

3 files changed

+33
-7
lines changed

3 files changed

+33
-7
lines changed

src/components/controls/controls.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
.video-controls {
22
height: 34px;
33
background-color: rgba(0,0,0,0.8);
4+
display: -webkit-box;
5+
display: -webkit-flex;
6+
display: -ms-flexbox;
47
display: flex;
58
}
69

@@ -16,7 +19,8 @@
1619
padding: 10px;
1720
height: 100%;
1821
font-size: 14px;
19-
box-sizing: border-box;
22+
-webkit-box-sizing: border-box;
23+
box-sizing: border-box;
2024
}
2125

2226
.video__control--focused,

src/components/controls/seek/seek.css

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
.video-seek {
2-
flex-grow: 1;
2+
-webkit-box-flex: 1;
3+
-webkit-flex-grow: 1;
4+
-ms-flex-positive: 1;
5+
flex-grow: 1;
36
height: 100%;
47
position: relative;
58
padding: 0 10px;

src/components/video/Video.js

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,13 +311,32 @@ var Video = React.createClass({
311311
ref={(el) => {
312312
this.videoEl = el;
313313
}}
314-
onPlay={this._updateStateFromVideo}
314+
// We have throttled `_updateStateFromVideo` so listen to
315+
// every available Media event that React allows and
316+
// infer the Video state in that method from the Video properties.
317+
onAbort={this._updateStateFromVideo}
318+
onCanPlay={this._updateStateFromVideo}
319+
onCanPlayThrough={this._updateStateFromVideo}
320+
onDurationChange={this._updateStateFromVideo}
321+
onEmptied={this._updateStateFromVideo}
322+
onEncrypted={this._updateStateFromVideo}
323+
onEnded={this._updateStateFromVideo}
324+
onError={this._updateStateFromVideo}
325+
onLoadedData={this._updateStateFromVideo}
326+
onLoadedMetadata={this._updateStateFromVideo}
327+
onLoadStart={this._updateStateFromVideo}
315328
onPause={this._updateStateFromVideo}
316-
onVolumeChange={this._updateStateFromVideo}
317-
onTimeUpdate={this._updateStateFromVideo}
329+
onPlay={this._updateStateFromVideo}
330+
onPlaying={this._updateStateFromVideo}
318331
onProgress={this._updateStateFromVideo}
319-
onCanPlay={this._updateStateFromVideo}
320-
onCanPlayThrough={this._updateStateFromVideo}>
332+
onRateChange={this._updateStateFromVideo}
333+
onSeeked={this._updateStateFromVideo}
334+
onSeeking={this._updateStateFromVideo}
335+
onStalled={this._updateStateFromVideo}
336+
onSuspend={this._updateStateFromVideo}
337+
onTimeUpdate={this._updateStateFromVideo}
338+
onVolumeChange={this._updateStateFromVideo}
339+
onWaiting={this._updateStateFromVideo}>
321340
{this.renderSources()}
322341
</video>
323342
{controls ? this.renderControls() : ''}

0 commit comments

Comments
 (0)