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

fix: make mergeOptions behave the same across browsers #4088

Merged
merged 2 commits into from
Feb 16, 2017

Conversation

forbesjo
Copy link
Contributor

Description

Object.keys() will error on IE11 instead of default to an empty array, this will make sure that videojs.mergeOptions() has the same behavior across browsers.

Specific Changes proposed

Made a keys() function that defaults to [] when given an non-object.

Requirements Checklist

  • Feature implemented / Bug fixed
  • If necessary, more likely in a feature request than a bug fix
    • Change has been verified in an actual browser (Chome, Firefox, IE)
    • Unit Tests updated or fixed
    • Docs/guides updated
    • Example created (starter template on JSBin)
  • Reviewed by Two Core Contributors

`Object.keys()` will error on IE11 instead of default to an empty array
@forbesjo forbesjo changed the base branch from master to 5.x February 15, 2017 16:46
@forbesjo forbesjo changed the base branch from 5.x to master February 15, 2017 16:46
Copy link
Member

@misteroneill misteroneill left a comment

Choose a reason for hiding this comment

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

Can we get the same JSDoc as in #4090?

@forbesjo
Copy link
Contributor Author

Will do

@brandonocasey brandonocasey merged commit 0da9324 into videojs:master Feb 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants