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.

Sign up for GitHub

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-10680): back-end bumper: the app should decide what bumper will be displayed when also set user bumper #392

Merged
merged 5 commits into from
Dec 29, 2020
Merged

fix(FEC-10680): back-end bumper: the app should decide what bumper will be displayed when also set user bumper #392

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
889e552
fix(FEC-10680): back-end bumper: the app should to decide what bumper…
yairans Dec 21, 2020
16bbb13
fix flow
yairans Dec 21, 2020
eb6e1a0
Merge branch 'master' into FEC-10680
yairans Dec 23, 2020
c46a8cb
Merge branch 'master' into FEC-10680
OrenMe Dec 27, 2020
5474f4d
Merge branch 'master' into FEC-10680
yairans Dec 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/kaltura-player.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ class KalturaPlayer extends FakeEventTarget {
}
mediaConfig.sources = Utils.Object.mergeDeep(mediaConfig.sources, mediaOptions);
}
mediaConfig.plugins = this._mergeProviderPluginsConfig(mediaConfig.plugins);
this.configure(getDefaultRedirectOptions(this.config, mediaConfig));
this.setMedia(mediaConfig);
},
Expand Down Expand Up @@ -771,6 +772,18 @@ class KalturaPlayer extends FakeEventTarget {
this._localPlayer.detachMediaSource();
}

_mergeProviderPluginsConfig(providerPluginsConfig: KPPluginsConfigObject): KPPluginsConfigObject {
const mergePluginConfig: KPPluginsConfigObject = {};
Object.entries(providerPluginsConfig).forEach(([pluginName, pluginConfig]: [string, Object]) => {
mergePluginConfig[pluginName] = {};
Object.entries(pluginConfig).forEach(([key, providerValue]) => {
const appValue = Utils.Object.getPropertyPath(this.config.plugins[pluginName], key);
mergePluginConfig[pluginName][key] = appValue || providerValue;
});
});
return mergePluginConfig;
}

/**
* Set crossOrigin attribute.
* @param {?string} crossOrigin - 'anonymous', 'use-credentials' or null to remove attribute
Expand Down