Merge pull request #420 from chok/include-callbacks

Fix empty callbacks with many includes
1602 · Aug 18, 2014 · 93d9bca · 93d9bca
2 parents ac53d0a + 1a049f9
commit 93d9bca
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/include.js b/lib/include.js
@@ -43,20 +43,24 @@ AbstractClass.include = function (objects, include, cb) {
     var objsByKeys = {};
 
     var nbCallbacks = 0;
+    var totalCallbacks = 0;
 
     for (var i = 0; i < include.length; i++) {
         var callback = processIncludeItem(this, objects, include[i], keyVals, objsByKeys);
         if (callback !== null) {
+            totalCallbacks++;
             if (callback instanceof Error) {
                 cb(callback);
             } else {
                 includeItemCallback(callback);
             }
-        } else {
-            cb(null, objects);
         }
     }
 
+    if (totalCallbacks == 0) {
+        cb(null, objects);
+    }
+
     function includeItemCallback(itemCb) {
         nbCallbacks++;
         itemCb(function () {