From 6f17e5f28ffa7db595315082d156fb1eda8bbea3 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Thu, 1 Jul 2010 16:17:32 -0700
Subject: [PATCH] added chrome frame for ie lameos
---
app/views/js/_google_a_js.haml | 11 -----------
app/views/layouts/application.html.haml | 3 +--
public/javascripts/google.js | 15 +++++++++++++++
3 files changed, 16 insertions(+), 13 deletions(-)
delete mode 100644 app/views/js/_google_a_js.haml
create mode 100644 public/javascripts/google.js
diff --git a/app/views/js/_google_a_js.haml b/app/views/js/_google_a_js.haml
deleted file mode 100644
index 0abd7b374b..0000000000
--- a/app/views/js/_google_a_js.haml
+++ /dev/null
@@ -1,11 +0,0 @@
-:javascript
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-17207587-1']);
- _gaq.push(['_setDomainName', '.joindiaspora.com']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
\ No newline at end of file
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index f3b9126680..03053b7055 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -10,9 +10,8 @@
= stylesheet_link_tag "blueprint/screen", :media => 'screen'
= stylesheet_link_tag "application"
/= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
- = javascript_include_tag 'jquery142', 'rails', 'view', 'publisher'
+ = javascript_include_tag 'jquery142', 'rails', 'view', 'publisher', 'http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js', 'google_a'
= javascript_include_tag 'tiny_mce/tiny_mce', 'jquery.infieldlabel'
- = render 'js/google_a_js'
= render 'js/websocket_js'
= csrf_meta_tag
diff --git a/public/javascripts/google.js b/public/javascripts/google.js
new file mode 100644
index 0000000000..5fa6356566
--- /dev/null
+++ b/public/javascripts/google.js
@@ -0,0 +1,15 @@
+var _gaq = _gaq || [];
+_gaq.push(['_setAccount', 'UA-17207587-1']);
+_gaq.push(['_setDomainName', '.joindiaspora.com']);
+_gaq.push(['_trackPageview']);
+
+(function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+})();
+
+CFInstall.check({
+ mode: "overlay",
+ destination: "http://www.waikiki.com"
+});
\ No newline at end of file
--
GitLab