Fix stuck datetimepicker.

jorgefgiron · Jun 24, 2014 · d024a5c · d024a5c
1 parent 13374fb
commit d024a5c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -4,4 +4,3 @@
 //= require bootstrap
 //= require moment
 //= require bootstrap-datetimepicker
-//= require datetimepicker
diff --git a/app/assets/javascripts/datetimepicker.js.coffee b/app/assets/javascripts/datetimepicker.js.coffee
diff --git a/app/views/tasks/_datetimepicker.js b/app/views/tasks/_datetimepicker.js
@@ -0,0 +1,3 @@
+$(document).ready(function() {
+  $('#datetimepicker1').datetimepicker();
+});
diff --git a/app/views/tasks/_task.html.erb b/app/views/tasks/_task.html.erb
@@ -10,7 +10,8 @@
   </span>
 
   <span class="edit">
-    <%= link_to task, remote: true, method: :delete,  data: { confirm: 'Are you sure?' } do %>
+    <%= link_to task, remote: true, method: :delete,
+        data: { confirm: 'Are you sure?' } do %>
       <button class="btn btn-danger btn-xs">Delete!</button>
     <% end %>
   </span>

diff --git a/app/views/tasks/edit.js.erb b/app/views/tasks/edit.js.erb
@@ -1,2 +1,4 @@
 $('#task-form').html("<%= escape_javascript(render 'form') %>");
 $('#task-form').slideDown(350);
+
+<%= render 'datetimepicker' %>
diff --git a/app/views/tasks/new.js.erb b/app/views/tasks/new.js.erb
@@ -1,2 +1,4 @@
-$('#task-form').html("<%= escape_javascript(render 'form') %>");
+$('#task-form').html("<%= j (render 'form') %>");
 $('#task-form').slideDown(350);
+
+<%= render 'datetimepicker' %>