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(FEC-8396): media source adapters default config overrides the player supplied config #56

Merged
merged 1 commit into from
Jul 12, 2018

Conversation

OrenMe
Copy link
Contributor

@OrenMe OrenMe commented Jul 11, 2018

Description of the Changes

The merge order for the config gave default config precedence over the application supplied config

CheckLists

  • changes have been done against master branch, and PR does not conflict
  • new unit / functional tests have been added (whenever applicable)
  • test are passing in local environment
  • Travis tests are passing (or test results are not worse than on master branch :))
  • Docs have been updated

@OrenMe OrenMe self-assigned this Jul 11, 2018
@@ -213,7 +213,7 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
return new TextDisplayer(videoEl);
}.bind(null, this._videoElement)
};
this._config = Utils.Object.mergeDeep(textDisplayerConfig, this._config, DefaultConfig);
this._config = Utils.Object.mergeDeep(textDisplayerConfig, DefaultConfig, this._config);
}
Copy link
Contributor

Choose a reason for hiding this comment

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

tests fails

@OrenMe OrenMe merged commit a9d41ca into master Jul 12, 2018
@OrenMe OrenMe deleted the fec-8396 branch July 12, 2018 08:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

2 participants