Skip to content

Commit

Permalink
Bump and build v6.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
paulfalgout committed Aug 30, 2019
1 parent c8fb53c commit a76b299
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 18 deletions.
9 changes: 9 additions & 0 deletions 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
Expand Down
20 changes: 14 additions & 6 deletions dist/marionette.toolkit.esm.js
Expand Up @@ -621,6 +621,8 @@ var EventListenersMixin = {
_.each(this._runningEvents, _.bind(function (args) {
this.off.apply(this, args);
}, this));

this._runningEvents = [];
},

/**
Expand All @@ -633,6 +635,8 @@ var EventListenersMixin = {
_.each(this._runningListeningTo, _.bind(function (args) {
this.stopListening.apply(this, args);
}, this));

this._runningListeningTo = [];
},

/**
Expand Down Expand Up @@ -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;
},
Expand Down Expand Up @@ -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;
},

Expand Down Expand Up @@ -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
Expand Down
22 changes: 15 additions & 7 deletions dist/marionette.toolkit.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/marionette.toolkit.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/marionette.toolkit.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/marionette.toolkit.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
@@ -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",
Expand Down

0 comments on commit a76b299

Please sign in to comment.