fix: make mergeOptions behave the same across browsers (5.x) #4090
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`Object.keys()` will error on IE11 instead of default to an empty array
misteroneill
requested changes
Feb 15, 2017
src/js/utils/obj.js
Outdated
| @@ -30,6 +30,10 @@ | |||
| */ | |||
| const toString = Object.prototype.toString; | |||
|
|
|||
| const keys = function(object) { | |||
There was a problem hiding this comment.
Can we get a JSDoc block for this function, with @private?
brandonocasey
requested changes
Feb 15, 2017
src/js/utils/obj.js
Outdated
| /* | ||
| * Gives keys of an object | ||
| * | ||
| * @param {Object} object |
There was a problem hiding this comment.
The doc comments should probably look something like this to follow a similar format for the project. I more descriptive language as well.
/**
* Get the keys of an Object
*
* @param {Object}
* The Object to get the keys from
*
* @return {string[]}
* An array of the keys from the object. Returns an empty array if the
* object passed in was invalid or had no keys.
*
* @private
*/There was a problem hiding this comment.
Thank you, shamelessly copy/pasted
forbesjo
force-pushed
the
fix/mergeoptions-5
branch
from
164abe8 to
9c6418d
Compare
brandonocasey
approved these changes
Feb 15, 2017
misteroneill
approved these changes
Feb 15, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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