From 9ef6606f8044ee58ac84952f3b65be01aa98ee10 Mon Sep 17 00:00:00 2001 From: Dan Hansen Date: Tue, 22 Feb 2011 13:41:05 -0600 Subject: [PATCH] load jquery from google only if local copy fails --- app/views/layouts/application.html.haml | 5 ++--- config/assets.yml | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 09a0191a4..2e7f26149 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -26,10 +26,10 @@ - = javascript_include_tag AppConfig[:pod_uri].scheme.to_s + "://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js" + = include_javascripts :jquery :javascript - !window.jQuery && document.write(unescape('%3Cscript src="/javascripts/vendor/jquery144.min.js"%3E%3C/script%3E')) + !window.jQuery && document.write(unescape('%3Cscript src="//ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"%3E%3C/script%3E')) - unless @landing_page = include_javascripts :main @@ -37,7 +37,6 @@ :javascript Diaspora.widgets.i18n.loadLocale(#{get_javascript_strings_for(current_user.language).to_json}, "#{current_user.language}"); - - if current_user = include_javascripts :flash_socket #unless modern_browser? = javascript_include_tag 'web-socket-receiver' diff --git a/config/assets.yml b/config/assets.yml index 1e4fb65b9..f398ee1d0 100644 --- a/config/assets.yml +++ b/config/assets.yml @@ -7,6 +7,8 @@ javascripts: - public/javascripts/vendor/FABridge.js - public/javascripts/vendor/swfobject.js - public/javascripts/vendor/web_socket.js + jquery: + - public/javascripts/vendor/jquery144.min.js main: - public/javascripts/rails.js - public/javascripts/vendor/jquery.infieldlabel.js