Moving add on javascript declarations after jquery, in case they depe…

…nd on jquery.
kete · May 26, 2012 · f349ca9 · f349ca9
1 parent 3a9a677
commit f349ca9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
@@ -46,15 +46,15 @@
     <%= oembed_provider_links -%>
   <% end %>
 
-  <%# this goes before other css and javascript incase we want to overwrite the definitions locally in themes %>
-  <%= yield :add_on_scripts_and_links %>
-
   <%# Include TinyMCE before other JS to avoid problems
     # TinyMCE is not compatible with bundle_fu %>
   <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
 
   <%= javascript_tag('jQuery.noConflict();') -%>
 
+  <%# this goes before other css and javascript incase we want to overwrite the definitions locally in themes %>
+  <%= yield :add_on_scripts_and_links %>
+
   <%= include_tiny_mce_if_needed({
     :content_css => "/stylesheets/cache/#{@theme}_theme.css",
     :extended_valid_elements => (@site_admin ? EXTENDED_VALID_ELEMENTS : '')