Merge pull request allenhwkim#210 from dlukez/event_arg_updates

fix(events): pass through updated model values

Author: allenhwkim

app/scripts/services/attr2_options.js

@@ -195,9 +195,9 @@
         var matches = attrValue.match(/([^\(]+)\(([^\)]*)\)/);
         var funcName = matches[1];
         var argsStr = matches[2].replace(/event[ ,]*/,'');  //remove string 'event'
-        
-        var args = scope.$eval("["+argsStr+"]");
+        var argsExpr = $parse("["+argsStr+"]"); //for perf when triggering event
         return function(event) {
+          var args = argsExpr(scope); //get args here to pass updated model values
           function index(obj,i) {return obj[i];}
           var f = funcName.split('.').reduce(index, scope);
           f && f.apply(this, [event].concat(args));

spec/services/attr2_options_spec.js

@@ -100,6 +100,27 @@ describe('Attr2Options', function() {
       var events = parser.getEvents(scope, attrs);
       expect(typeof events.click).toEqual('function');
     });
+    it('should pass arguments to callback', function() {
+      scope.name = 'dave';
+      scope.scopeFunc = function() {}
+      var attrs ={onClick:'scopeFunc(name)'};
+      var events = parser.getEvents(scope, attrs);
+      var event = {};
+      spyOn(scope, 'scopeFunc');
+      events.click(event);
+      expect(scope.scopeFunc).toHaveBeenCalledWith(event, scope.name);
+    });
+    it('should respond to scope model changes', function() {
+      scope.name = 'dave';
+      scope.scopeFunc = function() {};
+      var attrs ={onClick:'scopeFunc(name)'};
+      var events = parser.getEvents(scope, attrs);
+      var event;
+      spyOn(scope, 'scopeFunc');
+      scope.name = 'george';
+      events.click(event);
+      expect(scope.scopeFunc).toHaveBeenCalledWith(event, scope.name);
+    });
   });
 
   describe("#getAttrsToObserve", function() {