Skip to content

Commit 95ae11d

Browse files
committed
Merge branch 'release/0.8.6'
2 parents efd3cf2 + c815c55 commit 95ae11d

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

CHANGELOG

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
v0.8.6
2+
* Removed left over console.timeEnd
3+
14
v0.8.5
25
------
36
* UMD wrapping for bootstrap-decorator, thanks @angelaharalson

dist/schema-form.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -2190,7 +2190,7 @@ angular.module('schemaForm')
21902190
element[0].appendChild(sfBuilder.build(merged, decorator, slots, lookup));
21912191
//compile only children
21922192
$compile(element.children())(childScope);
2193-
2193+
21942194
//ok, now that that is done let's set any defaults
21952195
if (!scope.options || scope.options.setSchemaDefaults !== false) {
21962196
schemaForm.traverseSchema(schema, function(prop, path) {
@@ -2204,7 +2204,6 @@ angular.module('schemaForm')
22042204
}
22052205

22062206
scope.$emit('sf-render-finished', element);
2207-
console.timeEnd('render')
22082207
};
22092208

22102209
var defaultForm = ['*'];
@@ -2256,7 +2255,7 @@ console.timeEnd('render')
22562255
* @return {Any} the result of the expression
22572256
*/
22582257
scope.evalExpr = function(expression, locals) {
2259-
return $scope.$parent.$eval(expression, locals);
2258+
return scope.$parent.$eval(expression, locals);
22602259
};
22612260
}
22622261
};

dist/schema-form.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-schema-form",
3-
"version": "0.8.5",
3+
"version": "0.8.6",
44
"description": "Create complex forms from a JSON schema with angular.",
55
"repository": "Textalk/angular-schema-form",
66
"main": "dist/schema-form.min.js",

src/directives/schema-form.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ angular.module('schemaForm')
101101
element[0].appendChild(sfBuilder.build(merged, decorator, slots, lookup));
102102
//compile only children
103103
$compile(element.children())(childScope);
104-
104+
105105
//ok, now that that is done let's set any defaults
106106
if (!scope.options || scope.options.setSchemaDefaults !== false) {
107107
schemaForm.traverseSchema(schema, function(prop, path) {
@@ -115,7 +115,6 @@ angular.module('schemaForm')
115115
}
116116

117117
scope.$emit('sf-render-finished', element);
118-
console.timeEnd('render')
119118
};
120119

121120
var defaultForm = ['*'];
@@ -167,7 +166,7 @@ console.timeEnd('render')
167166
* @return {Any} the result of the expression
168167
*/
169168
scope.evalExpr = function(expression, locals) {
170-
return $scope.$parent.$eval(expression, locals);
169+
return scope.$parent.$eval(expression, locals);
171170
};
172171
}
173172
};

0 commit comments

Comments
 (0)