Business intelligence made simple
No need for Rails < 4.1 patch anymore
Andrew Kane552bd5686194
diff --git a/app/helpers/blazer/base_helper.rb b/app/helpers/blazer/base_helper.rbindex 027d8d82..0adce900 100644--- a/app/helpers/blazer/base_helper.rb+++ b/app/helpers/blazer/base_helper.rb@@ -33,21 +33,7 @@ module Blazerenddef blazer_js_var(name, value)- "var #{name} = #{blazer_json_escape(value.to_json(root: false))};".html_safe- end-- JSON_ESCAPE = { '&' => '\u0026', '>' => '\u003e', '<' => '\u003c', "\u2028" => '\u2028', "\u2029" => '\u2029' }- JSON_ESCAPE_REGEXP = /[\u2028\u2029&><]/u-- # Prior to version 4.1 of rails double quotes were inadventently removed in json_escape.- # This adds the correct json_escape functionality to rails versions < 4.1- def blazer_json_escape(s)- if Rails::VERSION::STRING < "4.1"- result = s.to_s.gsub(JSON_ESCAPE_REGEXP, JSON_ESCAPE)- s.html_safe? ? result.html_safe : result- else- json_escape(s)- end+ "var #{name} = #{json_escape(value.to_json(root: false))};".html_safeenddef blazer_series_name(k)