Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ustream live wip #1

Merged
merged 10 commits into from
Apr 4, 2018
Merged

Ustream live wip #1

merged 10 commits into from
Apr 4, 2018

Conversation

jasongornall
Copy link

No description provided.

@@ -93,6 +93,16 @@ const TEST_URLS = [
url: 'https://www.mixcloud.com/mixcloud/meet-the-curators/',
switchTo: 'https://www.mixcloud.com/mixcloud/mixcloud-curates-4-mary-anne-hobbs-in-conversation-with-dan-deacon/',
skip: true
},
{
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can probably remove this

}
},
onEnded: () => done()
if (test.onSeek) {
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guss onSeek isn't seekTo I think it's fine tho

@@ -154,6 +164,7 @@ describe('ReactPlayer', () => {
// Use a count object to ensure everything is called at least once
let count = {}
const bump = key => {
console.log(key)
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove

src/Player.js Outdated
@@ -75,6 +75,7 @@ export default class Player extends Component {
const playedSeconds = this.getCurrentTime() || 0
const loadedSeconds = this.getSecondsLoaded()
const duration = this.getDuration()

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probs should get rid of this so our diffs aren't muddied

src/Player.js Outdated
// Only call onProgress if values have changed
if (progress.played !== this.prevPlayed || progress.loaded !== this.prevLoaded) {

// Special Case for Live Typed so they still OnProgress

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What Even Is proper Capitalization ;)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also typed -> types?

@@ -154,6 +164,7 @@ describe('ReactPlayer', () => {
// Use a count object to ensure everything is called at least once
let count = {}
const bump = key => {
console.log(key)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😿

@@ -7,8 +7,9 @@ import { Wistia } from './Wistia'
import { Twitch } from './Twitch'
import { DailyMotion } from './DailyMotion'
import { Mixcloud } from './Mixcloud'
import { FilePlayer } from './FilePlayer'
import { UstreamLive } from './UstreamLive'

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove empty line


import { FilePlayer } from './FilePlayer'
export default [

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add empty line above

@jasongornall jasongornall merged commit b73ab56 into master Apr 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants