[#900 #2027] Upgrade to React v0.14.7

akvo · Mar 3, 2016 · d4adf66 · d4adf66
1 parent 78da4fa
commit d4adf66
Show file tree

Hide file tree

Showing 36 changed files with 8,506 additions and 8,349 deletions.
diff --git a/akvo/rsr/static/lib/scripts/react-typeahead-1.0.8.js b/akvo/rsr/static/lib/scripts/react-typeahead-1.0.8.js
diff --git a/...atic/lib/scripts/react-typeahead-1.1.5.js → ...rsr/static/lib/scripts/react-typeahead.js b/...atic/lib/scripts/react-typeahead-1.1.5.js → ...rsr/static/lib/scripts/react-typeahead.js
diff --git a/...sr/static/lib/scripts/typeahead-0.10.5.js → akvo/rsr/static/lib/scripts/typeahead.js b/...sr/static/lib/scripts/typeahead-0.10.5.js → akvo/rsr/static/lib/scripts/typeahead.js
diff --git a/akvo/rsr/static/scripts-src/my-details-employments.js b/akvo/rsr/static/scripts-src/my-details-employments.js
diff --git a/akvo/rsr/static/scripts-src/my-details-employments.jsx b/akvo/rsr/static/scripts-src/my-details-employments.jsx
diff --git a/akvo/rsr/static/scripts-src/my-iati.js b/akvo/rsr/static/scripts-src/my-iati.js
@@ -100,22 +100,57 @@ function loadComponent(component_id) {
                     React.DOM.p(null, 
                         React.DOM.button( {onClick:this.handleClick, className:"btn btn-primary"}, i18n.perform_checks)
                     )
-                    );
+                );
             } else {
                 return (
-                    React.DOM.p(null)
-                    );
+                    React.DOM.p(null )
+                );
             }
         }
     });
 
-    React.render(
-        Container(null ),
-        document.getElementById(component_id)
+    ReactDOM.render(
+        React.createElement(Container), document.getElementById(component_id)
     );
 }
 
-i18n = JSON.parse(document.getElementById("perform-checks-text").innerHTML);
-if (document.getElementById('react_iati_checks')) {
-    loadComponent('react_iati_checks');
+var loadJS = function(url, implementationCode, location){
+    //url is URL of external file, implementationCode is the code
+    //to be called from the file, location is the location to
+    //insert the <script> element
+
+    var scriptTag = document.createElement('script');
+    scriptTag.src = url;
+
+    scriptTag.onload = implementationCode;
+    scriptTag.onreadystatechange = implementationCode;
+
+    location.appendChild(scriptTag);
+};
+
+function loadAndRenderReact() {
+    function initReact() {
+        loadComponent('react_iati_checks');
+    }
+
+    function loadReactDOM() {
+        var reactDOMSrc = document.getElementById('react-dom').src;
+        loadJS(reactDOMSrc, initReact, document.body);
+    }
+
+    console.log('No React, load again.');
+    var reactSrc = document.getElementById('react').src;
+    loadJS(reactSrc, loadReactDOM, document.body);
 }
+
+document.addEventListener('DOMContentLoaded', function() {
+    i18n = JSON.parse(document.getElementById("perform-checks-text").innerHTML);
+
+    if (document.getElementById('react_iati_checks')) {
+        if (typeof React !== 'undefined' && typeof ReactDOM !== 'undefined') {
+            loadComponent('react_iati_checks');
+        } else {
+            loadAndRenderReact();
+        }
+    }
+});
diff --git a/akvo/rsr/static/scripts-src/my-iati.jsx b/akvo/rsr/static/scripts-src/my-iati.jsx
@@ -100,22 +100,57 @@ function loadComponent(component_id) {
                     <p>
                         <button onClick={this.handleClick} className='btn btn-primary'>{i18n.perform_checks}</button>
                     </p>
-                    );
+                );
             } else {
                 return (
-                    <p></p>
-                    );
+                    <p />
+                );
             }
         }
     });
 
-    React.render(
-        <Container />,
-        document.getElementById(component_id)
+    ReactDOM.render(
+        React.createElement(Container), document.getElementById(component_id)
     );
 }
 
-i18n = JSON.parse(document.getElementById("perform-checks-text").innerHTML);
-if (document.getElementById('react_iati_checks')) {
-    loadComponent('react_iati_checks');
+var loadJS = function(url, implementationCode, location){
+    //url is URL of external file, implementationCode is the code
+    //to be called from the file, location is the location to
+    //insert the <script> element
+
+    var scriptTag = document.createElement('script');
+    scriptTag.src = url;
+
+    scriptTag.onload = implementationCode;
+    scriptTag.onreadystatechange = implementationCode;
+
+    location.appendChild(scriptTag);
+};
+
+function loadAndRenderReact() {
+    function initReact() {
+        loadComponent('react_iati_checks');
+    }
+
+    function loadReactDOM() {
+        var reactDOMSrc = document.getElementById('react-dom').src;
+        loadJS(reactDOMSrc, initReact, document.body);
+    }
+
+    console.log('No React, load again.');
+    var reactSrc = document.getElementById('react').src;
+    loadJS(reactSrc, loadReactDOM, document.body);
 }
+
+document.addEventListener('DOMContentLoaded', function() {
+    i18n = JSON.parse(document.getElementById("perform-checks-text").innerHTML);
+
+    if (document.getElementById('react_iati_checks')) {
+        if (typeof React !== 'undefined' && typeof ReactDOM !== 'undefined') {
+            loadComponent('react_iati_checks');
+        } else {
+            loadAndRenderReact();
+        }
+    }
+});