Remove email class from admin.js as it is added by default. Fix email…

… tag rendering in Form.js
coderedhead · Apr 14, 2013 · 5a52eac · 5a52eac
1 parent 09f06e7
commit 5a52eac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/lib/core/Form.js b/lib/core/Form.js
@@ -633,11 +633,9 @@ me.elementTypes.json = {
 
 me.elementTypes.email = {
   render:function (field, value) {
-    //var _field = copyProperties(field, {});
-    //_field.type = 'text';
     field.type = 'text';
     field.cls = (field.cls ? field.cls + ' ' : '') + 'email';
-    me.elementTypes.textarea.render(field, value);
+    return me.elementTypes.text.render(field, value);
   }
 };
 
@@ -1349,4 +1347,4 @@ function processFieldValue(field, value, next) {
 /**
  * Export an instance of our form object
  */
-module.exports = f;
+module.exports = f;
diff --git a/modules/core/admin/admin.js b/modules/core/admin/admin.js
@@ -362,7 +362,7 @@ function installUser(req, res, next) {
     fields:[
       {label:'Username', name:'user[username]', cls:'username', type:'text', required:true, 'placeholder':"Your desired username"},
       {label:'Full Name', name:'user[fullname]', type:'text'},
-      {label:'Email', name:'user[email]', cls:'email', type:'email', required:true, 'placeholder':"[email protected]"},
+      {label:'Email', name:'user[email]', type:'email', required:true, 'placeholder':"[email protected]"},
       {label:'Language', name:'user[language]', type:'select', options:req.languages, required:true},
       // TODO : Select based on available
       {label:'Password', name:'user[password]', cls:'password', type:'password', required:true, placeholder:"Password"},