Merge branch 'kentcdodds-master'

Author: ghelton

CHANGELOG.md

@@ -1,5 +1,15 @@
 Version numbers correspond to `bower.json` version
 
+# 0.0.11
+
+## Features
+
+Adding the `formlyTemplateProvider` which allows developers to set templateUrls for types. Also allows them to make custom types.
+
+## Bug Fixes
+
+## Breaking Changes
+
 # 0.0.10
 
 ## Features

Gruntfile.js

@@ -35,7 +35,7 @@ module.exports = function(grunt) {
 					{
 						expand: true,
 						cwd: '<%= formlyConfig.base %>/',
-						src: ['directives/formly*.*', 'modules/formly*.*', '!.jshintrc'],
+						src: ['directives/formly*.*', 'modules/formly*.*', 'providers/formly*.*', '!.jshintrc'],
 						dest: '.tmp/'
 					}
 				]
@@ -52,7 +52,7 @@ module.exports = function(grunt) {
 		concat: {
 			build: {
 				// specifing files so that they are added in this order
-				src: ['.tmp/modules/formly*.js', '.tmp/directives/formly*.js', '.tmp/formly*.js'],
+				src: ['.tmp/modules/formly*.js', '.tmp/directives/formly*.js', '.tmp/providers/formly*.js', '.tmp/formly*.js'],
 				dest: '.tmp/formly.js'
 			}
 		},

README.md

@@ -396,6 +396,37 @@ _Example password field_
 	}
 ```
 
+## Other Notes
+
+### Global Config
+
+You can configure formly to use custom templates for specified types (your own "text" template) by injecting the `formlyTemplateProvider` in your app's `config` function. The `formlyTemplateProvider` has the following functions:
+
+#### setTemplateUrl
+
+Allows you to set a template
+
+```javascript
+formlyTemplateProvider.setTemplateUrl('radio', 'views/custom-formly-radio.html');
+formlyTemplateProvider.setTemplateUrl('checkbox', 'views/custom-formly-checkbox.html');
+
+// the same can be accomplished with
+
+formlyTemplateProvider.setTemplate({
+	radio: 'views/custom-formly-radio.html',
+	checkbox: 'views/custom-formly-checkbox.html'
+});
+```
+
+#### getTemplateUrl
+
+Allows you to get the template
+
+```javascript
+formlyTemplateProvider.setTemplateUrl('radio', 'views/custom-formly-radio.html');
+formlyTemplateProvider.getTemplateUrl('radio') === 'views/custom-formly-radio.html'; // true
+```
+
 ## Roadmap
 
 ## Release Notes

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-formly",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "authors": [
     "Grant Helton <[email protected]>"
   ],

dist/formly.js

@@ -7,43 +7,8 @@ angular.module('formly.render').directive('formlyField', [
   '$http',
   '$compile',
   '$templateCache',
-  function formlyField($http, $compile, $templateCache) {
-    var getTemplateUrl = function (type) {
-      var templateUrl = '';
-      switch (type) {
-      case 'textarea':
-        templateUrl = 'directives/formly-field-textarea.html';
-        break;
-      case 'radio':
-        templateUrl = 'directives/formly-field-radio.html';
-        break;
-      case 'select':
-        templateUrl = 'directives/formly-field-select.html';
-        break;
-      case 'number':
-        templateUrl = 'directives/formly-field-number.html';
-        break;
-      case 'checkbox':
-        templateUrl = 'directives/formly-field-checkbox.html';
-        break;
-      case 'password':
-        templateUrl = 'directives/formly-field-password.html';
-        break;
-      case 'hidden':
-        templateUrl = 'directives/formly-field-hidden.html';
-        break;
-      case 'email':
-        templateUrl = 'directives/formly-field-email.html';
-        break;
-      case 'text':
-        templateUrl = 'directives/formly-field-text.html';
-        break;
-      default:
-        templateUrl = null;
-        break;
-      }
-      return templateUrl;
-    };
+  'formlyTemplate',
+  function formlyField($http, $compile, $templateCache, formlyTemplate) {
     return {
       restrict: 'AE',
       transclude: true,
@@ -58,7 +23,7 @@ angular.module('formly.render').directive('formlyField', [
         if (template) {
           setElementTemplate(template);
         } else {
-          var templateUrl = $scope.options.templateUrl || getTemplateUrl($scope.options.type);
+          var templateUrl = $scope.options.templateUrl || formlyTemplate.getTemplateUrl($scope.options.type);
           if (templateUrl) {
             $http.get(templateUrl, { cache: $templateCache }).then(function (response) {
               setElementTemplate(response.data);
@@ -132,6 +97,38 @@ angular.module('formly.render').directive('formlyForm', function formlyForm() {
     ]
   };
 });
+'use strict';
+angular.module('formly.render').provider('formlyTemplate', function () {
+  var templateMap = {
+      textarea: 'directives/formly-field-textarea.html',
+      radio: 'directives/formly-field-radio.html',
+      select: 'directives/formly-field-select.html',
+      number: 'directives/formly-field-number.html',
+      checkbox: 'directives/formly-field-checkbox.html',
+      password: 'directives/formly-field-password.html',
+      hidden: 'directives/formly-field-hidden.html',
+      email: 'directives/formly-field-email.html',
+      text: 'directives/formly-field-text.html'
+    };
+  function setTemplateUrl(name, templateUrl) {
+    if (typeof name === 'string') {
+      templateMap[name] = templateUrl;
+    } else {
+      angular.forEach(name, function (templateUrl, name) {
+        setTemplateUrl(name, templateUrl);
+      });
+    }
+  }
+  function getTemplateUrl(type) {
+    return templateMap[type];
+  }
+  ;
+  this.setTemplateUrl = setTemplateUrl;
+  this.getTemplateUrl = getTemplateUrl;
+  this.$get = function formlyTemplate() {
+    return this;
+  };
+});
 angular.module('formly.render').run([
   '$templateCache',
   function ($templateCache) {