Skip to content

Commit 4d72f3d

Browse files
committed
Merge remote-tracking branch 'origin/feature/cleanModelUsingDestroyStrategy' into feature/cleanModelUsingDestroyStrategy
Conflicts: README.md src/directives/schema-validate.js
2 parents 4568337 + bc09dac commit 4d72f3d

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

src/directives/decorators/bootstrap/textarea.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="form-group has-feedback {{form.htmlClass}} schema-form-textarea" ng-class="{'has-error': form.disableErrorState !== true && hasError(), 'has-success': form.disableSuccessState !== true && hasSuccess()}">
2-
<label class="control-label {{form.labelHtmlClass}}" ng-class="{'sr-only': !showTitle()}" for="{{form.key.slice(-1)[0]}}">{{form.title}}</label>
2+
<label class="{{form.labelHtmlClass}}" ng-class="{'sr-only': !showTitle()}" for="{{form.key.slice(-1)[0]}}">{{form.title}}</label>
33

44
<textarea ng-if="!form.fieldAddonLeft && !form.fieldAddonRight"
55
class="form-control {{form.fieldHtmlClass}}"

src/directives/schema-validate.js

-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ angular.module('schemaForm').directive('schemaValidate', ['sfValidator', 'sfSele
179179
});
180180

181181

182-
183182
scope.schemaError = function() {
184183
return error;
185184
};

0 commit comments

Comments
 (0)