Escape js, fix dateranges being added twice because of unfortunate merge

hpi-swt2 · Dec 10, 2016 · 9e78c42 · 9e78c42
1 parent c40bb0f
commit 9e78c42
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 19 deletions.
diff --git a/app/assets/javascripts/events.js b/app/assets/javascripts/events.js
@@ -29,19 +29,6 @@ jQuery(function() {
     });
 });
 
-$(document).on('turbolinks:load', function() {
-  $('#event-add-date-picker').bind('click', function() {
-    // insert our template to the ui and add a remove button
-    $(EVENT_DATE_PICKER_TEMPLATE)
-      .insertBefore(this)
-      .append(' <a style="float: none" class="close">&times;</a>')
-      .find('.close')
-      .click(function() {
-        $(this).parent('div').remove();
-      });
-  });
-});
-
 function addEventDatePicker() {
   var picker = $('#event-add-date-picker');
 

diff --git a/app/views/events/_form.html.erb b/app/views/events/_form.html.erb
@@ -47,9 +47,9 @@
     <div class="col-lg-10" id="event-date-pickers">
       <% def date_picker_template(start_date = Date.current, end_date = Date.current)
         start_picker = text_field_tag "event[date_ranges_attributes][][start_date]", (I18n.l start_date),
-          class: 'form-control', :"data-datepicker" => 'true'
+          class: 'form-control', :"data-enable-datepicker" => 'true'
         end_picker = text_field_tag "event[date_ranges_attributes][][end_date]", (I18n.l end_date),
-          class: 'form-control', :"data-datepicker" => 'true'
+          class: 'form-control', :"data-enable-datepicker" => 'true'
 
         "<div>#{start_picker} #{t 'date_range.to'} #{end_picker} "+
           "<a class=\"close\" onclick=\"javascript:removeEventDatePicker(event.target)\">&times;</a></div>"

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -6,9 +6,9 @@
   <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
   <script>
     function enableDatepickers() {
-      $('[data-datepicker="true"]').datepicker({
-        language:"<%= I18n.locale %>",
-        format: "<%= I18n.t('date.formats.datepicker')%>",
+      $('[data-enable-datepicker="true"]').datepicker({
+        language:"<%= j I18n.locale.to_s %>",
+        format: "<%= j I18n.t('date.formats.datepicker') %>",
       });
     }
     $(document).bind('turbolinks:load', enableDatepickers);

diff --git a/app/views/profiles/_form.html.erb b/app/views/profiles/_form.html.erb
@@ -10,7 +10,7 @@
         <% unless attr_name == :birth_date %>
           <%= f.text_field attr_name, :class => 'form-control' %>
         <% else %>
-          <%= f.text_field attr_name, :class => 'form-control', :"data-datepicker" => "true", value: (I18n.l @profile.public_send(attr_name) if @profile.public_send(attr_name)) %>
+          <%= f.text_field attr_name, :class => 'form-control', :"data-enable-datepicker" => "true", value: (I18n.l @profile.public_send(attr_name) if @profile.public_send(attr_name)) %>
         <% end %>
         <%=f.error_span(attr_name) %>
       </div>