fix(FEC-8382): stereos icon displayed on iPhone, even if VR plugin di…

…sabled (#144) check vr plugin exists and not disable before handling it
kaltura · Jul 5, 2018 · 116cc9f · 116cc9f
1 parent dbdad49
commit 116cc9f
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/common/ui-wrapper.js b/src/common/ui-wrapper.js
@@ -29,17 +29,16 @@ class UIWrapper {
   }
 
   resetErrorConfig(mediaInfo: ProviderMediaInfoObject): void {
+    if (this._disabled) return;
     this._setErrorPresetConfig(mediaInfo);
     this._resetErrorState();
   }
 
   _setErrorPresetConfig(mediaInfo: ProviderMediaInfoObject): void {
-    if (this._disabled) return;
     this.setConfig({mediaInfo: mediaInfo}, 'error');
   }
 
   _resetErrorState(): void {
-    if (this._disabled) return;
     this.setConfig({hasError: false}, 'engine');
   }
 
@@ -50,8 +49,8 @@ class UIWrapper {
     this.setConfig(Utils.Object.mergeDeep({}, previewThumbnailConfig, seekbarConfig), 'seekbar');
   }
 
-  _handleVr(config: ?PKPluginsConfigObject): void {
-    if (config) {
+  _handleVr(config: PKPluginsConfigObject = {}): void {
+    if (config.vr && !config.vr.disable) {
       this._setFullscreenConfig();
       this._setStereoConfig(config.vr)
     }
@@ -62,7 +61,7 @@ class UIWrapper {
     this.setConfig(Utils.Object.mergeDeep({}, {inBrowserFullscreenForIOS: true}, fullscreenConfig), 'fullscreen');
   }
 
-  _setStereoConfig(vrConfig: Object = {}): void {
+  _setStereoConfig(vrConfig: Object): void {
     if (vrConfig.toggleStereo || (Env.device.type && vrConfig.toggleStereo !== false)) {
       // enable stereo mode by default for mobile device
       this.setConfig(Utils.Object.mergeDeep({}, {vrStereoMode: !!(vrConfig.startInStereo)}), 'vrStereo');