squash merge open933 into integration-1089, resolve merge conflicts.
This commit is contained in:
@@ -24,6 +24,7 @@
|
||||
<input type="text"
|
||||
ng-required="ngRequired"
|
||||
ng-model="ngModel[field]"
|
||||
ng-blur="ngBlur()"
|
||||
ng-pattern="ngPattern"
|
||||
size="{{structure.size}}"
|
||||
name="mctControl">
|
||||
|
||||
@@ -71,6 +71,9 @@ define(
|
||||
// Allow controls to trigger blur-like events
|
||||
ngBlur: "&",
|
||||
|
||||
// Allow controls to trigger blur-like events
|
||||
ngMouseup: "&",
|
||||
|
||||
// The state of the form value itself
|
||||
ngModel: "=",
|
||||
|
||||
|
||||
Reference in New Issue
Block a user