From ce6c89cfa76425ce99b1f2b624c00e5f0ecee943 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Tue, 11 Oct 2011 14:21:18 -0700 Subject: [PATCH] [#6574] Extract method from addNewDeliverableLaborItem --- .../deliverables/_labor_budget_form.html.erb | 2 +- assets/javascripts/contracts.js | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/views/deliverables/_labor_budget_form.html.erb b/app/views/deliverables/_labor_budget_form.html.erb index ba99bdd..289302c 100644 --- a/app/views/deliverables/_labor_budget_form.html.erb +++ b/app/views/deliverables/_labor_budget_form.html.erb @@ -18,6 +18,6 @@ <%= labor_budget.hidden_field "_destroy", :class=> "delete-flag" %> <%= link_to_function(l(:button_delete), 'deleteDeliverableFinance(this)', :class => 'delete icon icon-del') %> - <%= link_to_function(l(:button_add), 'addNewDeliverableFinance("labor")', :class => 'add icon icon-add', :style => 'display:none;') %> + <%= link_to_function(l(:button_add), 'addNewDeliverableLaborItem()', :class => 'add icon icon-add', :style => 'display:none;') %> diff --git a/assets/javascripts/contracts.js b/assets/javascripts/contracts.js index 27b87ac..df422ba 100644 --- a/assets/javascripts/contracts.js +++ b/assets/javascripts/contracts.js @@ -72,20 +72,26 @@ jQuery(function($) { var addLinks = $('table.deliverable_finance_table .add-labor a.add') if (addLinks.length == 0) { // No link, add a blank form - addNewDeliverableFinance("labor"); + addNewDeliverableLaborItem(); } else { addLinks.hide().last().show(); } }, - addNewDeliverableFinance = function(financeType) { - var t = $('#labor-budget-template').tmpl({}); + addNewDeliverableLaborItem = function() { + addNewDeliverableFinance('#labor-budget-template', + '#deliverable-labor tbody', + $("tr.labor-budget-form").size(), + 'labor-budget-form'); + }, + + addNewDeliverableFinance = function(templateSelector, appendTemplateTo, countOfExisting, rowClass) { + var t = $(templateSelector).tmpl({}); if (t.length > 0) { - var countOfExisting = $("tr.labor-budget-form").size(); var recordLocation = countOfExisting + 1; // increments the Rails [n] placeholder var newContent = t.html().replace(/\[0\]/g, "[" + recordLocation + "]"); - $("" + newContent + '').appendTo('#deliverable-labor tbody'); + $("" + newContent + '').appendTo(appendTemplateTo); showDeliverableAddButton(); } },