Bump and build v6.1.0

Author: paulfalgout

CHANGELOG.md

@@ -1,3 +1,12 @@
+#### v6.1.0
+
+* **Features**
+  * `Component.showIn` now supports passing `regionOptions`
+
+* **Fixes**
+  * When an app is stopped, the running events cache is now cleared correctly
+  * `viewEvents` now works if a view is shown during `onBeforeShow`
+
 #### v6.0.1
 
 * Add .npmignore

dist/marionette.toolkit.esm.js

@@ -621,6 +621,8 @@ var EventListenersMixin = {
     _.each(this._runningEvents, _.bind(function (args) {
       this.off.apply(this, args);
     }, this));
+
+    this._runningEvents = [];
   },
 
   /**
@@ -633,6 +635,8 @@ var EventListenersMixin = {
     _.each(this._runningListeningTo, _.bind(function (args) {
       this.stopListening.apply(this, args);
     }, this));
+
+    this._runningListeningTo = [];
   },
 
   /**
@@ -1231,15 +1235,18 @@ var App = Application.extend({
    * @returns {View}
    */
   showView: function showView() {
-    var _this$getRegion;
-
     var view = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this._view;
+    var region = this.getRegion();
 
     for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
       args[_key - 1] = arguments[_key];
     }
 
-    (_this$getRegion = this.getRegion()).show.apply(_this$getRegion, [view].concat(args));
+    region.show.apply(region, [view].concat(args));
+
+    if (!this.isRunning()) {
+      this.setView(region.currentView);
+    }
 
     return view;
   },
@@ -1335,11 +1342,12 @@ var Component = Application.extend({
    * @memberOf Component
    * @param {Marionette.Region} region - The region for the component
    * @param {Object} [viewOptions] - Options hash mixed into the instantiated ViewClass.
+   * @param {Object} [regionOptions] - Options hash mixed into the instantiated region.
    * @returns {Component}
    */
-  showIn: function showIn(region, viewOptions) {
+  showIn: function showIn(region, viewOptions, regionOptions) {
     this._region = region;
-    this.show(viewOptions);
+    this.show(viewOptions, regionOptions);
     return this;
   },
 
@@ -1527,7 +1535,7 @@ var Component = Application.extend({
 
 _.extend(Component.prototype, StateMixin, ViewEventsMixin);
 
-var version = "6.0.1";
+var version = "6.1.0";
 
 /**
  * @module Toolkit

dist/marionette.toolkit.js

@@ -1,6 +1,6 @@
 {
   "name": "marionette.toolkit",
-  "version": "6.0.1",
+  "version": "6.1.0",
   "description": "A collection of opinionated Backbone.Marionette extensions for large scale application architecture.",
   "main": "dist/marionette.toolkit.js",
   "module": "dist/marionette.toolkit.esm.js",