freifunk/ffffng
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Validate forms the Angular way. Also: Validate on submit.

Browse source
This commit is contained in:
Your Name 2014-06-06 18:24:40 +02:00
parent caf732a04c
commit 2a0b2add0d
9 changed files with 51 additions and 43 deletions
app/scripts/directives
nodeForm.jstokenForm.js

32
app/scripts/directives/nodeForm.js
View file

@ -2,7 +2,7 @@
angular.module('ffffng')
.directive('fNodeForm', function () {
var ctrl = function ($scope, $timeout, Constraints, Validator, _, config, $window) {
var ctrl = function ($scope, $timeout, Constraints, $element, _, config, $window) {
$scope.config = config;
angular.extend($scope, {
center: {
@ -76,19 +76,13 @@ angular.module('ffffng')
$scope.markers = {};
};
var isValid = _.reduce(Constraints.node, function (isValids, constraint, field) {
isValids[field] = Validator.forConstraint(constraint, true);
return isValids;
}, {});
var areValid = Validator.forConstraints(Constraints.node);
$scope.constraints = Constraints.node;
var submitted = false;
$scope.hasError = function (field) {
var value = $scope.node[field];
return !isValid[field](value);
};
$scope.hasAnyError = function () {
return !areValid($scope.node);
var input = $scope.nodeForm[field];
return input.$invalid && submitted;
};
var duplicateError = {
@ -98,6 +92,18 @@ angular.module('ffffng')
};
$scope.onSubmit = function (node) {
submitted = true;
if ($scope.nodeForm.$invalid) {
var firstInvalid = _.filter($element.find('form').find('input'), function (input) {
return $scope.nodeForm[input.name].$invalid;
})[0];
if (firstInvalid) {
$window.scrollTo(0, $window.pageYOffset + firstInvalid.getBoundingClientRect().top - 100);
}
return;
}
$scope.error = null;
$scope.save(node).error(function (response, code) {
switch (code) {
@ -109,7 +115,7 @@ angular.module('ffffng')
}
$window.scrollTo(0, 0);
});
};
}.bind(this);
$scope.updateMap($scope.node.coords);
withValidCoords($scope.node.coords, function (lat, lng) {

18
app/scripts/directives/tokenForm.js
View file

@ -2,17 +2,17 @@
angular.module('ffffng')
.directive('fTokenForm', function () {
var ctrl = function ($scope, Constraints, Validator) {
var isValid = Validator.forConstraint(Constraints.token);
$scope.hasError = function () {
var value = $scope.token;
if (value === undefined) {
return false;
}
return !isValid(value);
};
var ctrl = function ($scope, Constraints) {
$scope.constraints = Constraints;
$scope.submitted = false;
$scope.doSubmit = function (token) {
$scope.submitted = true;
if ($scope.tokenForm.$invalid) {
return;
}
$scope.error = null;
$scope.onSubmit(token)
.error(function (response, code) {