moved google frame script into main script block; only loading now if we're in IE

diff --git a/Open-ILS/web/opac/skin/default/xml/body.xml b/Open-ILS/web/opac/skin/default/xml/body.xml
index 0f44a62..818bac9 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/body.xml
+++ b/Open-ILS/web/opac/skin/default/xml/body.xml
@@ -34,21 +34,6 @@
             <button onclick='dojo.cookie("noGCF", "true", {path:"/", expires: 365}); hideMe($("gcfPrompt"));'>&common.googlechromeframe.dontask;</button>
         </div>
     </center>
-    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script>
-    <script><![CDATA[ 
-        dojo.addOnLoad(
-            function() {
-                CFInstall.check({
-                    preventPrompt: true,
-                    onmissing: function() {
-                        if (dojo.cookie("noGCF") != "true")
-                            unHideMe($('gcfPrompt'));
-                    }
-                });
-            }
-        );
-        ]]>
-    </script>
 
     <!--#include virtual='common/js_common_postbody.xml'-->
 

diff --git a/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml b/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml
index 9c9ff32..f7c9b68 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml
@@ -66,6 +66,20 @@
 
         console.log('middle of main script');
 
+        if(dojo.isIE) {
+            setTimeout(
+                function() {
+                    openils.Util.requireLegacy('http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js');
+                    CFInstall.check({
+                        preventPrompt: true,
+                        onmissing: function() {
+                            if (dojo.cookie("noGCF") != "true")
+                                unHideMe($('gcfPrompt'));
+                        }
+                    });
+            }, 0);
+        }
+
 
         config.css.color_1 = "color_1";
         config.css.color_2 = "color_2";