From 814d2d675a3ede64ecd2feb860b005b87e5e7c5d Mon Sep 17 00:00:00 2001 From: "yair.ansbacher" Date: Thu, 5 Jul 2018 12:38:30 +0300 Subject: [PATCH] fix(FEC-8382): stereos icon displayed on iPhone, even if VR plugin disabled --- src/common/ui-wrapper.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/common/ui-wrapper.js b/src/common/ui-wrapper.js index 9365e5d07..594012f37 100644 --- 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');