bike/BikeShed-1
1
0
Fork 0
mirror of https://github.com/fspc/BikeShed-1.git synced 2025-02-28 08:43:23 -05:00
Code Issues Projects Releases Wiki Activity

Fix: incorrect variable scoping in task_lists.js & time_entries.js

Browse Source
This commit is contained in:
Ilya Konanykhin 2017-01-18 14:54:48 +06:00
parent 8a8c82f5b7
commit 2c6a58206a
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/task_lists.js
View File

@ -4,7 +4,7 @@ $(".task_list_task").click(function(){
$("#update_tasks_submit").click(function(){ $("#update_tasks_submit").click(function(){
tasks = []; var tasks = [];
$(".task_list_task").each(function(){ $(".task_list_task").each(function(){
tasks.push({ tasks.push({
id: parseInt($(this).data("id")), id: parseInt($(this).data("id")),
@ -12,7 +12,7 @@ $("#update_tasks_submit").click(function(){
}); });
}); });
json_data = { tasks: tasks }; var json_data = {tasks: tasks};
$.ajax({ $.ajax({
url: $("#update_tasks_submit").data("url"), url: $("#update_tasks_submit").data("url"),

26
app/assets/javascripts/time_entries.js
View File

@ -10,15 +10,15 @@ $(document).ready(function () {
}) })
$("#add_time_entry_submit").click(function () { $("#add_time_entry_submit").click(function () {
date = $date_input.val(); var date = $date_input.val();
start_date = new Date(date + " " + $start_time_input.val()); var start_date = new Date(date + " " + $start_time_input.val());
end_date = new Date(date + " " + $end_time_input.val()); var end_date = new Date(date + " " + $end_time_input.val());
forward = $("#add_time_entry_submit").data("forward"); var forward = $("#add_time_entry_submit").data("forward");
// If a bike is selected, forward to the bike // If a bike is selected, forward to the bike
// checklist. // checklist.
bike_id = parseInt($("#bike_id").val()); var bike_id = parseInt($("#bike_id").val());
if (bike_id > 0) { if (bike_id > 0) {
forward = "/task_lists/" + bike_id + "/edit"; forward = "/task_lists/" + bike_id + "/edit";
} }
@ -27,7 +27,7 @@ $(document).ready(function () {
// how to get Netzke to render UTC dates correctly (it calls to_json // how to get Netzke to render UTC dates correctly (it calls to_json
// somewhere and drops off the timezone). For the time being, save dates // somewhere and drops off the timezone). For the time being, save dates
// in locale like Netzke. // in locale like Netzke.
json_data = { var json_data = {
time_entries: [{ time_entries: [{
start_date: moment(start_date).format("DD-MM-YYYY h:mm A"), start_date: moment(start_date).format("DD-MM-YYYY h:mm A"),
end_date: moment(end_date).format("DD-MM-YYYY h:mm A"), end_date: moment(end_date).format("DD-MM-YYYY h:mm A"),
@ -54,11 +54,11 @@ $(document).ready(function () {
}); });
$(".work_entry-delete-btn").click(function () { $(".work_entry-delete-btn").click(function () {
row = $(this).closest("tr"); var row = $(this).closest("tr");
entry_id = row.data("id"); var entry_id = row.data("id");
start_date = row.data("start_date"); var start_date = row.data("start_date");
duration = row.data("duration"); var duration = row.data("duration");
description = row.data("description"); var description = row.data("description");
$("#work_entry_start_date").html(start_date); $("#work_entry_start_date").html(start_date);
$("#work_entry_duration").html(duration); $("#work_entry_duration").html(duration);
$("#work_entry_description").html(description); $("#work_entry_description").html(description);
@ -66,8 +66,8 @@ $(document).ready(function () {
}); });
$("#confirmation_delete").click(function () { $("#confirmation_delete").click(function () {
entry_id = $(this).data("entry_id"); var entry_id = $(this).data("entry_id");
url = $("#confirmation_delete").data("url") + entry_id; var url = $("#confirmation_delete").data("url") + entry_id;
$.ajax({ $.ajax({
url: url, url: url,
type: "delete", type: "delete",