"event" binding now correctly handles registering multiple event hand…

…lers at once
odyss009 · Feb 13, 2011 · 4ba2eb1 · 4ba2eb1
1 parent 812a6fa
commit 4ba2eb1
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 55 deletions.
diff --git a/build/output/knockout-latest.debug.js b/build/output/knockout-latest.debug.js
@@ -1101,32 +1101,35 @@ ko.utils.arrayForEach(eventHandlersWithShortcuts, function(eventName) {
 ko.bindingHandlers['event'] = {
     'init' : function (element, valueAccessor, allBindingsAccessor, viewModel) {
         var eventsToHandle = valueAccessor() || {};
-        for(var eventName in eventsToHandle) {
-            if (typeof eventName == "string") {
-                ko.utils.registerEventHandler(element, eventName, function (event) {
-                    var handlerReturnValue;
-                    var handlerFunction = valueAccessor()[eventName];
-                    var allBindings = allBindingsAccessor();
-
-                    try { 
-                        handlerReturnValue = handlerFunction.apply(viewModel, arguments);                     	
-                    } finally {
-                        if (handlerReturnValue !== true) { // Normally we want to prevent default action. Developer can override this be explicitly returning true.
-                            if (event.preventDefault)
-                                event.preventDefault();
-                            else
-                                event.returnValue = false;
+        for(var eventNameOutsideClosure in eventsToHandle) {
+            (function() {
+                var eventName = eventNameOutsideClosure; // Separate variable to be captured by event handler closure
+                if (typeof eventName == "string") {
+                    ko.utils.registerEventHandler(element, eventName, function (event) {
+                        var handlerReturnValue;
+                        var handlerFunction = valueAccessor()[eventName];
+                        var allBindings = allBindingsAccessor();
+
+                        try { 
+                            handlerReturnValue = handlerFunction.apply(viewModel, arguments);                     	
+                        } finally {
+                            if (handlerReturnValue !== true) { // Normally we want to prevent default action. Developer can override this be explicitly returning true.
+                                if (event.preventDefault)
+                                    event.preventDefault();
+                                else
+                                    event.returnValue = false;
+                            }
                         }
-                    }
-
-                    var bubble = allBindings[eventName + 'Bubble'] !== false;
-                    if (!bubble) {
-                        event.cancelBubble = true;
-                        if (event.stopPropagation)
-                            event.stopPropagation();
-                    }
-                });
-            }
+                        
+                        var bubble = allBindings[eventName + 'Bubble'] !== false;
+                        if (!bubble) {
+                            event.cancelBubble = true;
+                            if (event.stopPropagation)
+                                event.stopPropagation();
+                        }
+                    });
+                }
+            })();
         }
     }
 };

diff --git a/build/output/knockout-latest.js b/build/output/knockout-latest.js
diff --git a/spec/defaultBindingsBehaviors.js b/spec/defaultBindingsBehaviors.js
@@ -430,11 +430,17 @@ describe('Binding: Event', {
     before_each: prepareTestNode,
 
     'Should invoke the supplied function when the event occurs, using model as \'this\' param': function () {
-        var model = { wasCalled: false, doCall: function () { this.wasCalled = true; } };
-        testNode.innerHTML = "<button data-bind='event:{someEvent:doCall}'>hey</button>";
+        var model = { 
+            firstWasCalled: false, firstHandler: function () { this.firstWasCalled = true; },
+            secondWasCalled: false, secondHandler: function () { this.secondWasCalled = true; }
+        };
+        testNode.innerHTML = "<button data-bind='event:{firstEvent:firstHandler, secondEvent:secondHandler}'>hey</button>";
         ko.applyBindings(model, testNode);
-        ko.utils.triggerEvent(testNode.childNodes[0], "someEvent");
-        value_of(model.wasCalled).should_be(true);
+        ko.utils.triggerEvent(testNode.childNodes[0], "firstEvent");
+        value_of(model.firstWasCalled).should_be(true);
+        value_of(model.secondWasCalled).should_be(false);
+        ko.utils.triggerEvent(testNode.childNodes[0], "secondEvent");
+        value_of(model.secondWasCalled).should_be(true);
     },
 
     'Should prevent default action': function () {

diff --git a/src/binding/defaultBindings.js b/src/binding/defaultBindings.js
@@ -18,32 +18,35 @@ ko.utils.arrayForEach(eventHandlersWithShortcuts, function(eventName) {
 ko.bindingHandlers['event'] = {
     'init' : function (element, valueAccessor, allBindingsAccessor, viewModel) {
         var eventsToHandle = valueAccessor() || {};
-        for(var eventName in eventsToHandle) {
-            if (typeof eventName == "string") {
-                ko.utils.registerEventHandler(element, eventName, function (event) {
-                    var handlerReturnValue;
-                    var handlerFunction = valueAccessor()[eventName];
-                    var allBindings = allBindingsAccessor();
-
-                    try { 
-                        handlerReturnValue = handlerFunction.apply(viewModel, arguments);                     	
-                    } finally {
-                        if (handlerReturnValue !== true) { // Normally we want to prevent default action. Developer can override this be explicitly returning true.
-                            if (event.preventDefault)
-                                event.preventDefault();
-                            else
-                                event.returnValue = false;
+        for(var eventNameOutsideClosure in eventsToHandle) {
+            (function() {
+                var eventName = eventNameOutsideClosure; // Separate variable to be captured by event handler closure
+                if (typeof eventName == "string") {
+                    ko.utils.registerEventHandler(element, eventName, function (event) {
+                        var handlerReturnValue;
+                        var handlerFunction = valueAccessor()[eventName];
+                        var allBindings = allBindingsAccessor();
+
+                        try { 
+                            handlerReturnValue = handlerFunction.apply(viewModel, arguments);                     	
+                        } finally {
+                            if (handlerReturnValue !== true) { // Normally we want to prevent default action. Developer can override this be explicitly returning true.
+                                if (event.preventDefault)
+                                    event.preventDefault();
+                                else
+                                    event.returnValue = false;
+                            }
                         }
-                    }
-
-                    var bubble = allBindings[eventName + 'Bubble'] !== false;
-                    if (!bubble) {
-                        event.cancelBubble = true;
-                        if (event.stopPropagation)
-                            event.stopPropagation();
-                    }
-                });
-            }
+                        
+                        var bubble = allBindings[eventName + 'Bubble'] !== false;
+                        if (!bubble) {
+                            event.cancelBubble = true;
+                            if (event.stopPropagation)
+                                event.stopPropagation();
+                        }
+                    });
+                }
+            })();
         }
     }
 };