##// END OF EJS Templates
jro_apps » redmine
RSS
Merged r11915 from trunk (#14186)....
Jean-Philippe Lang -
r11768:01887f1e6784
parent child
Show More
Side by Side Unified
Context file:
r11768:01887f1e6784 Loading diff...:
Show file before | Show file after | Hide comments
@@ -3,7 +3,7 var operatorLabels = <%= raw_json Query.operators_labels %>;
3 var operatorByType = <%= raw_json Query.operators_by_filter_type %>;
3 var operatorByType = <%= raw_json Query.operators_by_filter_type %>;
4 var availableFilters = <%= raw_json query.available_filters_as_json %>;
4 var availableFilters = <%= raw_json query.available_filters_as_json %>;
5 var labelDayPlural = <%= raw_json l(:label_day_plural) %>;
5 var labelDayPlural = <%= raw_json l(:label_day_plural) %>;
6 var allProjects = <%= raw query.all_projects_values.to_json %>;
6 var allProjects = <%= raw_json query.all_projects_values %>;
7 $(document).ready(function(){
7 $(document).ready(function(){
8 initFilters();
8 initFilters();
9 <% query.filters.each do |field, options| %>
9 <% query.filters.each do |field, options| %>
Show file before | Show file after | Hide comments
@@ -1210,4 +1210,14 RAW
1210 def test_javascript_include_tag_for_plugin_should_pick_the_plugin_javascript
1210 def test_javascript_include_tag_for_plugin_should_pick_the_plugin_javascript
1211 assert_match 'src="/plugin_assets/foo/javascripts/scripts.js"', javascript_include_tag("scripts", :plugin => :foo)
1211 assert_match 'src="/plugin_assets/foo/javascripts/scripts.js"', javascript_include_tag("scripts", :plugin => :foo)
1212 end
1212 end
1213
1214 def test_raw_json_should_escape_closing_tags
1215 s = raw_json(["<foo>bar</foo>"])
1216 assert_equal '["<foo>bar<\/foo>"]', s
1217 end
1218
1219 def test_raw_json_should_be_html_safe
1220 s = raw_json(["foo"])
1221 assert s.html_safe?
1222 end
1213 end
1223 end
General Comments 0
You need to be logged in to leave comments. Login now