1
-3530
-3530
+3635
+3635
-3530
+3635
178
-3352
+3457
-3530
+3635
// Helpers
// -------
@@ -318,7 +318,7 @@
diff --git a/reports/coverage/src/marionette.itemview.js.html b/reports/coverage/src/marionette.itemview.js.html
index 815a17c381..829915cbc7 100644
--- a/reports/coverage/src/marionette.itemview.js.html
+++ b/reports/coverage/src/marionette.itemview.js.html
@@ -281,7 +281,7 @@
-341
+352
@@ -291,16 +291,16 @@
-119
+122
-119
-72
+122
+75
47
2
-119
+122
@@ -309,36 +309,36 @@
-119
+122
-119
-119
+122
+122
-119
-119
+122
+122
-119
-119
+122
+122
-118
-118
+121
+121
-118
-118
+121
+121
-118
+121
-90
+91
-88
+89
-88
+89
-88
+89
| // 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 237b41df61..da254d6eb1 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 b28ac2aad9..e4ce556a4c 100644
--- a/reports/coverage/src/marionette.module.js.html
+++ b/reports/coverage/src/marionette.module.js.html
@@ -825,7 +825,7 @@
diff --git a/reports/coverage/src/marionette.region.js.html b/reports/coverage/src/marionette.region.js.html
index fd1069f2ca..b2dc61a8c4 100644
--- a/reports/coverage/src/marionette.region.js.html
+++ b/reports/coverage/src/marionette.region.js.html
@@ -400,17 +400,17 @@
1
-131
+132
-131
+132
-131
+132
1
1
1
-130
+131
1
1
@@ -512,59 +512,59 @@
-80
+81
-80
+81
-80
+81
-80
-74
+81
+75
-80
+81
-80
-77
+81
+78
-80
+81
-80
-80
+81
+81
-85
-75
+86
+76
-41
+42
-74
+75
-140
-140
+142
+142
-38
+39
22
-38
+39
-38
+39
@@ -756,7 +756,7 @@
if (view.close) { view.close(); }
else Eif (view.remove) { view.remove(); }
- Marionette.triggerMethod.call(this, "close");
+ Marionette.triggerMethod.call(this, "close", view);
delete this.currentView;
},
@@ -786,7 +786,7 @@
diff --git a/reports/coverage/src/marionette.regionManager.js.html b/reports/coverage/src/marionette.regionManager.js.html
index c9cbae085f..0e45d71f30 100644
--- a/reports/coverage/src/marionette.regionManager.js.html
+++ b/reports/coverage/src/marionette.regionManager.js.html
@@ -580,9 +580,9 @@
//
// Mix in methods from Underscore, for iteration, and other
// collection related features.
- var methods = ['forEach', 'each', 'map', 'find', 'detect', 'filter',
- 'select', 'reject', 'every', 'all', 'some', 'any', 'include',
- 'contains', 'invoke', 'toArray', 'first', 'initial', 'rest',
+ var methods = ['forEach', 'each', 'map', 'find', 'detect', 'filter',
+ 'select', 'reject', 'every', 'all', 'some', 'any', 'include',
+ 'contains', 'invoke', 'toArray', 'first', 'initial', 'rest',
'last', 'without', 'isEmpty', 'pluck'];
_.each(methods, function(method) {
@@ -600,7 +600,7 @@
diff --git a/reports/coverage/src/marionette.renderer.js.html b/reports/coverage/src/marionette.renderer.js.html
index f17a148cc6..0c8f8a1c7b 100644
--- a/reports/coverage/src/marionette.renderer.js.html
+++ b/reports/coverage/src/marionette.renderer.js.html
@@ -242,20 +242,20 @@
-172
+176
3
3
3
-169
-169
-46
+173
+173
+49
-123
+124
-169
+173
@@ -294,7 +294,7 @@
diff --git a/reports/coverage/src/marionette.templatecache.js.html b/reports/coverage/src/marionette.templatecache.js.html
index 62d9658474..9dd3a1d85f 100644
--- a/reports/coverage/src/marionette.templatecache.js.html
+++ b/reports/coverage/src/marionette.templatecache.js.html
@@ -312,14 +312,14 @@
-140
+141
-140
+141
30
30
-140
+141
@@ -352,8 +352,8 @@
-140
-110
+141
+111
@@ -397,7 +397,7 @@
};
// TemplateCache object-level methods. Manage the template
-// caches from these method calls instead of creating
+// caches from these method calls instead of creating
// your own TemplateCache instances
_.extend(Marionette.TemplateCache, {
templateCaches: {},
@@ -420,7 +420,7 @@
// are specified, clears all templates:
// `clear()`
//
- // If arguments are specified, clears each of the
+ // If arguments are specified, clears each of the
// specified templates from the cache:
// `clear("#t1", "#t2", "...")`
clear: function(){
@@ -460,7 +460,7 @@
// Load a template from the DOM, by default. Override
// this method to provide your own template retrieval
// For asynchronous loading with AMD/RequireJS, consider
- // using a template-loader plugin as described here:
+ // using a template-loader plugin as described here:
// https://github.com/marionettejs/backbone.marionette/wiki/Using-marionette-with-requirejs
loadTemplate: function(templateId){
var template = Marionette.$(templateId).html();
@@ -486,7 +486,7 @@
diff --git a/reports/coverage/src/marionette.triggermethod.js.html b/reports/coverage/src/marionette.triggermethod.js.html
index 8bbeacaf0b..5a0a58049e 100644
--- a/reports/coverage/src/marionette.triggermethod.js.html
+++ b/reports/coverage/src/marionette.triggermethod.js.html
@@ -252,24 +252,24 @@
1
-7078
+7262
1
-3323
-3323
+3403
+3403
-3323
-3322
+3403
+3402
-3323
+3403
-381
+385
@@ -280,11 +280,11 @@
// `this.triggerMethod("foo")` will trigger the "foo" event and
// call the "onFoo" method.
//
-// `this.triggerMethod("foo:bar") will trigger the "foo:bar" event and
+// `this.triggerMethod("foo:bar")` will trigger the "foo:bar" event and
// call the "onFooBar" method.
Marionette.triggerMethod = (function(){
- // split the event name on the :
+ // split the event name on the ":"
var splitter = /(^|:)(\w)/gi;
// take the event section ("section1:section2:section3")
@@ -293,7 +293,7 @@
return eventName.toUpperCase();
}
- // actual triggerMethod name
+ // actual triggerMethod implementation
var triggerMethod = function(event) {
// get the method name from the event name
var methodName = 'on' + event.replace(splitter, getEventName);
@@ -318,7 +318,7 @@
diff --git a/reports/coverage/src/marionette.view.js.html b/reports/coverage/src/marionette.view.js.html
index 49c0be7bd9..40cd6de383 100644
--- a/reports/coverage/src/marionette.view.js.html
+++ b/reports/coverage/src/marionette.view.js.html
@@ -186,7 +186,7 @@
Statements: 98.75% (79 / 80)
- Branches: 92.86% (39 / 42)
+ Branches: 93.18% (41 / 44)
Functions: 100% (17 / 17)
@@ -422,22 +422,22 @@
1
-533
+551
-533
+551
-533
+551
-533
-533
+551
+551
-532
-532
+550
+550
@@ -449,7 +449,7 @@
-173
+177
@@ -458,20 +458,20 @@
-173
-173
-173
+177
+177
+177
3
-173
+177
-554
-520
+572
+538
34
@@ -488,7 +488,7 @@
-535
+553
21
@@ -536,31 +536,31 @@
-535
-535
-534
+553
+553
+552
-535
-535
+553
+553
-535
-535
-535
+553
+553
+553
-535
+553
-539
-539
+557
+557
-539
-539
+557
+557
@@ -571,32 +571,32 @@
-129
+130
-124
-124
+125
+125
3
-121
-121
+122
+122
-121
+122
-121
+122
-171
+175
@@ -619,7 +619,7 @@
-121
+122
2
@@ -646,7 +646,7 @@
// this is a backfill since backbone removed the assignment
// of this.options
// at some point however this may be removed
- this.options = _.extend({}, this.options, options);
+ this.options = _.extend({}, _.result(this, 'options'), _.isFunction(options) ? options.call(this) : options);
// parses out the @ui DSL for events
this.events = this.normalizeUIKeys(_.result(this, 'events'));
@@ -852,7 +852,7 @@
diff --git a/upgradeGuide.md b/upgradeGuide.md
index 9fbb20c5b3..540d636f44 100644
--- a/upgradeGuide.md
+++ b/upgradeGuide.md
@@ -1,4 +1,4 @@
-## Upgrade to v.1.1.0 ~ v1.4.1
+## Upgrade to v.1.1.0 ~ v1.5.0
No breaking changes have been introduced between these versions
## Upgrade to v1.1.0
|