Fixed example.

petersirka · petersirka · commit 62d0c63e6893 · 2016-08-12T13:47:13.000+02:00
diff --git a/validation/controllers/default.js b/validation/controllers/default.js
@@ -1,25 +1,9 @@
 exports.install = function() {
-	F.route('/', view_homepage);
-	F.route('/', view_homepage, ['xhr', 'post']);
+	F.route('/', 'index');
+	F.route('/', json_contactform, ['post', '*Contact']);
 };
 
-function view_homepage() {
+function json_contactform() {
 	var self = this;
-
-	if (!self.xhr) {
-		self.meta('Validation example');
-		self.view('index', { LoginName: '@' });
-		return;
-	}
-
-	var result = self.validate(self.post, ['FirstName', 'LastName', 'Age', 'Email', 'Terms'], 'Form');
-
-	// Documentation: ErrorBuilder
-	if (result.hasError()) {
-		result.replace('@Email', self.post.Email);
-		self.json(result);
-		return;
-	}
-
-	self.json({ r: true });
+	self.$save(self.callback());
 }
diff --git a/validation/definitions/validation.js b/validation/definitions/validation.js
diff --git a/validation/models/contact.js b/validation/models/contact.js
@@ -0,0 +1,22 @@
+NEWSCHEMA('Contact').make(function(schema) {
+
+	schema.define('firstname', 'Capitalize(30)', true);
+	schema.define('lastname', 'Capitalize(30)', true);
+	schema.define('email', 'Email', true);
+	schema.define('age', 'Number', true);
+	schema.define('terms', 'Boolean', true);
+
+	schema.setPrefix('error-');
+
+	schema.setValidate(function(name, value) {
+		switch (name) {
+			case 'age':
+				return value < 17 ? 'You are too young.' : value > 40 ? 'You are too old' : true;
+		}
+	});
+
+	schema.setSave(function(error, model, options, callback) {
+		callback(SUCCESS(true));
+	});
+
+});
diff --git a/validation/resources/default.resource b/validation/resources/default.resource
@@ -1,4 +1,4 @@
-FormFirstName			: Please enter your first name
-FormLastName			: Please enter your last name
-FormEmail				: Email (@Email) is not valid
-FormTerms				: You must agree
+error-firstname			: Please enter your first name
+error-lastname			: Please enter your last name
+error-email				: Email is not valid
+error-terms				: You must agree
diff --git a/validation/views/index.html b/validation/views/index.html
@@ -2,44 +2,49 @@
 <form action="#" method="POST" id="f">
 	<div>
 		<div>First name:</div>
-		<div><input type="text" name="FirstName" maxlength="200" /></div>
+		<div><input type="text" name="firstname" maxlength="200" /></div>
 	</div>
 	<br />
 	<div>
 		<div>Last name:</div>
-		<div><input type="text" name="LastName" maxlength="200" /></div>
+		<div><input type="text" name="lastname" maxlength="200" /></div>
 	</div>
 	<br />
 	<div>
 		<div>E-mail:</div>
-		<div><input type="text" name="Email" value="@" maxlength="200" /></div>
+		<div><input type="text" name="email" value="@" maxlength="200" /></div>
 	</div>
 	<br />
 	<div>
 		<div>Age:</div>
-		<div><input type="text" name="Age" maxlength="2" /></div>
+		<div><input type="text" name="age" maxlength="2" /></div>
 	</div>
 	<br />
 	<div>
-		<div><label><input type="checkbox" name="Terms" value="1" /> I agree</label></div>
+		<div><label><input type="checkbox" name="terms" value="1" /> I agree</label></div>
 	</div>
 	<div id="error"></div>
 </form>
 <br />
 <button>Submit</button>
 
-<script type="text/javascript">
+<script>
     $(document).ready(function() {
-        $('button').bind('click', function() {
-            $.post('/?ts=' + new Date().getTime(), $('#f').serialize(), function(d) {
+        $('button').on('click', function() {
+            $.post('/?ts=' + Date.now(), $('#f').serialize(), function(d) {
+
                 var err = $('#error');
-                d = JSON.parse(d);
+                $('input').removeClass('error');
+
                 if (d instanceof Array) {
 
                     err.empty();
+
                     d.forEach(function(o) {
+                    	$('input[name="' + o.name + '"]').addClass('error');
                         err.append('<div>' + o.error + '</div>');
                     });
+
                     err.show();
                     return;
                 };
diff --git a/validation/views/layout.html b/validation/views/layout.html
@@ -12,6 +12,7 @@
 		body { padding: 50px; margin: 0; font:normal 12px Arial; color: gray }
 		#error { display: none; background-color: black; color: white; margin: 20px 0 0 0; }
 		#error > div { border-bottom: 1px solid gray; padding: 3px 5px; }
+		.error { background-color: red; }
 	</style>
 </head>
 <body>
