From 85f8488d44aba0f636906834d4bad284be655e92 Mon Sep 17 00:00:00 2001 From: kiswa Date: Sun, 7 Dec 2014 10:10:56 -0500 Subject: [PATCH 01/82] Updates to board editing. Fixes #114. --- js/controllers/settingsBoardForm.js | 7 ++++--- partials/settingsBoardModal.html | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/js/controllers/settingsBoardForm.js b/js/controllers/settingsBoardForm.js index d3e22d3..b7fe872 100644 --- a/js/controllers/settingsBoardForm.js +++ b/js/controllers/settingsBoardForm.js @@ -21,7 +21,7 @@ function ($scope, BoardService) { placeholder: 'lane-placeholder', stop: function(event, ui) { that.lanes.length = 0; - $(ui.item).parent().children().each(function(index){ + $(ui.item).parent().children().each(function(index) { that.lanes.push({ id: $(this).find('.hidden').text(), name: $(this).find('.item-text').text(), @@ -67,14 +67,15 @@ function ($scope, BoardService) { addLane: function() { this.lanesError = false; if (this.laneName === '') { - this.setAlert(false, true, false, 'Lane name cannot be empty.'); + this.setAlert(false, true, false, 'Column name cannot be empty.'); return; } var that = this; this.lanes.forEach(function(lane) { if (that.laneName == lane.name) { - this.setAlert(false, true, false, 'That lane name has already been added.'); + that.setAlert(false, true, false, 'That column name has already been added.'); + that.lanesError = true; } }); diff --git a/partials/settingsBoardModal.html b/partials/settingsBoardModal.html index 4731b5f..aef444d 100644 --- a/partials/settingsBoardModal.html +++ b/partials/settingsBoardModal.html @@ -21,7 +21,7 @@
Columns