fix(FEC-8698): when ui is disabled, playNext() called even when playl…

…ist isn't configured (#177) do not call to `addBindings` if playlist isn't configured
kaltura · Nov 19, 2018 · 7a70147 · 7a70147
1 parent 9d9fd60
commit 7a70147
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/samples/ovp/cast.html b/samples/ovp/cast.html
@@ -44,8 +44,7 @@
     },
     plugins: {
       ima: {
-        adTagUrl: 'https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/124319096/external/ad_rule_samples&ciu_szs=300x250&ad_rule=1&impl=s&gdfp_req=1&env=vp&output=vmap&unviewed_position_start=1&cust_params=deployment%3Ddevsite%26sample_ar%3Dpremidpost&cmsid=496&vid=short_onecue&correlator='
-
+        adTagUrl: 'https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/124319096/external/ad_rule_samples&ciu_szs=300x250&ad_rule=1&impl=s&gdfp_req=1&env=vp&output=vmap&unviewed_position_start=1&cust_params=deployment%3Ddevsite%26sample_ar%3Dpremidpost&cmsid=496&vid=short_onecue&correlator=[timestamp]'
       }
     },
     cast: {

diff --git a/src/common/playlist/playlist-manager.js b/src/common/playlist/playlist-manager.js
@@ -23,11 +23,9 @@ class PlaylistManager {
   constructor(player: KalturaPlayer, options: KPOptionsObject) {
     this._player = player;
     this._eventManager = new EventManager();
-    this._playlist = new Playlist();
     this._options = {autoContinue: true};
     this._countdown = {duration: 10, showing: true};
     this._playerOptions = options;
-    this._addBindings();
   }
 
   /**
@@ -45,6 +43,7 @@ class PlaylistManager {
       Utils.Object.mergeDeep(this._countdown, config.countdown);
       if (config.items && config.items.find(item => !!item.sources)) {
         this._player.dispatchEvent(new FakeEvent(PlaylistEventType.PLAYLIST_LOADED, {playlist: this}));
+        this._addBindings();
         this.playNext();
       }
     }
@@ -58,6 +57,7 @@ class PlaylistManager {
    * @private
    */
   reset() {
+    this._eventManager.removeAll();
     this._playlist = new Playlist();
   }
 

diff --git a/src/kaltura-player.js b/src/kaltura-player.js
@@ -85,7 +85,6 @@ class KalturaPlayer extends FakeEventTarget {
   loadPlaylist(playlistInfo: ProviderPlaylistInfoObject, playlistCustomConfig: KPPlaylistConfigObject): Promise<*> {
     this._logger.debug('loadPlaylist', playlistInfo);
     this._uiWrapper.setLoadingSpinnerState(true);
-    this._playlistManager.reset();
     return this._provider
       .getPlaylistConfig(playlistInfo)
       .then(playlistConfig => this._mergePlaylistConfigAndSet(playlistConfig, playlistCustomConfig))
@@ -99,7 +98,6 @@ class KalturaPlayer extends FakeEventTarget {
   loadPlaylistByEntryList(entryList: ProviderEntryListObject, playlistCustomConfig: KPPlaylistConfigObject): Promise<*> {
     this._logger.debug('loadPlaylistByEntryList', entryList);
     this._uiWrapper.setLoadingSpinnerState(true);
-    this._playlistManager.reset();
     return this._provider
       .getEntryListConfig(entryList)
       .then(playlistConfig => this._mergePlaylistConfigAndSet(playlistConfig, playlistCustomConfig))
@@ -116,6 +114,7 @@ class KalturaPlayer extends FakeEventTarget {
     // $FlowFixMe
     evaluatePluginsConfig(config);
     this._localPlayer.configure({plugins: config.plugins});
+    this._playlistManager.reset();
     this._playlistManager.configure(config.playlist);
   }