From 610fae59cf6967f5327ed8fc539b1365f6513c79 Mon Sep 17 00:00:00 2001 From: Brad Dunbar Date: Tue, 26 Feb 2013 07:36:55 -0500 Subject: [PATCH] Fix #2312 - Clarify eventsApi logic. --- backbone.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/backbone.js b/backbone.js index 4104e6f4e..3c046b79b 100644 --- a/backbone.js +++ b/backbone.js @@ -72,18 +72,25 @@ // in terms of the existing API. var eventsApi = function(obj, action, name, rest) { if (!name) return true; + + // Handle event maps. if (typeof name === 'object') { for (var key in name) { obj[action].apply(obj, [key, name[key]].concat(rest)); } - } else if (eventSplitter.test(name)) { + return false; + } + + // Handle space separated event names. + if (eventSplitter.test(name)) { var names = name.split(eventSplitter); for (var i = 0, l = names.length; i < l; i++) { obj[action].apply(obj, [names[i]].concat(rest)); } - } else { - return true; + return false; } + + return true; }; // Optimized internal dispatch function for triggering events. Tries to