[41/50] [abbrv] allura git commit: [#7919] Update to React v0.14.1

[br...@apache.org]

http://git-wip-us.apache.org/repos/asf/allura/blob/2d750f6a/Allura/allura/templates/jinja_master/master.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html
index c60732d..eda8121 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -28,6 +28,7 @@
 {% do g.register_forge_js('js/browser-polyfill.js') %}
 {% do g.register_forge_js('js/underscore-min.js') %}
 {% do g.register_forge_js('js/react-with-addons' + ('' if h.asbool(config.get('debug')) else '.min') + '.js') %}
+{% do g.register_forge_js('js/react-dom' + ('' if h.asbool(config.get('debug')) else '.min') + '.js') %}
 {% do g.register_forge_js("js/react-drag.js") %}
 {% do g.register_forge_js('js/react-reorderable.js') %}
 {% do g.register_forge_js('js/jquery.tooltipster.js') %}
@@ -63,7 +64,6 @@
     {% for blob in g.resource_manager.emit('head_js') %}
         {{ blob }}
     {% endfor %}
-{#<script src="https://cdnjs.cloudflare.com/ajax/libs/react/0.14.1/react-with-addons.js"#}
 
     {% if c.project and c.project.neighborhood.css %}
         <style type="text/css">

http://git-wip-us.apache.org/repos/asf/allura/blob/2d750f6a/Allura/allura/templates/jinja_master/top_nav.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/top_nav.html b/Allura/allura/templates/jinja_master/top_nav.html
index 88d7904..0108725 100644
--- a/Allura/allura/templates/jinja_master/top_nav.html
+++ b/Allura/allura/templates/jinja_master/top_nav.html
@@ -39,9 +39,8 @@
 {% if h.has_access(c.project, 'admin')() %}
     {#        {{ c.app.admin_modal.display() }}  <-- Currently Does not work on non-admin urls #}
     <script>
-        'use strict';
         $(document).ready(function () {
-            React.render(React.createElement(Main, {
+            ReactDOM.render(React.createElement(Main, {
                 initialData: {{ h.escape_json(c.project.nav_data())|safe }}
             }), document.getElementById("top_nav_admin"));
         });