Skip to content

Commit

Permalink
Bump and build v2.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
samccone committed Sep 16, 2014
1 parent bb0074f commit 608d253
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 31 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Make your Backbone.js apps dance with a composite application architecture!",
"homepage": "http://marionettejs.org",
"main": "./lib/core/backbone.marionette.js",
"version": "2.2.0",
"version": "2.2.1",
"keywords": [
"backbone",
"framework",
Expand Down
6 changes: 6 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
### v2.2.1 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v2.2.0...v2.2.1)

* Fixes

* Revert collection type checking for `collectionView`.

### v2.2.0 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v2.1.0...v2.2.0)

* Features
Expand Down
14 changes: 3 additions & 11 deletions lib/backbone.marionette.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// MarionetteJS (Backbone.Marionette)
// ----------------------------------
// v2.2.0
// v2.2.1
//
// Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
// Distributed under MIT license
Expand Down Expand Up @@ -493,7 +493,7 @@

var Marionette = Backbone.Marionette = {};

Marionette.VERSION = '2.2.0';
Marionette.VERSION = '2.2.1';

Marionette.noConflict = function() {
root.Marionette = previousMarionette;
Expand Down Expand Up @@ -1744,7 +1744,7 @@
// Call destroy on each behavior after
// destroying the view.
// This unbinds event listeners
// that behaviors have registerd for.
// that behaviors have registered for.
_.invoke(this._behaviors, 'destroy', args);

return this;
Expand Down Expand Up @@ -1985,7 +1985,6 @@
});

/* jshint maxstatements: 14 */
/* jshint maxlen: 200 */

// Collection View
// ---------------
Expand All @@ -2006,12 +2005,7 @@
var initOptions = options || {};
this.sort = _.isUndefined(initOptions.sort) ? true : initOptions.sort;

if (initOptions.collection && !(initOptions.collection instanceof Backbone.Collection)) {
throw new Marionette.Error('The Collection option passed to this view needs to be an instance of a Backbone.Collection');
}

this.once('render', this._initialEvents);

this._initChildViewStorage();

Marionette.View.apply(this, arguments);
Expand Down Expand Up @@ -2704,7 +2698,6 @@

// Add a single region, by name, to the layoutView
addRegion: function(name, definition) {
this.triggerMethod('before:region:add', name);
var regions = {};
regions[name] = definition;
return this._buildRegions(regions)[name];
Expand All @@ -2718,7 +2711,6 @@

// Remove a single region from the LayoutView, by name
removeRegion: function(name) {
this.triggerMethod('before:region:remove', name);
delete this.regions[name];
return this.regionManager.removeRegion(name);
},
Expand Down
2 changes: 1 addition & 1 deletion lib/backbone.marionette.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions lib/backbone.marionette.min.js

Large diffs are not rendered by default.

14 changes: 3 additions & 11 deletions lib/core/backbone.marionette.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// MarionetteJS (Backbone.Marionette)
// ----------------------------------
// v2.2.0
// v2.2.1
//
// Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
// Distributed under MIT license
Expand Down Expand Up @@ -30,7 +30,7 @@

var Marionette = Backbone.Marionette = {};

Marionette.VERSION = '2.2.0';
Marionette.VERSION = '2.2.1';

Marionette.noConflict = function() {
root.Marionette = previousMarionette;
Expand Down Expand Up @@ -1279,7 +1279,7 @@
// Call destroy on each behavior after
// destroying the view.
// This unbinds event listeners
// that behaviors have registerd for.
// that behaviors have registered for.
_.invoke(this._behaviors, 'destroy', args);

return this;
Expand Down Expand Up @@ -1520,7 +1520,6 @@
});

/* jshint maxstatements: 14 */
/* jshint maxlen: 200 */

// Collection View
// ---------------
Expand All @@ -1541,12 +1540,7 @@
var initOptions = options || {};
this.sort = _.isUndefined(initOptions.sort) ? true : initOptions.sort;

if (initOptions.collection && !(initOptions.collection instanceof Backbone.Collection)) {
throw new Marionette.Error('The Collection option passed to this view needs to be an instance of a Backbone.Collection');
}

this.once('render', this._initialEvents);

this._initChildViewStorage();

Marionette.View.apply(this, arguments);
Expand Down Expand Up @@ -2239,7 +2233,6 @@

// Add a single region, by name, to the layoutView
addRegion: function(name, definition) {
this.triggerMethod('before:region:add', name);
var regions = {};
regions[name] = definition;
return this._buildRegions(regions)[name];
Expand All @@ -2253,7 +2246,6 @@

// Remove a single region from the LayoutView, by name
removeRegion: function(name) {
this.triggerMethod('before:region:remove', name);
delete this.regions[name];
return this.regionManager.removeRegion(name);
},
Expand Down
2 changes: 1 addition & 1 deletion lib/core/backbone.marionette.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions lib/core/backbone.marionette.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "backbone.marionette",
"description": "Make your Backbone.js apps dance!",
"version": "2.2.0",
"version": "2.2.1",
"homepage": "https://github.com/marionettejs/backbone.marionette",
"main": "lib/core/backbone.marionette.js",
"keywords": [
Expand Down

0 comments on commit 608d253

Please sign in to comment.