app/views/locomotive/shared/_head.html.haml in locomotive_cms-2.1.1 vs app/views/locomotive/shared/_head.html.haml in locomotive_cms-2.1.2

@@ -7,22 +7,22 @@
 %meta{ name: 'key-param', content: Rails.application.config.session_options[:key] }
 %meta{ name: 'key-token', content: cookies[key] }
 
 %script{ type: 'text/javascript' }
   :plain
-    window.Locomotive = { mounted_on: '#{Locomotive.mounted_on}' };
+    window.Locomotive = { mounted_on: '#{Locomotive.mounted_on}' }
 
 = stylesheet_link_tag     'locomotive', media: 'screen'
 = javascript_include_tag  'locomotive'
 
 %script{ type: 'text/javascript' }
   :plain
-    window.locale                 = '#{I18n.locale}';
-    window.content_locale         = '#{::Mongoid::Fields::I18n.locale}';
-    window.permalink_service_url  = '#{Locomotive.mounted_on}/_permalink.json';
+    window.locale                     = '#{I18n.locale}';
+    window.content_locale             = '#{::Mongoid::Fields::I18n.locale}';
+    window.permalink_service_url      = '#{Locomotive.mounted_on}/_permalink.json';
 
-    Locomotive.current_site     = new Locomotive.Models.Site(#{escape_json current_site.to_presenter.as_json_for_html_view.to_json.html_safe});
-    Locomotive.current_account  = new Locomotive.Models.Account(#{escape_json current_locomotive_account.to_json.html_safe});
+    window.Locomotive.current_site    = new Locomotive.Models.Site(#{escape_json to_json(current_site)});
+    window.Locomotive.current_account = new Locomotive.Models.Account(#{escape_json to_json(current_locomotive_account)});
 
     $(document).ready(function() {
 
       window.application_view = new Locomotive.Views.ApplicationView({
         flash:      #{flash.to_json},