Skip to content

Commit

Permalink
fix: time display fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Dvir Hazut authored and OrenMe committed Jul 30, 2017
1 parent 824dd3a commit 82b6d7d
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 26 deletions.
41 changes: 24 additions & 17 deletions dist/playkit-ui.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/playkit-ui.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/playkit-ui.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/playkit-ui.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/components/time-display/time-display.js
Expand Up @@ -5,7 +5,7 @@ import BaseComponent from '../base';
import { toHHMMSS } from '../../utils/time-format';

const mapStateToProps = state => ({
currentTime: state.seekbar.currentTime,
currentTime: state.engine.currentTime,
duration: state.engine.duration
});

Expand Down
3 changes: 1 addition & 2 deletions src/player-gui.js
Expand Up @@ -4,8 +4,7 @@ import { connect } from 'preact-redux';

const mapStateToProps = state => ({
state: {
shell: state.shell,
fullscreen: state.fullscreen
shell: state.shell
}
});

Expand Down
2 changes: 0 additions & 2 deletions src/ui-manager.js
Expand Up @@ -17,7 +17,6 @@ import PlayerGUI from './player-gui';
// ui presets
import adsUI from './ui-presets/ads';
import playbackUI from './ui-presets/playback';
import fullscreenUI from './ui-presets/fullscreen';

import './styles/style.scss';

Expand All @@ -37,7 +36,6 @@ class UIManager {

buildDefaultUI(): void {
const uis = [
{ template: props => fullscreenUI(props), condition: state => state.fullscreen.fullscreen },
{ template: props => adsUI(props), condition: state => state.shell.isAd },
{ template: props => playbackUI(props), condition: state => !state.shell.isAd }
];
Expand Down

0 comments on commit 82b6d7d

Please sign in to comment.