102
103
104
-105|
+105
+106
+107
+108
+109
+110
+111
+112 |
1
-101
-101
-101
-101
-101
-101
+106
+106
+106
+106
+106
+106
-101
+106
-101
+106
1
@@ -346,11 +353,11 @@
-36
-36
-36
+41
+41
+41
-36
+41
@@ -382,24 +389,31 @@
+145
-140
-140
+145
+87
-140
+145
+145
-101
+145
-101
+
+
+
+106
+
+106
16
-101
+106
2
@@ -486,13 +500,20 @@
// Create a module, attached to the application
module: function(moduleNames, moduleDefinition){
+ var ModuleClass = Marionette.Module;
+
+ // Overwrite the module class if the user specifies one
+ if (moduleDefinition) {
+ ModuleClass = moduleDefinition.moduleClass || ModuleClass;
+ }
+
// slice the args, and add this application object as the
// first argument of the array
var args = slice(arguments);
args.unshift(this);
// see the Marionette.Module object for more information
- return Marionette.Module.create.apply(Marionette.Module, args);
+ return ModuleClass.create.apply(ModuleClass, args);
},
// Internal method to set up the region manager
@@ -516,7 +537,7 @@
diff --git a/reports/coverage/src/marionette.approuter.js.html b/reports/coverage/src/marionette.approuter.js.html
index 901582d48d..bdd3dd074b 100644
--- a/reports/coverage/src/marionette.approuter.js.html
+++ b/reports/coverage/src/marionette.approuter.js.html
@@ -399,7 +399,7 @@
diff --git a/reports/coverage/src/marionette.bindEntityEvents.js.html b/reports/coverage/src/marionette.bindEntityEvents.js.html
index 5b7ca97aa8..955a67ac9f 100644
--- a/reports/coverage/src/marionette.bindEntityEvents.js.html
+++ b/reports/coverage/src/marionette.bindEntityEvents.js.html
@@ -348,7 +348,7 @@
1
-2251
+2295
74
@@ -371,11 +371,11 @@
1
-1121
+1143
1
-1130
+1152
@@ -474,7 +474,7 @@
diff --git a/reports/coverage/src/marionette.callbacks.js.html b/reports/coverage/src/marionette.callbacks.js.html
index 0354d52082..71a0fbe47c 100644
--- a/reports/coverage/src/marionette.callbacks.js.html
+++ b/reports/coverage/src/marionette.callbacks.js.html
@@ -251,8 +251,8 @@
1
-374
-374
+389
+389
1
@@ -273,7 +273,7 @@
-158
+163
@@ -339,7 +339,7 @@
diff --git a/reports/coverage/src/marionette.collectionview.js.html b/reports/coverage/src/marionette.collectionview.js.html
index 320df14459..afd11fa21d 100644
--- a/reports/coverage/src/marionette.collectionview.js.html
+++ b/reports/coverage/src/marionette.collectionview.js.html
@@ -183,16 +183,16 @@
Code coverage report for src/marionette.collectionview.js
- Statements: 100% (117 / 117)
+ Statements: 100% (118 / 118)
- Branches: 97.62% (41 / 42)
+ Branches: 97.5% (39 / 40)
- Functions: 100% (35 / 35)
+ Functions: 100% (36 / 36)
- Lines: 100% (114 / 114)
+ Lines: 100% (115 / 115)
@@ -536,7 +536,11 @@
335
336
337
-338 |
+338
+339
+340
+341
+342 |
@@ -548,36 +552,36 @@
-160
+166
-160
+166
-160
-160
+166
+166
-500
-500
+518
+518
-171
-171
+177
+177
-170
-170
-169
-169
+176
+176
+175
+175
-169
+175
2
2
@@ -589,19 +593,19 @@
-102
-93
-93
-93
+107
+98
+98
+98
-17
-17
-17
-17
+18
+18
+18
+18
@@ -615,44 +619,44 @@
-168
-168
+174
+174
-165
-165
+171
+171
-113
-113
-113
-112
-112
+118
+118
+118
+117
+117
-171
+177
-171
-171
+177
+177
-171
+177
132
-39
+45
-170
+176
@@ -660,8 +664,8 @@
132
132
-206
205
+204
@@ -669,12 +673,12 @@
-94
+106
-94
-20
-20
-20
+106
+25
+25
+25
@@ -682,110 +686,110 @@
-188
-9
-9
+195
+10
+10
-92
+104
-153
+154
-153
+154
1
-152
+153
-245
-245
+250
+250
4
-245
+250
-245
+250
-245
+250
-245
+250
-245
+250
-245
+250
4
-245
+250
-245
+250
-245
+250
-245
-362
-362
-362
+250
+371
+371
+371
-362
-362
+371
+371
-362
+371
2
-362
+371
-362
+371
1
-361
+370
-245
-245
+250
+250
-245
-245
+250
+250
@@ -800,55 +804,59 @@
+69
68
-67
-67
+68
1
-67
+68
-68
+69
+390
-210
-55
+217
+61
-112
+117
-170
-146
-146
+176
+151
+151
+
+
-24
+25
-160
+
+166
@@ -866,10 +874,10 @@
-201
-59
+208
+60
-201
+208
@@ -983,7 +991,7 @@
this.closeEmptyView();
this.closeChildren();
- if (this.collection && this.collection.length > 0) {
+ if (!this.isEmpty(this.collection)) {
this.showCollection();
} else {
this.showEmptyView();
@@ -1150,11 +1158,15 @@
this.triggerMethod("item:removed", view);
},
- // helper to show the empty view if the collection is empty
- checkEmpty: function() {
- // check if we're empty now, and if we are, show the
- // empty view
- if (!this.collection || this.collection.length === 0){
+ // helper to check if the collection is empty
+ isEmpty: function(collection){
+ // check if we're empty now
+ return !this.collection || this.collection.length === 0;
+ },
+
+ // If empty, show the empty view
+ checkEmpty: function (){
+ if (this.isEmpty(this.collection)){
this.showEmptyView();
}
},
@@ -1215,7 +1227,7 @@
diff --git a/reports/coverage/src/marionette.compositeview.js.html b/reports/coverage/src/marionette.compositeview.js.html
index 1f00837475..c67453c68a 100644
--- a/reports/coverage/src/marionette.compositeview.js.html
+++ b/reports/coverage/src/marionette.compositeview.js.html
@@ -183,7 +183,7 @@
Code coverage report for src/marionette.compositeview.js
- Statements: 94.64% (53 / 56)
+ Statements: 94.74% (54 / 57)
Branches: 86.36% (19 / 22)
@@ -192,7 +192,7 @@
Functions: 100% (12 / 12)
- Lines: 94.64% (53 / 56)
+ Lines: 94.74% (54 / 57)
@@ -358,7 +358,8 @@
157
158
159
-160 |
+160
+161 |
@@ -369,7 +370,7 @@
-59
+60
@@ -379,8 +380,8 @@
-58
-48
+59
+49
41
41
41
@@ -394,56 +395,57 @@
-72
+71
-72
+71
-72
+71
-55
+56
-55
-41
+56
+42
-55
+56
+56
+56
+56
+
+56
+56
55
-55
-55
+
+
55
55
-54
-
+55
54
54
-
54
-53
-53
-53
-
+59
+59
+59
58
-58
-57
@@ -451,19 +453,19 @@
-55
-55
-55
+56
+56
+56
-55
-55
+56
+56
+59
58
-57
@@ -471,9 +473,9 @@
-53
-53
-53
+52
+52
+52
@@ -487,13 +489,13 @@
-58
+59
4
-54
-54
-54
+55
+55
+55
7
7
@@ -502,16 +504,16 @@
-47
+48
-53
-53
+54
+54
-55
+56
4
@@ -601,6 +603,7 @@
_renderChildren: function(){
Eif (this.isRendered){
+ this.triggerMethod("composite:collection:before:render");
Marionette.CollectionView.prototype._renderChildren.call(this);
this.triggerMethod("composite:collection:rendered");
}
@@ -681,7 +684,7 @@
diff --git a/reports/coverage/src/marionette.controller.js.html b/reports/coverage/src/marionette.controller.js.html
index 850473f210..4d6fbec6cf 100644
--- a/reports/coverage/src/marionette.controller.js.html
+++ b/reports/coverage/src/marionette.controller.js.html
@@ -234,10 +234,10 @@
1
-179
-179
+184
+184
-179
+184
7
@@ -288,7 +288,7 @@
diff --git a/reports/coverage/src/marionette.domRefresh.js.html b/reports/coverage/src/marionette.domRefresh.js.html
index 4d0796b165..a231398626 100644
--- a/reports/coverage/src/marionette.domRefresh.js.html
+++ b/reports/coverage/src/marionette.domRefresh.js.html
@@ -261,13 +261,13 @@
1
-413
-413
+419
+419
1
-454
+460
16
16
@@ -280,12 +280,12 @@
1
-558
+569
41
-558
-413
+569
+419
@@ -339,7 +339,7 @@
diff --git a/reports/coverage/src/marionette.helpers.js.html b/reports/coverage/src/marionette.helpers.js.html
index 23a891f6b6..93ff3ce627 100644
--- a/reports/coverage/src/marionette.helpers.js.html
+++ b/reports/coverage/src/marionette.helpers.js.html
@@ -243,7 +243,7 @@
1
1
-1347
+1379
1
@@ -264,16 +264,16 @@
1
-3693
-3693
+3762
+3762
-3693
+3762
183
-3510
+3579
-3693
+3762
| // Helpers
// -------
@@ -318,7 +318,7 @@
diff --git a/reports/coverage/src/marionette.itemview.js.html b/reports/coverage/src/marionette.itemview.js.html
index c12808f7fb..65eb1898b2 100644
--- a/reports/coverage/src/marionette.itemview.js.html
+++ b/reports/coverage/src/marionette.itemview.js.html
@@ -281,7 +281,7 @@
-357
+362
@@ -332,13 +332,13 @@
-92
+93
-90
+91
-90
+91
-90
+91
| // Item View
@@ -417,7 +417,7 @@
diff --git a/reports/coverage/src/marionette.layout.js.html b/reports/coverage/src/marionette.layout.js.html
index 7f3fdd2164..96b3698a4d 100644
--- a/reports/coverage/src/marionette.layout.js.html
+++ b/reports/coverage/src/marionette.layout.js.html
@@ -591,7 +591,7 @@
diff --git a/reports/coverage/src/marionette.module.js.html b/reports/coverage/src/marionette.module.js.html
index 88ab584185..11561d46a8 100644
--- a/reports/coverage/src/marionette.module.js.html
+++ b/reports/coverage/src/marionette.module.js.html
@@ -183,16 +183,16 @@
Code coverage report for src/marionette.module.js
- Statements: 98.61% (71 / 72)
+ Statements: 98.77% (80 / 81)
- Branches: 95.83% (23 / 24)
+ Branches: 93.75% (30 / 32)
- Functions: 100% (15 / 15)
+ Functions: 100% (16 / 16)
- Lines: 100% (68 / 68)
+ Lines: 100% (77 / 77)
@@ -406,25 +406,47 @@
205
206
207
-208 |
+208
+209
+210
+211
+212
+213
+214
+215
+216
+217
+218
+219
+220
+221
+222
+223
+224
+225
+226 |
1
-132
+137
+137
+137
-132
+137
-132
+137
-132
-132
+137
+137
-132
+137
+137
+137
@@ -432,6 +454,14 @@
+1
+
+
+
+
+
+
+
96
@@ -491,16 +521,16 @@
-81
+83
-81
+83
-81
+83
@@ -509,15 +539,15 @@
-81
+83
-132
-132
+137
+137
@@ -526,60 +556,66 @@
-140
+145
-140
-140
+145
+145
-140
-140
+145
+145
-140
-140
+145
+145
-140
-193
-193
-193
+145
+198
+198
+198
-140
+145
+198
+198
+198
+108
-193
-193
-132
-132
+198
-132
+198
+137
+137
-193
+137
+198
-193
-193
-193
+
+198
+198
+
+198
76
76
-117
+122
-6
-6
+11
+11
@@ -587,16 +623,16 @@
-193
-81
+198
+83
-193
+198
-193
+198
118
@@ -618,8 +654,10 @@
// A simple module system, used to create privacy and encapsulation in
// Marionette applications
-Marionette.Module = function(moduleName, app){
+Marionette.Module = function(moduleName, app, options){
this.moduleName = moduleName;
+ this.options = _.extend({}, this.options, options);
+ this.initialize = options.initialize || this.initialize;
// store sub-modules
this.submodules = {};
@@ -631,11 +669,21 @@
this.startWithParent = true;
this.triggerMethod = Marionette.triggerMethod;
+
+ Eif (_.isFunction(this.initialize)){
+ this.initialize(this.options);
+ }
};
+Marionette.Module.extend = Marionette.extend;
+
// Extend the Module prototype with events / listenTo, so that the module
// can be used as an event aggregator or pub/sub.
_.extend(Marionette.Module.prototype, Backbone.Events, {
+
+ // Initialize is an empty function by default. Override it with your own
+ // initialization logic when extending Marionette.Module.
+ initialize: function(){},
// Initializer for a specific module. Initializers are run when the
// module's `start` method is called.
@@ -751,7 +799,7 @@
// Loop through all the parts of the module definition
_.each(moduleNames, function(moduleName, i){
var parentModule = module;
- module = this._getModule(parentModule, moduleName, app);
+ module = this._getModule(parentModule, moduleName, app, moduleDefinition);
this._addModuleDefinition(parentModule, module, moduleDefinitions[i], customArgs);
}, this);
@@ -760,12 +808,18 @@
},
_getModule: function(parentModule, moduleName, app, def, args){
+ var ModuleClass = Marionette.Module;
+ var options = _.extend({}, def);
+ if (def) {
+ ModuleClass = def.moduleClass || ModuleClass;
+ }
+
// Get an existing module of this name if we have one
var module = parentModule[moduleName];
if (!module){
// Create a new module if we don't have one
- module = new Marionette.Module(moduleName, app);
+ module = new ModuleClass(moduleName, app, options);
parentModule[moduleName] = module;
// store the module on the parent
parentModule.submodules[moduleName] = module;
@@ -825,7 +879,7 @@
diff --git a/reports/coverage/src/marionette.region.js.html b/reports/coverage/src/marionette.region.js.html
index 5b6f74dbb4..a66795d117 100644
--- a/reports/coverage/src/marionette.region.js.html
+++ b/reports/coverage/src/marionette.region.js.html
@@ -394,12 +394,7 @@
193
194
195
-196
-197
-198
-199
-200
-201 |
+196 |
@@ -407,7 +402,6 @@
1
137
-
137
137
@@ -443,7 +437,6 @@
-
109
109
109
@@ -497,7 +490,6 @@
109
-
67
34
34
@@ -523,11 +515,9 @@
-
81
81
-
81
81
@@ -607,7 +597,6 @@
Marionette.Region = function(options){
this.options = options || {};
-
this.el = Marionette.getOption(this, "el");
if (!this.el){
@@ -643,7 +632,6 @@
// ```
//
buildRegion: function(regionConfig, defaultRegionType){
-
var regionIsString = (typeof regionConfig === "string");
var regionSelectorIsString = (typeof regionConfig.selector === "string");
var regionTypeIsUndefined = (typeof regionConfig.regionType === "undefined");
@@ -697,7 +685,6 @@
// literal to build the region, the element will not be
// guaranteed to be in the DOM already, and will cause problems
if (regionConfig.parentEl){
-
region.getEl = function(selector) {
var parentEl = regionConfig.parentEl;
if (_.isFunction(parentEl)){
@@ -723,11 +710,9 @@
// `onShow` and `close` method on your view, just after showing
// or just before closing the view, respectively.
show: function(view){
-
this.ensureEl();
var isViewClosed = view.isClosed || _.isUndefined(view.$el);
-
var isDifferentView = view !== this.currentView;
if (isDifferentView) {
@@ -804,7 +789,7 @@
diff --git a/reports/coverage/src/marionette.regionManager.js.html b/reports/coverage/src/marionette.regionManager.js.html
index f586a3658f..4b23b68039 100644
--- a/reports/coverage/src/marionette.regionManager.js.html
+++ b/reports/coverage/src/marionette.regionManager.js.html
@@ -339,8 +339,8 @@
1
-168
-168
+173
+173
@@ -600,7 +600,7 @@
diff --git a/reports/coverage/src/marionette.renderer.js.html b/reports/coverage/src/marionette.renderer.js.html
index 86e016973f..a0084b1317 100644
--- a/reports/coverage/src/marionette.renderer.js.html
+++ b/reports/coverage/src/marionette.renderer.js.html
@@ -242,20 +242,20 @@
-180
+181
3
3
3
-177
-177
+178
+178
53
-124
+125
-177
+178
@@ -294,7 +294,7 @@
diff --git a/reports/coverage/src/marionette.templatecache.js.html b/reports/coverage/src/marionette.templatecache.js.html
index 3c99081780..c662ed8798 100644
--- a/reports/coverage/src/marionette.templatecache.js.html
+++ b/reports/coverage/src/marionette.templatecache.js.html
@@ -312,14 +312,14 @@
-141
+142
-141
+142
30
30
-141
+142
@@ -352,8 +352,8 @@
-141
-111
+142
+112
@@ -486,7 +486,7 @@
diff --git a/reports/coverage/src/marionette.triggermethod.js.html b/reports/coverage/src/marionette.triggermethod.js.html
index f87385c88c..12b0ee4636 100644
--- a/reports/coverage/src/marionette.triggermethod.js.html
+++ b/reports/coverage/src/marionette.triggermethod.js.html
@@ -252,24 +252,24 @@
1
-7430
+7835
1
-3477
-3477
+3602
+3602
-3477
-3476
+3602
+3601
-3477
+3602
-389
+390
@@ -318,7 +318,7 @@
diff --git a/reports/coverage/src/marionette.view.js.html b/reports/coverage/src/marionette.view.js.html
index 826a5b39b0..8d149c87f6 100644
--- a/reports/coverage/src/marionette.view.js.html
+++ b/reports/coverage/src/marionette.view.js.html
@@ -422,22 +422,22 @@
1
-559
+570
-559
+570
-559
+570
-559
-559
+570
+570
-558
-558
+569
+569
@@ -449,7 +449,7 @@
-181
+182
@@ -458,20 +458,20 @@
-181
-181
-181
+182
+182
+182
3
-181
+182
-580
-546
+591
+557
34
@@ -488,7 +488,7 @@
-561
+572
21
@@ -536,31 +536,31 @@
-561
-561
-560
+572
+572
+571
-561
-561
+572
+572
-561
-561
-561
+572
+572
+572
-561
+572
-565
-565
+576
+576
-565
-565
+576
+576
@@ -571,32 +571,32 @@
-131
+132
-126
-126
+127
+127
3
-123
-123
+124
+124
-123
+124
-123
+124
-179
+180
@@ -619,7 +619,7 @@
-123
+124
2
@@ -852,7 +852,7 @@
|