You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/02/24 12:48:35 UTC

[41/50] [abbrv] allura git commit: [#7827] ticket:722 Emit jquery to the

[#7827] ticket:722 Emit jquery to the <head>

By default g.register_forge_js emits js to the <body> tail, but some tools
can independently emit js pieces into the body *before* jquery, which
leads to "Uncaught ReferenceError: $ is not defined".

For example it affects ticket bin counts, which are loaded by ajax call.


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

Branch: refs/heads/ib/7827
Commit: 6494e6f3ae326b289f95ae82b1d83775a19f7298
Parents: 860f986
Author: Igor Bondarenko <je...@gmail.com>
Authored: Mon Feb 9 15:32:48 2015 +0200
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue Feb 24 09:37:54 2015 +0000

----------------------------------------------------------------------
 Allura/allura/templates/jinja_master/master.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/6494e6f3/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 1027bd6..0dd1e92 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -22,7 +22,7 @@
 {% if g.theme.jinja_macros %}
   {% import g.theme.jinja_macros as theme_macros with context %}
 {% endif %}
-{% do g.register_forge_js('js/jquery-base.js') %}
+{% do g.register_forge_js('js/jquery-base.js', location='head_js') %}
 {% do g.register_forge_js('js/jquery-migrate-1.2.1.js') %}
 {% do g.register_forge_js('js/jquery.notify.js') %}
 {% do g.register_forge_js('js/modernizr.js') %}