diff --git a/bigbluebutton-html5/.meteor/packages b/bigbluebutton-html5/.meteor/packages index 1eda3b6f64..311c283aa4 100644 --- a/bigbluebutton-html5/.meteor/packages +++ b/bigbluebutton-html5/.meteor/packages @@ -9,7 +9,6 @@ arunoda:npm@0.2.6 amplify blaze@2.1.8 francocatena:status -mrt:external-file-loader@0.1.4 mizzao:timesync clinical:nightwatch cfs:power-queue diff --git a/bigbluebutton-html5/.meteor/versions b/bigbluebutton-html5/.meteor/versions index c59c948ac7..a89bd38663 100644 --- a/bigbluebutton-html5/.meteor/versions +++ b/bigbluebutton-html5/.meteor/versions @@ -56,7 +56,6 @@ modules@0.7.9 modules-runtime@0.7.9 mongo@1.1.15 mongo-id@1.0.6 -mrt:external-file-loader@0.1.4 nathantreid:css-modules@2.4.0 npm-mongo@2.2.16_1 observe-sequence@1.0.15 diff --git a/bigbluebutton-html5/client/main.html b/bigbluebutton-html5/client/main.html index d884eda644..4cd95ff213 100755 --- a/bigbluebutton-html5/client/main.html +++ b/bigbluebutton-html5/client/main.html @@ -4,4 +4,12 @@
+ + + + + + + + diff --git a/bigbluebutton-html5/client/main.jsx b/bigbluebutton-html5/client/main.jsx index dfb12707dc..2522b07dd8 100755 --- a/bigbluebutton-html5/client/main.jsx +++ b/bigbluebutton-html5/client/main.jsx @@ -37,38 +37,8 @@ function setMessages(data) { setAudio(); } -// Helper to load javascript libraries from the BBB server -function loadLib(libname, success, fail) { - const successCallback = function (cb) { - console.log(`successfully loaded lib - ${this}`); - if (typeof (cb) == 'function' || cb instanceof Function) { - cb(); - } - }; - - const failCallback = function (cb, issue) { - console.error(`failed to load lib - ${this}`); - console.error(issue); - if (typeof (cb) == 'function' || cb instanceof Function) { - cb(); - } - }; - - return Meteor.Loader.loadJs(`${window.location.origin}/client/lib/${libname}`, - successCallback.bind(libname, success), 10000).fail(failCallback.bind(libname, fail)); -}; - Meteor.startup(() => { - loadLib('sip.js'); - loadLib('bbb_webrtc_bridge_sip.js'); - loadLib('bbblogger.js'); - loadLib('jquery.json-2.4.min.js'); - loadLib('jquery.FSRTC.js'); - loadLib('jquery.verto.js'); - loadLib('verto_extension.js'); - loadLib('jquery.jsonrpcclient.js'); - loadUserSettings(); let browserLanguage = navigator.language; //set this manually to force localization in a specific language