Merge pull request #3 from kestutis-stalmokas/fix-definition

fix module definition
marionettejs · Nov 28, 2015 · f52c32d · f52c32d
2 parents b122018 + 81bcf8f
commit f52c32d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/module.js b/src/module.js
@@ -114,14 +114,19 @@ _.extend(Module.prototype, Backbone.Events, {
     if (!definition) { return; }
 
     // build the correct list of arguments for the module definition
+
+    // make flattening consistent
+    // in lodash (v3) it's flatten(collection, deep)
+    // and in underscore it's flatten(collection, shallow)
+    var deepFlag = !_.flattenDeep;
     var args = _.flatten([
       this,
       this.app,
       Backbone,
       Marionette,
       Backbone.$, _,
       customArgs
-    ]);
+      ], deepFlag);
 
     definition.apply(this, args);
   },

diff --git a/test/module.spec.js b/test/module.spec.js
@@ -47,8 +47,13 @@ describe('application modules', function() {
 
       describe('and the define function is provided', function() {
         beforeEach(function() {
-          this.additionalParam = {};
-          this.module = this.app.module('Mod', this.defineSpy, this.additionalParam);
+          this.additionalParam1 = [[1], 2];
+          this.additionalParam2 = {};
+          this.module = this.app.module('Mod',
+            this.defineSpy,
+            this.additionalParam1,
+            this.additionalParam2
+          );
         });
 
         it('it should add module to the app', function() {
@@ -71,7 +76,8 @@ describe('application modules', function() {
             Marionette,
             Backbone.$,
             _,
-            this.additionalParam
+            this.additionalParam1,
+            this.additionalParam2
           );
         });
       });