From c7f374009950ed635ff1e4ef4e3b11c7e86e9a69 Mon Sep 17 00:00:00 2001 From: Ilya Daynatovich Date: Mon, 6 Feb 2017 15:32:05 +0200 Subject: [PATCH] Fix IE redirect problem --- conference.js | 2 +- react/features/base/lib-jitsi-meet/_.web.js | 3 +++ webpack.config.js | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/conference.js b/conference.js index 89f9c1954..36d54c591 100644 --- a/conference.js +++ b/conference.js @@ -664,7 +664,7 @@ export default { * false. */ isCallstatsEnabled () { - return room.isCallstatsEnabled(); + return room && room.isCallstatsEnabled(); }, /** * Sends the given feedback through CallStats if enabled. diff --git a/react/features/base/lib-jitsi-meet/_.web.js b/react/features/base/lib-jitsi-meet/_.web.js index 9c2ca8a13..ea111d7f8 100644 --- a/react/features/base/lib-jitsi-meet/_.web.js +++ b/react/features/base/lib-jitsi-meet/_.web.js @@ -1,5 +1,8 @@ /* @flow */ +// Polyfill URL for Internet Explorer. +import 'url-polyfill'; + declare var JitsiMeetJS: Object; export default JitsiMeetJS; diff --git a/webpack.config.js b/webpack.config.js index b6aaec818..8d31ab60a 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -99,6 +99,11 @@ var config = { loader: 'imports-loader?define=>false&this=>window', test: strophe + }, { + // Set scope to window for URL polyfill. + + loader: 'imports-loader?this=>window', + test: /\/node_modules\/url-polyfill\/.*\.js$/ }, { // Allow CSS to be imported into JavaScript.