Skip to content

Commit

Permalink
feat(FEC-10057): move the plugin manager to kaltura player (#529)
Browse files Browse the repository at this point in the history
import types from kaltura-player

Solves FEC-10057

Related to kaltura/kaltura-player-js#332
  • Loading branch information
yairans committed Aug 5, 2020
1 parent 6378e73 commit 167726a
Show file tree
Hide file tree
Showing 7 changed files with 222 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.*/node_modules
[include]
[libs]
node_modules/@playkit-js/playkit-js/flow-typed/
node_modules/kaltura-player-js/flow-typed/
[options]
esproposal.decorators=ignore
module.name_mapper.extension='scss' -> 'empty/object'
Expand Down
2 changes: 1 addition & 1 deletion flow-typed/types/ui-options.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ declare type UIOptionsObject = {
forceTouchUI?: boolean,
log?: UILogConfigObject,
components?: ComponentsConfig,
uiComponents?: Array<PKUIComponent>,
uiComponents?: Array<KPUIComponent>,
translations?: {[langKey: string]: Object},
locale?: string
};
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
"istanbul": "^0.4.5",
"jsdoc": "^3.5.4",
"jsdoc-babel": "^0.3.0",
"kaltura-player-js": "https://github.com/kaltura/kaltura-player-js.git#FEC-10057",
"karma": "^5.1.0",
"karma-chai": "^0.1.0",
"karma-chrome-launcher": "^3.1.0",
Expand Down
4 changes: 2 additions & 2 deletions src/components/player-area/player-area.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,11 @@ class PlayerArea extends Component {

/**
* render preset component
* @param {UIComponent} uiComponent uiComponent
* @param {KPUIComponent} uiComponent uiComponent
* @returns {*} component
* @private
*/
_renderUIComponent(uiComponent: PKUIComponent): React$Element<any> | null {
_renderUIComponent(uiComponent: KPUIComponent): React$Element<any> | null {
if (!uiComponent.get) {
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion src/ui-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class UIManager {
container: ?HTMLElement;
_translations: {[langKey: string]: Object} = {en: en_translations['en']};
_locale: string = 'en';
_uiComponents: Array<PKUIComponent>;
_uiComponents: Array<KPUIComponent>;

/**
* Creates an instance of UIManager.
Expand Down
10 changes: 5 additions & 5 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ module.exports = {
}
},
externals: {
'@playkit-js/playkit-js': {
commonjs: '@playkit-js/playkit-js',
commonjs2: '@playkit-js/playkit-js',
amd: 'playkit-js',
root: ['playkit', 'core']
'kaltura-player-js': {
commonjs: 'kaltura-player-js',
commonjs2: 'kaltura-player-js',
amd: 'kaltura-player-js',
root: ['KalturaPlayer']
}
}
};

0 comments on commit 167726a

Please sign in to comment.