Merge pull request #87 from matteocng/82-feat-primitive-field-email

Fix #82: Primitive Field Type Fields.email(name)
allcount · Jan 8, 2016 · 4f7b76b · 4f7b76b
2 parents ca133f2 + 99a3026
commit 4f7b76b
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 2 deletions.
diff --git a/docs/configuring.md b/docs/configuring.md
@@ -337,6 +337,7 @@ Primitive fields types are:
 * `Fields.attachment(name)`
 * `Fields.password(name)`
 * `Fields.link(name)`
+* `Fields.email(name)`
 
 `Fields.text(name)` is used to define text fields.
 If you want to define text field `foo` with 'Foo' label you could write:

diff --git a/public/assets/js/allcount.js b/public/assets/js/allcount.js
@@ -297,6 +297,18 @@ allcountModule.config(["fieldRenderingServiceProvider", function (fieldRendering
                     controller.$setViewValue(linkValue ? linkValue : undefined);
                 });
                 return $compile('<input type="url" ng-model="linkValue" class="form-control">')(scope);
+            }],
+            email: [function (value, fieldDescription) {
+                var link = $('<a></a>');
+                link.attr('href', 'mailto:' + value);
+                link.text(value);
+                return link;
+            }, function (fieldDescription, controller, updateValue, clone, scope) {
+                scope.emailValue = controller.$viewValue;
+                scope.$watch('emailValue', function (emailValue) {
+                    controller.$setViewValue(emailValue ? emailValue : undefined);
+                });
+                return $compile('<input type="email" ng-model="emailValue" class="form-control">')(scope);
             }]
         }
     }]);

diff --git a/services/js/Fields.js b/services/js/Fields.js
@@ -150,6 +150,15 @@ exports.link = function (name) {
     })
 };
 
+exports.email = function (name) {
+    return new Field({
+        name: name,
+        fieldType: {
+            id: 'email'
+        }
+    })
+};
+
 function Field(config) {
     _.extend(this, config);
 }

diff --git a/test-fixtures/crud-field-types/crud-app.js b/test-fixtures/crud-field-types/crud-app.js
@@ -13,7 +13,8 @@ A.app({
                     checkbox: Fields.checkbox("Checkbox"),
                     checkboxArrayField: Fields.checkbox("Checkbox Array", 'checkboxArray'),
                     password: Fields.password("Password"),
-                    link: Fields.link("Link")
+                    link: Fields.link("Link"),
+                    email: Fields.email("Email")
                 }
             },
             Bar: {

diff --git a/test/crud-integration-test.js b/test/crud-integration-test.js
@@ -44,7 +44,8 @@ exports.crudFieldTest = function (test) {
                 checkbox: true,
                 checkboxArrayField: true,
                 password: '123',
-                link: 'http://www.example.com'
+                link: 'http://www.example.com',
+                email: 'example@example.com'
             };
             return crud.createEntity(_.clone(entityToCreate)).then(function (id) {
                 return crud.readEntity(id).then(function (entity) {