fixed loading jquery from the CDN, and the fallback to the local copy still works

2012-01-03 20:02:52 -08:00 · 2012-01-03 20:02:52 -08:00 · 4e574c3fef
commit 4e574c3fef
parent d661bfb629
1 changed files with 2 additions and 2 deletions
--- 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