allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject allura git commit: [#7919] we have no .min. version for react-dom since its small already
Date Fri, 08 Jan 2016 21:24:39 GMT
Repository: allura
Updated Branches:
  refs/heads/master a40304e1f -> 1517fcfaa


[#7919] we have no .min. version for react-dom since its small already


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/1517fcfa
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/1517fcfa
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/1517fcfa

Branch: refs/heads/master
Commit: 1517fcfaa0316f756fda919f4ef7719c14b9b940
Parents: a40304e
Author: Dave Brondsema <dave@brondsema.net>
Authored: Fri Jan 8 16:24:19 2016 -0500
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Fri Jan 8 16:24:19 2016 -0500

----------------------------------------------------------------------
 Allura/allura/templates/jinja_master/top_nav.html        | 2 +-
 Allura/allura/templates/phone_verification_fragment.html | 3 +--
 Allura/allura/templates/widgets/subscribe.html           | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/1517fcfa/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 bcbb215..c103280 100644
--- a/Allura/allura/templates/jinja_master/top_nav.html
+++ b/Allura/allura/templates/jinja_master/top_nav.html
@@ -46,7 +46,7 @@
     {% do g.register_forge_js('js/underscore-min.js') %}
     {% do g.register_forge_js('js/browser-polyfill.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-dom.js') %}
     {% do g.register_forge_js('js/react-drag.min.js') %}
     {% do g.register_forge_js('js/react-reorderable.min.js') %}
     {% do g.register_forge_js('js/build/transpiled.js') %} {# if we do more es6, we'll need
to register this in other places, or maybe even global #}

http://git-wip-us.apache.org/repos/asf/allura/blob/1517fcfa/Allura/allura/templates/phone_verification_fragment.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/phone_verification_fragment.html b/Allura/allura/templates/phone_verification_fragment.html
index 341b440..458f8ba 100644
--- a/Allura/allura/templates/phone_verification_fragment.html
+++ b/Allura/allura/templates/phone_verification_fragment.html
@@ -24,8 +24,7 @@
 {% endif %}
 {% do g.register_forge_js('js/react-with-addons' + ('' if h.asbool(tg.config.get('debug'))
else '.min') + '.js',
                           location='head_js') %}
-{% do g.register_forge_js('js/react-dom' + ('' if h.asbool(tg.config.get('debug')) else '.min')
+ '.js',
-                          location='head_js') %}
+{% do g.register_forge_js('js/react-dom.js', location='head_js') %}
 {% do g.register_forge_js('js/jquery-base.js', location='head_js') %}
 {% do g.register_forge_js('js/phone-verification.js', location='body_js_tail') %}
 {% do g.theme.require() %}

http://git-wip-us.apache.org/repos/asf/allura/blob/1517fcfa/Allura/allura/templates/widgets/subscribe.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/subscribe.html b/Allura/allura/templates/widgets/subscribe.html
index 4ea551e..9f46e9c 100644
--- a/Allura/allura/templates/widgets/subscribe.html
+++ b/Allura/allura/templates/widgets/subscribe.html
@@ -19,7 +19,7 @@
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}
 
 {% do g.register_forge_js('js/react-with-addons' + ('' if h.asbool(tg.config.get('debug'))
else '.min') + '.js') %}
-{% do g.register_forge_js('js/react-dom' + ('' if h.asbool(tg.config.get('debug')) else '.min')
+ '.js') %}
+{% do g.register_forge_js('js/react-dom.js') %}
 
 <div id="subscription-form" style="display: inline;">{# see subscription.js #}</div>
 


Mime
View raw message