diff --git a/src/angular-form-gen/edit/canvas/field/field.ng.html b/src/angular-form-gen/edit/canvas/field/field.ng.html
index b2f5a69..901d8c5 100644
--- a/src/angular-form-gen/edit/canvas/field/field.ng.html
+++ b/src/angular-form-gen/edit/canvas/field/field.ng.html
@@ -1,5 +1,5 @@
= 0 && !schema.$_invalid) {
- schema.$_invalid = fields[i].$_invalid;
+ while (--i >= 0 && !schema.$$_invalid) {
+ schema.$$_invalid = fields[i].$$_invalid;
}
}
}
diff --git a/src/angular-form-gen/edit/edit-controller.test.js b/src/angular-form-gen/edit/edit-controller.test.js
index 936cfac..5179a8d 100644
--- a/src/angular-form-gen/edit/edit-controller.test.js
+++ b/src/angular-form-gen/edit/edit-controller.test.js
@@ -37,7 +37,7 @@
// expect(controller).toBeDefined();
// });
//
-// describe('schema.$_invalid', function() {
+// describe('schema.$$_invalid', function() {
//
// it('should be invalid when metaForm is not available', function() {
//
@@ -53,7 +53,7 @@
//
// // Assert
//
-// expect(schema.$_invalid).toBe(false);
+// expect(schema.$$_invalid).toBe(false);
//
// });
//
@@ -77,7 +77,7 @@
//
// // Assert
//
-// expect(schema.$_invalid).toBe(true);
+// expect(schema.$$_invalid).toBe(true);
//
// });
//
@@ -101,7 +101,7 @@
//
// // Assert
//
-// expect(schema.$_invalid).toBe(false);
+// expect(schema.$$_invalid).toBe(false);
//
// });
//
@@ -121,7 +121,7 @@
//
// var myField = new fg.Field('myType');
// schema.fields.push(myField);
-// myField.$_invalid = true;
+// myField.$$_invalid = true;
//
// // Act
//
@@ -129,7 +129,7 @@
//
// // Assert
//
-// expect(schema.$_invalid).toBe(true);
+// expect(schema.$$_invalid).toBe(true);
//
// });
//
diff --git a/src/angular-form-gen/edit/edit-directive.test.js b/src/angular-form-gen/edit/edit-directive.test.js
index 4e7e365..9441bad 100644
--- a/src/angular-form-gen/edit/edit-directive.test.js
+++ b/src/angular-form-gen/edit/edit-directive.test.js
@@ -69,7 +69,7 @@ describe('fg-edit-directive', function () {
// Assert
expect($scope.myNoneExistingSchema).toBeDefined();
-
+
});
it('should set the schema model on the controller', function() {
@@ -91,7 +91,7 @@ describe('fg-edit-directive', function () {
expect($scope.schemaCtrl.model()).toBe($scope.mySchema);
});
-
+
describe('$scope.actionsEnabled', function () {
it('should default to true if no value is provided', function () {
@@ -182,4 +182,4 @@ describe('fg-edit-directive', function () {
});
-});
\ No newline at end of file
+});
diff --git a/src/angular-form-gen/field-templates/default/dropdownlist.ng.html b/src/angular-form-gen/field-templates/default/dropdownlist.ng.html
index 21dced8..2f85b71 100644
--- a/src/angular-form-gen/field-templates/default/dropdownlist.ng.html
+++ b/src/angular-form-gen/field-templates/default/dropdownlist.ng.html
@@ -8,6 +8,6 @@
placeholder="{{ field.schema.placeholder }}"
ng-minlength="{{ field.schema.validation.minlength }}"
ng-maxlength="{{ field.schema.validation.maxlength }}"
- ng-pattern="/{{ field.schema.validation.pattern }}/"
+ ng-pattern="field.schema.validation.pattern"
ng-disabled="isDisabled(field.schema)">
diff --git a/src/angular-form-gen/field-templates/default/email.ng.html b/src/angular-form-gen/field-templates/default/email.ng.html
index fc98e0a..1b201a4 100644
--- a/src/angular-form-gen/field-templates/default/email.ng.html
+++ b/src/angular-form-gen/field-templates/default/email.ng.html
@@ -1,5 +1,6 @@
\ No newline at end of file
+ ng-pattern="field.schema.validation.pattern"
+ ng-disabled="isDisabled(field.schema)">
diff --git a/src/angular-form-gen/field-templates/default/number.ng.html b/src/angular-form-gen/field-templates/default/number.ng.html
index fa809e0..ca60537 100644
--- a/src/angular-form-gen/field-templates/default/number.ng.html
+++ b/src/angular-form-gen/field-templates/default/number.ng.html
@@ -12,5 +12,5 @@
ng-required="field.schema.validation.required"
ng-minlength="{{ field.schema.validation.minlength }}"
ng-maxlength="{{ field.schema.validation.maxlength }}"
- ng-pattern="/{{ field.schema.validation.pattern }}/"
+ ng-pattern="field.schema.validation.pattern"
ng-disabled="isDisabled(field.schema)">
\ No newline at end of file
diff --git a/src/angular-form-gen/field-templates/default/password.ng.html b/src/angular-form-gen/field-templates/default/password.ng.html
index b192298..7035915 100644
--- a/src/angular-form-gen/field-templates/default/password.ng.html
+++ b/src/angular-form-gen/field-templates/default/password.ng.html
@@ -9,5 +9,5 @@
ng-required="field.schema.validation.required"
ng-minlength="{{ field.schema.validation.minlength }}"
ng-maxlength="{{ field.schema.validation.maxlength }}"
- ng-pattern="/{{ field.schema.validation.pattern }}/"
+ ng-pattern="field.schema.validation.pattern"
ng-disabled="isDisabled(field.schema)">
\ No newline at end of file
diff --git a/src/angular-form-gen/field-templates/default/text.ng.html b/src/angular-form-gen/field-templates/default/text.ng.html
index 190e6c1..1a567fd 100644
--- a/src/angular-form-gen/field-templates/default/text.ng.html
+++ b/src/angular-form-gen/field-templates/default/text.ng.html
@@ -1,5 +1,6 @@
\ No newline at end of file
+ ng-pattern="field.schema.validation.pattern"
+ ng-disabled="isDisabled(field.schema)">
+
diff --git a/src/angular-form-gen/field-templates/default/textarea.ng.html b/src/angular-form-gen/field-templates/default/textarea.ng.html
index 0491eca..073c1b8 100644
--- a/src/angular-form-gen/field-templates/default/textarea.ng.html
+++ b/src/angular-form-gen/field-templates/default/textarea.ng.html
@@ -8,5 +8,5 @@
ng-required="field.schema.validation.required"
ng-minlength="{{ field.schema.validation.minlength }}"
ng-maxlength="{{ field.schema.validation.maxlength }}"
- ng-pattern="/{{ field.schema.validation.pattern }}/">
-
\ No newline at end of file
+ ng-pattern="field.schema.validation.pattern"
+
diff --git a/src/angular-form-gen/field-templates/properties/dropdownlist.ng.html b/src/angular-form-gen/field-templates/properties/dropdownlist.ng.html
index 28ebb70..1cc1c65 100644
--- a/src/angular-form-gen/field-templates/properties/dropdownlist.ng.html
+++ b/src/angular-form-gen/field-templates/properties/dropdownlist.ng.html
@@ -2,11 +2,12 @@
+ ng-pattern="field.schema.validation.pattern">
diff --git a/src/angular-form-gen/field-templates/properties/email.ng.html b/src/angular-form-gen/field-templates/properties/email.ng.html
index 5eada04..1f229b5 100644
--- a/src/angular-form-gen/field-templates/properties/email.ng.html
+++ b/src/angular-form-gen/field-templates/properties/email.ng.html
@@ -2,13 +2,14 @@
{{ form.name }}
{{ form.description }}
-
diff --git a/src/app/demo/routing.js b/src/app/demo/routing.js
index 90a0a21..9afe104 100644
--- a/src/app/demo/routing.js
+++ b/src/app/demo/routing.js
@@ -15,7 +15,7 @@ app.route.forms = [
{
url: '/demo',
controller: 'FormListCtrl',
- templateUrl: '/app/demo/index.html',
+ templateUrl: 'app/demo/index.html',
resolve: {
forms: ['Form', function(Form) {
return Form.query();
@@ -25,7 +25,7 @@ app.route.forms = [
},
{
url: '/demo/:id/edit',
- templateUrl: '/app/demo/edit/edit.html',
+ templateUrl: 'app/demo/edit/edit.html',
controller: 'FormEditCtrl',
resolve: {
form: getFormById
@@ -34,7 +34,7 @@ app.route.forms = [
},
{
url: '/demo/:id/data/:dataId/edit',
- templateUrl: '/app/demo/data/edit/data-edit.html',
+ templateUrl: 'app/demo/data/edit/data-edit.html',
controller: 'FormDataEditCtrl',
resolve: {
form: getFormById,
@@ -44,7 +44,7 @@ app.route.forms = [
},
{
url: '/demo/:id',
- templateUrl: '/app/demo/data/data-list.html',
+ templateUrl: 'app/demo/data/data-list.html',
controller: 'FormDataListCtrl',
resolve: {
form: getFormById,