Skip to content

Commit

Permalink
fix($parse): correctly assign expressions who's path is undefined and…
Browse files Browse the repository at this point in the history
… that use brackets notation

Closes angular#8039
  • Loading branch information
rodyhaddad committed Jul 9, 2014
1 parent 36831ec commit 6dd93c1
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/ng/parse.js
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,9 @@ Parser.prototype = {
return getter(self || object(scope, locals));
}, {
assign: function(scope, value, locals) {
return setter(object(scope, locals), field, value, parser.text);
var o = object(scope, locals);
if (!o) object.assign(scope, o = {});
return setter(o, field, value, parser.text);
}
});
},
Expand All @@ -708,6 +710,7 @@ Parser.prototype = {
var key = indexFn(self, locals);
// prevent overwriting of Function.constructor which would break ensureSafeObject check
var safe = ensureSafeObject(obj(self, locals), parser.text);
if (!safe) obj.assign(self, safe = {});
return safe[key] = value;
}
});
Expand Down
16 changes: 16 additions & 0 deletions test/ng/parseSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -1077,6 +1077,22 @@ describe('parser', function() {
fn.assign(scope, 123);
expect(scope).toEqual({a:123});
}));

it('should expose working assignment function for expressions ending with brackets', inject(function($parse) {
var fn = $parse('a.b["c"]');
expect(fn.assign).toBeTruthy();
var scope = {};
fn.assign(scope, 123);
expect(scope.a.b.c).toEqual(123);
}));

it('should expose working assignment function for expressions with brackets in the middle', inject(function($parse) {
var fn = $parse('a["b"].c');
expect(fn.assign).toBeTruthy();
var scope = {};
fn.assign(scope, 123);
expect(scope.a.b.c).toEqual(123);
}));
});


Expand Down

0 comments on commit 6dd93c1

Please sign in to comment.