Merge pull request #24 from intercom/improve_script_technology

benmcredmond · benmcredmond · commit 850a249e04e3 · 2013-01-15T10:51:53.000-08:00
Move install code to latest install tekkers
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    intercom-rails (0.2.12)
+    intercom-rails (0.2.13)
       activesupport (> 3.0)
 
 GEM
diff --git a/lib/intercom-rails/script_tag.rb b/lib/intercom-rails/script_tag.rb
@@ -38,24 +38,9 @@ def intercom_settings
     def output
       str = <<-INTERCOM_SCRIPT
 <script id="IntercomSettingsScriptTag">
-  var intercomSettings = #{ActiveSupport::JSON.encode(intercom_settings)};
-</script>
-<script>
-(function() {
-  function async_load() {
-    var s = document.createElement('script');
-    s.type = 'text/javascript'; s.async = true;
-    s.src = '#{Config.library_url || 'https://api.intercom.io/api/js/library.js'}';
-    var x = document.getElementsByTagName('script')[0];
-    x.parentNode.insertBefore(s, x);
-  }
-  if (window.attachEvent) {
-    window.attachEvent('onload', async_load);
-  } else {
-    window.addEventListener('load', async_load, false);
-  }
-})();
+  window.intercomSettings = #{ActiveSupport::JSON.encode(intercom_settings)};
 </script>
+<script>(function(){var w=window;var ic=w.Intercom;if(typeof ic==="function"){ic('reattach_activator');ic('update',intercomSettings);}else{var d=document;var i=function(){i.c(arguments)};i.q=[];i.c=function(args){i.q.push(args)};w.Intercom=i;function l(){var s=d.createElement('script');s.type='text/javascript';s.async=true;s.src='#{Config.library_url || 'https://api.intercom.io/api/js/library.js'}';var x=d.getElementsByTagName('script')[0];x.parentNode.insertBefore(s,x);}if(w.attachEvent){w.attachEvent('onload',l);}else{w.addEventListener('load',l,false);}};})()</script>
       INTERCOM_SCRIPT
 
       str.respond_to?(:html_safe) ? str.html_safe : str
diff --git a/lib/intercom-rails/version.rb b/lib/intercom-rails/version.rb
@@ -1,3 +1,3 @@
 module IntercomRails
-  VERSION = "0.2.12"
+  VERSION = "0.2.13"
 end
diff --git a/test/intercom-rails/auto_include_filter_test.rb b/test/intercom-rails/auto_include_filter_test.rb
@@ -115,14 +115,14 @@ def test_setting_current_user_with_intercom_config
   def test_library_url_default
     get :with_current_user_method, :body => "<body>Hello world</body>"
     assert_includes @response.body, "<script>"
-    assert_includes @response.body, "s.src = 'https://api.intercom.io/api/js/library.js"
+    assert_includes @response.body, "s.src='https://api.intercom.io/api/js/library.js"
   end
 
   def test_library_url_override
     IntercomRails.config.library_url = 'http://a.b.c.d/library.js'
     get :with_current_user_method, :body => "<body>Hello world</body>"
     assert_includes @response.body, "<script>"
-    assert_includes @response.body, "s.src = 'http://a.b.c.d/library.js"
+    assert_includes @response.body, "s.src='http://a.b.c.d/library.js"
   end
 
   def test_auto_insert_with_api_secret_set
