load jquery from google only if local copy fails
This commit is contained in:
parent
e943d6ae5e
commit
9ef6606f80
2 changed files with 4 additions and 3 deletions
|
|
@ -26,10 +26,10 @@
|
|||
<!--[if IE]>
|
||||
= javascript_include_tag "/javascripts/ie.js"
|
||||
<![endif]-->
|
||||
= 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'
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue