From 33b7f45966684bf59cb57431a62d1ab71caf435b Mon Sep 17 00:00:00 2001 From: jlukic Date: Sat, 14 Sep 2013 14:43:30 -0400 Subject: [PATCH] adds contains rule for form validation, updates example Former-commit-id: fcb132facf80afa905ac4feb9594e1ed4d039378 Former-commit-id: 603bb6e0ea3dc5b03c74dcb3cfb0ae943f564581 --- build/minified/modules/behavior/form.js | 3 +++ build/uncompressed/modules/behavior/form.js | 3 +++ node/src/documents/modules/form.html | 6 +++--- node/src/files/javascript/validate-form.js | 2 +- node/src/files/release/less/modules/behavior/form.js | 3 +++ node/src/files/release/minified/modules/behavior/form.js | 3 +++ .../src/files/release/uncompressed/modules/behavior/form.js | 3 +++ src/modules/behavior/form.js | 3 +++ 8 files changed, 22 insertions(+), 4 deletions(-) diff --git a/build/minified/modules/behavior/form.js b/build/minified/modules/behavior/form.js index c8c08cada..55c519aa3 100644 --- a/build/minified/modules/behavior/form.js +++ b/build/minified/modules/behavior/form.js @@ -658,6 +658,9 @@ $.fn.form.settings = { not: function(value, notValue) { return (value != notValue); }, + contains: function(value, text) { + return (value.search(text) !== -1); + }, is: function(value, text) { return (value == text); }, diff --git a/build/uncompressed/modules/behavior/form.js b/build/uncompressed/modules/behavior/form.js index c8c08cada..55c519aa3 100644 --- a/build/uncompressed/modules/behavior/form.js +++ b/build/uncompressed/modules/behavior/form.js @@ -658,6 +658,9 @@ $.fn.form.settings = { not: function(value, notValue) { return (value != notValue); }, + contains: function(value, text) { + return (value.search(text) !== -1); + }, is: function(value, text) { return (value == text); }, diff --git a/node/src/documents/modules/form.html b/node/src/documents/modules/form.html index 86381d254..f7bd81de4 100755 --- a/node/src/documents/modules/form.html +++ b/node/src/documents/modules/form.html @@ -168,7 +168,7 @@ type : 'UI Behavior' prompt: 'You must have a dog to add' }, { - type: 'is[fluffy]', + type: 'contains[fluffy]', prompt: 'I only want you to add fluffy dogs!' }, { @@ -281,8 +281,8 @@ type : 'UI Behavior'

Validation Rules
Validation rules are a set of conditions required to validate a field
-
Validation rules are found in settings.rules

+
Validation rules are found in settings.rules
@@ -375,7 +375,7 @@ type : 'UI Behavior' Templates
Templates are used to construct elements
-
Templates are found in settings.template
+
Templates are found in settings.template
Name
diff --git a/node/src/files/javascript/validate-form.js b/node/src/files/javascript/validate-form.js index 6cf0f1657..e1d2b23a3 100755 --- a/node/src/files/javascript/validate-form.js +++ b/node/src/files/javascript/validate-form.js @@ -119,7 +119,7 @@ semantic.validateForm.ready = function() { prompt: 'You must have a dog to add' }, { - type: 'is[fluffy]', + type: 'contains[fluffy]', prompt: 'I only want you to add fluffy dogs!' }, { diff --git a/node/src/files/release/less/modules/behavior/form.js b/node/src/files/release/less/modules/behavior/form.js index c8c08cada..55c519aa3 100644 --- a/node/src/files/release/less/modules/behavior/form.js +++ b/node/src/files/release/less/modules/behavior/form.js @@ -658,6 +658,9 @@ $.fn.form.settings = { not: function(value, notValue) { return (value != notValue); }, + contains: function(value, text) { + return (value.search(text) !== -1); + }, is: function(value, text) { return (value == text); }, diff --git a/node/src/files/release/minified/modules/behavior/form.js b/node/src/files/release/minified/modules/behavior/form.js index c8c08cada..55c519aa3 100644 --- a/node/src/files/release/minified/modules/behavior/form.js +++ b/node/src/files/release/minified/modules/behavior/form.js @@ -658,6 +658,9 @@ $.fn.form.settings = { not: function(value, notValue) { return (value != notValue); }, + contains: function(value, text) { + return (value.search(text) !== -1); + }, is: function(value, text) { return (value == text); }, diff --git a/node/src/files/release/uncompressed/modules/behavior/form.js b/node/src/files/release/uncompressed/modules/behavior/form.js index c8c08cada..55c519aa3 100644 --- a/node/src/files/release/uncompressed/modules/behavior/form.js +++ b/node/src/files/release/uncompressed/modules/behavior/form.js @@ -658,6 +658,9 @@ $.fn.form.settings = { not: function(value, notValue) { return (value != notValue); }, + contains: function(value, text) { + return (value.search(text) !== -1); + }, is: function(value, text) { return (value == text); }, diff --git a/src/modules/behavior/form.js b/src/modules/behavior/form.js index c8c08cada..55c519aa3 100755 --- a/src/modules/behavior/form.js +++ b/src/modules/behavior/form.js @@ -658,6 +658,9 @@ $.fn.form.settings = { not: function(value, notValue) { return (value != notValue); }, + contains: function(value, text) { + return (value.search(text) !== -1); + }, is: function(value, text) { return (value == text); },
Template