Merge bcea0b6 into d078b6a

CONTRIBUTING.md

@@ -88,7 +88,7 @@ Without at least the first 2 items in this list, we won't
 have any clue why you're changing the code. The first thing
 we'll ask, then, is that you add that information.
 
-Please refrain from giving code examples in altJS langauges like
+Please refrain from giving code examples in altJS languages like
 CoffeeScript, etc. Marionette is written in plain-old JavaScript
 and is generally easier all members in the community to read.
 

bower.json

@@ -6,7 +6,7 @@
     "./lib/backbone.marionette.js",
     "./lib/core/backbone.marionette.js"
   ],
-  "version": "2.0.0",
+  "version": "2.0.1",
   "keywords": [
     "backbone",
     "framework",

changelog.md

@@ -1,3 +1,6 @@
+### v2.0.1 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v2.0.0...v2.0.1)
+  * Fix missing Wreqr and Babysitter in Core AMD definition.
+
 ### v2.0.0 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v1.8.8...v2.0.0)
   * This is a breaking release and contains many API updates and changes, thus changelog is quite large for this release, please refer to the [google doc](https://docs.google.com/document/d/1fuXb9N5LwmdPn-teMwAo3c8JTx6ifUowbqFY1NNSdp8/edit#) for the full details of what is new and what has changed.
 

component.json

@@ -1,7 +1,7 @@
 {
   "name": "backbone.marionette",
   "description": "Make your Backbone.js apps dance!",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "repo": "marionettejs/backbone.marionette",
   "main": "lib/core/amd/backbone.marionette.js",
   "keywords": [

docs/marionette.collectionview.md

@@ -22,7 +22,7 @@ will provide features such as `onShow` callbacks, etc. Please see
   * [CollectionView's `childViewEventPrefix`](#collectionviews-childvieweventprefix)
   * [CollectionView's `childEvents`](#collectionviews-childevents)
   * [CollectionView's `buildChildView`](#collectionviews-buildchildview)
-  * [CollectionView's `addChild`](#collectionviews-addchildview)
+  * [CollectionView's `addChild`](#collectionviews-addchild)
 * [CollectionView's `emptyView`](#collectionviews-emptyview)
   * [CollectionView's `getEmptyView`](#collectionviews-getemptyview)
   * [CollectionView's `emptyViewOptions`](#collectionviews-emptyviewoptions)

docs/marionette.layoutview.md

@@ -126,7 +126,7 @@ Marionette.LayoutView.extend({
 
   getRegionManager: function() {
     // custom logic
-    return MyRegionManager;
+    return new MyRegionManager();
   }
 ```
 

lib/backbone.marionette.js

@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v2.0.0
+// v2.0.1
 //
 // Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -489,7 +489,7 @@
 
   var Marionette = Backbone.Marionette = {};
 
-  Marionette.VERSION = '2.0.0';
+  Marionette.VERSION = '2.0.1';
 
   Marionette.noConflict = function() {
     root.Marionette = previousMarionette;

lib/core/backbone.marionette.js

@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v2.0.0
+// v2.0.1
 //
 // Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -10,7 +10,7 @@
 (function(root, factory) {
 
   if (typeof define === 'function' && define.amd) {
-    define(['backbone', 'underscore'], function(Backbone, _) {
+    define(['backbone', 'underscore', 'backbone.wreqr', 'backbone.babysitter'], function(Backbone, _) {
       return (root.Marionette = factory(root, Backbone, _));
     });
   } else if (typeof exports !== 'undefined') {
@@ -30,7 +30,7 @@
 
   var Marionette = Backbone.Marionette = {};
 
-  Marionette.VERSION = '2.0.0';
+  Marionette.VERSION = '2.0.1';
 
   Marionette.noConflict = function() {
     root.Marionette = previousMarionette;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "backbone.marionette",
   "description": "Make your Backbone.js apps dance!",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "homepage": "https://github.com/marionettejs/backbone.marionette",
   "main": "lib/core/backbone.marionette.js",
   "keywords": [

spec/javascripts/behaviors.spec.js

@@ -339,44 +339,6 @@ describe('Behaviors', function() {
     });
   });
 
-  describe('behavior instance events', function() {
-    beforeEach(function() {
-      var suite = this;
-
-      this.listenToStub = this.sinon.stub();
-      this.onStub       = this.sinon.stub();
-
-      this.behaviors = {
-        foo: Marionette.Behavior.extend({
-          initialize: function() {
-            this.listenTo(suite.model, 'change:foo', suite.listenToStub);
-            this.on('baz', suite.onStub);
-          }
-        })
-      };
-      Marionette.Behaviors.behaviorsLookup = this.behaviors;
-
-      this.View = Marionette.View.extend({
-        behaviors: { foo: {} }
-      });
-
-      this.model = new Backbone.Model();
-      this.view = new this.View({ model: this.model });
-      this.view.destroy();
-    });
-
-    it('shoud unbind listenTo on close', function() {
-      this.model.set('foo', 'bar');
-      expect(this.listenToStub).not.to.have.been.calledOnce;
-    });
-
-    it('shoud still be bound to "on" on close', function() {
-      this.view.triggerMethod('baz');
-      expect(this.onStub).to.have.been.calledOnce;
-    });
-
-  });
-
   describe('behavior instance events', function() {
     beforeEach(function() {
       var suite = this;