From c3428e8213a2648c06d78eec7cc3b5f3d5886228 Mon Sep 17 00:00:00 2001 From: Ilya Daynatovich Date: Wed, 23 Nov 2016 15:46:46 -0600 Subject: [PATCH] Split React components out of index.html --- app.js | 9 + index.html | 138 +-------------- package.json | 4 +- react/features/app/components/App.web.js | 157 ++++++++++++++++++ .../features/base/lib-jitsi-meet/_.native.js | 34 +++- react/features/base/lib-jitsi-meet/_.web.js | 3 + react/features/base/lib-jitsi-meet/index.js | 32 +--- .../features/base/media/components/_.web.js | 0 .../features/base/util/loadScript.web.js | 0 .../{Conference.js => Conference.native.js} | 0 .../conference/components/Conference.web.js | 133 +++++++++++++++ ...ipantView.js => ParticipantView.native.js} | 0 .../components/ParticipantView.web.js | 22 +++ .../welcome/components/WelcomePage.native.js | 4 +- .../welcome/components/WelcomePage.web.js | 150 +++++++++++++++++ react/index.web.js | 54 ++++++ 16 files changed, 570 insertions(+), 170 deletions(-) create mode 100644 react/features/app/components/App.web.js create mode 100644 react/features/base/lib-jitsi-meet/_.web.js rename plugin.header.text.html => react/features/base/media/components/_.web.js (100%) rename plugin.welcomepage.footer.html => react/features/base/util/loadScript.web.js (100%) rename react/features/conference/components/{Conference.js => Conference.native.js} (100%) create mode 100644 react/features/conference/components/Conference.web.js rename react/features/conference/components/{ParticipantView.js => ParticipantView.native.js} (100%) create mode 100644 react/features/conference/components/ParticipantView.web.js create mode 100644 react/features/welcome/components/WelcomePage.web.js create mode 100644 react/index.web.js 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 - - - - -
-
-
- -
- - - - -
-
-
- - - -
-
- -
-
+