diff --git a/app.js b/app.js index bbb1288b3b..8ffb192f17 100644 --- a/app.js +++ b/app.js @@ -192,6 +192,15 @@ $(document).ready(function () { console.log("(TIME) document ready:\t", now); URLProcessor.setConfigParametersFromUrl(); + + // TODO The execution of the mobile app starts from react/index.native.js. + // Similarly, the execution of the Web app should start from + // react/index.web.js for the sake of consistency and ease of understanding. + // Temporarily though because we are at the beginning of introducing React + // into the Web app, allow the execution of the Web app to start from app.js + // in order to reduce the complexity of the beginning step. + require('./react'); + APP.init(); APP.translation.init(settings.getLanguage()); diff --git a/index.html b/index.html index f24aeb54ee..7764d02765 100644 --- a/index.html +++ b/index.html @@ -34,7 +34,7 @@ window.removeEventListener( 'error', loadErrHandler, true /* capture phase */); } - } + }; window.addEventListener( 'error', loadErrHandler, true /* capture phase type of listener */); @@ -50,141 +50,7 @@ -
-
- -
-
- -
-
- jitsi.org - -
-
-
-
- -
- - -
-
-
-
- - -
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- -
-
-
- -
-
- - - -
-
-
-
-
-
-
-
- - jitsi.org - -
-
- -
- -
- -
- - HD - - - - -
-
-
- -
- - - - -
-
-
-
- - -
-
- -
-
+