a936931b by Michael Richards

Merge branch 'master' into iteration-binding

2 parents ab7fd75f fb1984a9
......@@ -85,6 +85,13 @@ describe('Rivets.Binding', function() {
expect(binding.routine).toHaveBeenCalledWith(el, 'awesome sweater');
});
it('calls methods with the object as context', function() {
binding.model = {foo: 'bar'};
spyOn(binding, 'routine');
binding.set(function() { return this.foo; });
expect(binding.routine).toHaveBeenCalledWith(el, binding.model.foo);
});
describe('on an event binding', function() {
beforeEach(function() {
binding.options.special = 'event';
......
......@@ -50,7 +50,7 @@ class Rivets.Binding
else if @options.special is "iteration"
@routine @el, value, @
else
value = value() if value instanceof Function
value = value.call(@model) if value instanceof Function
@routine @el, value
# Subscribes to the model for changes at the specified keypath. Bi-directional
......