Skip to content

Commit 7714613

Browse files
committed
Merge branch 'master' into gh-pages
2 parents eb6f2d6 + 6630430 commit 7714613

File tree

6 files changed

+13
-9
lines changed

6 files changed

+13
-9
lines changed

CHANGELOG

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
v0.7.13
2+
-------
3+
* Bugfix for condition, it depended on jQuery
4+
15
v0.7.12
26
-------
37
* Error on deleteFromArray task, thanks @bygiro

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"dist/schema-form.js",
55
"dist/bootstrap-decorator.js"
66
],
7-
"version": "0.7.12",
7+
"version": "0.7.13",
88
"authors": [
99
"Textalk",
1010
"David Jensen <david.lgj@gmail.com>",

dist/schema-form.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,9 +290,9 @@ angular.module('schemaForm').provider('schemaFormDecorators',
290290
// Do we have a condition? Then we slap on an ng-if on all children,
291291
// but be nice to existing ng-if.
292292
if (form.condition) {
293-
element.children().each(function() {
294-
var ngIf = this.getAttribute('ng-if');
295-
this.setAttribute(
293+
angular.forEach(element.children(),function(child) {
294+
var ngIf = child.getAttribute('ng-if');
295+
child.setAttribute(
296296
'ng-if',
297297
ngIf ?
298298
'(' + ngIf +

dist/schema-form.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-schema-form",
3-
"version": "0.7.12",
3+
"version": "0.7.13",
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/services/decorators.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ angular.module('schemaForm').provider('schemaFormDecorators',
162162
// Do we have a condition? Then we slap on an ng-if on all children,
163163
// but be nice to existing ng-if.
164164
if (form.condition) {
165-
element.children().each(function() {
166-
var ngIf = this.getAttribute('ng-if');
167-
this.setAttribute(
165+
angular.forEach(element.children(),function(child) {
166+
var ngIf = child.getAttribute('ng-if');
167+
child.setAttribute(
168168
'ng-if',
169169
ngIf ?
170170
'(' + ngIf +

0 commit comments

Comments
 (0)