From 4e574c3fef9ca41127bd2331c48f01c41e09f08e Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Tue, 3 Jan 2012 20:02:52 -0800
Subject: [PATCH] fixed loading jquery from the CDN, and the fallback to the
local copy still works
---
app/views/layouts/application.html.haml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 37215e417a..e4045304de 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -37,9 +37,9 @@
= javascript_include_tag "/javascripts/ie.js"
<![endif]-->
- = include_javascripts :jquery
+ -# %script{:type => "text/javascript", :src => 'http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js'}
:javascript
- !window.jQuery && document.write(unescape('%3Cscript src="//ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"%3E%3C/script%3E'))
+ !window.jQuery && document.write(unescape("#{escape_javascript(include_javascripts(:jquery))})"))
- unless @landing_page
= include_javascripts :main
--
GitLab