bower update to a-f@3.0.0

Author: ShMcK

bower.json

@@ -24,7 +24,7 @@
   "dependencies": {
     "angular": "~1.3.11",
     "angular-messages": "~1.3.11",
-    "angular-formly": ">=2.0.0",
+    "angular-formly": "!3.0.0",
     "lumx": "~0.3.*"
   }
 }

demo/bower.json

@@ -6,7 +6,7 @@
     "angular": "~1.3.11",
     "angular-messages": "~1.3.11",
     "angular-sanitize": "~1.3.11",
-    "angular-formly": "~2.0.0",
+    "angular-formly": "~3.0.2",
     "lumx": "~0.3.2",
     "angular-formly-templates-lumx": "~1.0.1",
     "angular-ui-router": "~0.2.13",

demo/src/app/formFields/flex.formFields.js

@@ -16,33 +16,39 @@
     this.fields = function () {
       return [{
         'key': 'row',
-        type: 'lx-wrapper-flex-container',
-        //'wrapper': 'lx-wrapper-flex-container',
+        type: 'lx-flex',
         templateOptions: {
-          flexContainer: {
+          flex: {
             container: 'row',
             align: 'space-between'
           },
+          model: this,
           'fields': [{
             key: 'rowItem1',
             type: 'lx-text',
+            wrapper: 'lx-wrapper-flex-item',
             templateOptions: {
+              flex: {},
               type: 'text',
               fixedLabel: true,
               label: 'Item 1'
             }
           }, {
             key: 'rowItem2',
             type: 'lx-text',
+            wrapper: 'lx-wrapper-flex-item',
             templateOptions: {
+              flex: {},
               type: 'text',
               fixedLabel: true,
               label: 'Item 2'
             }
           }, {
             key: 'rowItem3',
             type: 'lx-text',
+            wrapper: 'lx-wrapper-flex-item',
             templateOptions: {
+              flex: {},
               type: 'text',
               fixedLabel: true,
               label: 'Item 3'

gulpfile.js

@@ -6,17 +6,19 @@ var gulp = require('gulp'),
 	$ = require('gulp-load-plugins')();
 
 var path = {
-	src: ['./src/fields/*.html', './src/wrappers/*.html'],
-	modules: './src/modules/',
+	src: ['src/fields/*.html', 'src/wrappers/*.html'],
+	modules: 'src/modules/',
 	fileName: 'angular-formly-templates-lumx'
 };
 
 var project = {
 	module: 'formly.lumx',
 	prefix: 'lx',
-	dest: path.modules + path.fileName + '.js'
+	dest: path.modules + path.fileName + '.js',
 };
 
+var demoDest = 'demo/bower_components/' + project.fileName + project.dest;
+
 gulp.task('build', ['templates'], function () {
 	var root = path.modules + path.fileName;
 	del([root + '.min.js']);
@@ -31,6 +33,12 @@ gulp.task('build', ['templates'], function () {
 });
 
 
+gulp.task('copyTemplatesToDemo', function () {
+	gulp.src(project.dest)
+		.pipe($.copy(demoDest))
+	.pipe(gulp.dest(demoDest));
+});
+
 gulp.task('templates', ['clean'], function () {
 	var getFirstWrapper = new RegExp('\"' + project.prefix + '\-wrapper');
 	var getPrefix = new RegExp('\"' + project.prefix + '\-', 'g');

src/fields/lx-flex.html

@@ -0,0 +1,10 @@
+<div id="{{::id_container}}"
+     ng-class="::options.templateOptions.flex.className"
+     style="::options.templateOptions.flexContainer.style"
+     flex-container="{{::options.templateOptions.flex.container}}"
+     flex-align="{{::options.templateOptions.flex.align}}"
+     flex-gutter="{{::options.templateOptions.flex.gutter}}">
+
+	<formly-form fields="options.templateOptions.fields"
+	             model="::$parent.model">
+</div>