ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Implements a validation for empty titles input at the side bar

Browse Source 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
This commit is contained in:
Michael Weimann
2018-09-06 20:48:41 +02:00
committed by Julius Härtl
parent d17cd78605
commit df43e07057
2 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
js/controller/CardController.js
View File

@@ -26,6 +26,7 @@ import app from '../app/App.js';
app.controller('CardController', function ($scope, $rootScope, $sce, $location, $stateParams, $state, $interval, $timeout, $filter, BoardService, CardService, StackService, StatusService, markdownItConverter, FileService) { app.controller('CardController', function ($scope, $rootScope, $sce, $location, $stateParams, $state, $interval, $timeout, $filter, BoardService, CardService, StackService, StatusService, markdownItConverter, FileService) {
$scope.sidebar = $rootScope.sidebar; $scope.sidebar = $rootScope.sidebar;
$scope.status = { $scope.status = {
renameTitle: '',
lastEdit: 0, lastEdit: 0,
lastSave: Date.now() lastSave: Date.now()
}; };
@@ -89,9 +90,10 @@ app.controller('CardController', function ($scope, $rootScope, $sce, $location,
}); });
$scope.cardRenameShow = function () { $scope.cardRenameShow = function () {
if ($scope.archived || !BoardService.canEdit()) if ($scope.archived || !BoardService.canEdit()) {
{return false;} return false;
else { } else {
$scope.status.renameTitle = CardService.getCurrent().title;
$scope.status.cardRename = true; $scope.status.cardRename = true;
} }
}; };
@@ -167,9 +169,27 @@ app.controller('CardController', function ($scope, $rootScope, $sce, $location,
// handle rename to update information on the board as well // handle rename to update information on the board as well
$scope.cardRename = function (card) { $scope.cardRename = function (card) {
var newTitle;
if (!$scope.status.renameTitle || !$scope.status.renameTitle.trim()) {
newTitle = '';
} else {
newTitle = $scope.status.renameTitle.trim();
}
if (newTitle === card.title) {
// title unchanged
$scope.status.renameCard = false;
} else if (newTitle !== '') {
// title changed
card.title = newTitle;
CardService.rename(card).then(function (data) { CardService.rename(card).then(function (data) {
$scope.status.renameCard = false; $scope.status.renameCard = false;
}); });
} else {
// empty title
$scope.status.renameTitle = card.title;
$scope.status.renameCard = false;
}
}; };
$scope.cardUpdate = function (card) { $scope.cardUpdate = function (card) {
CardService.update(card).then(function (data) { CardService.update(card).then(function (data) {

2
templates/part.card.php
View File

@@ -15,7 +15,7 @@
<!-- TODO: change to textarea elastic //--> <!-- TODO: change to textarea elastic //-->
<form ng-submit="cardRename(cardservice.getCurrent())"> <form ng-submit="cardRename(cardservice.getCurrent())">
<input class="input-inline" type="text" ng-if="status.cardRename" <input class="input-inline" type="text" ng-if="status.cardRename"
ng-model="cardservice.getCurrent().title" ng-model="status.renameTitle"
ng-blur="cardRename(cardservice.getCurrent())" ng-blur="cardRename(cardservice.getCurrent())"
autofocus-on-insert required maxlength="100"> autofocus-on-insert required maxlength="100">
</form> </form>