Bump and build v2.0.2

bower.json

@@ -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.0.1",
+  "version": "2.0.2",
   "keywords": [
     "backbone",
     "framework",

changelog.md

@@ -1,3 +1,11 @@
+### v2.0.2 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v2.0.1...v2.0.2)
+
+  * Bug Fixes
+    * Fixed issue where `render:collection` called before the entire collection and children had been rendered.
+
+  * General
+    * Remove bundled main entry point for bower.
+
 ### 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.
 

component.json

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

lib/backbone.marionette.js

@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v2.0.1
+// v2.0.2
 //
 // Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -489,7 +489,7 @@
 
   var Marionette = Backbone.Marionette = {};
 
-  Marionette.VERSION = '2.0.1';
+  Marionette.VERSION = '2.0.2';
 
   Marionette.noConflict = function() {
     root.Marionette = previousMarionette;
@@ -589,7 +589,7 @@
   // Mix in methods from Underscore, for iteration, and other
   // collection related features.
   // Borrowing this code from Backbone.Collection:
-  // http://backbonejs.org/docs/backbone.html#section-106
+  // http://backbonejs.org/docs/backbone.html#section-121
   Marionette.actAsCollection = function(object, listProperty) {
     var methods = ['forEach', 'each', 'map', 'find', 'detect', 'filter',
       'select', 'reject', 'every', 'all', 'some', 'any', 'include',
@@ -855,7 +855,6 @@
   // modules and routers, and as a mediator for workflow
   // and coordination of other objects, views, and more.
   Marionette.Controller = function(options) {
-    this.triggerMethod = Marionette.triggerMethod;
     this.options = options || {};
 
     if (_.isFunction(this.initialize)) {
@@ -1855,20 +1854,18 @@
     // more control over events being triggered, around the rendering
     // process
     _renderChildren: function() {
-      this.startBuffering();
-
       this.destroyEmptyView();
       this.destroyChildren();
 
-      if (!this.isEmpty(this.collection)) {
+      if (this.isEmpty(this.collection)) {
+        this.showEmptyView();
+      } else {
         this.triggerMethod('before:render:collection', this);
+        this.startBuffering();
         this.showCollection();
+        this.endBuffering();
         this.triggerMethod('render:collection', this);
-      } else {
-        this.showEmptyView();
       }
-
-      this.endBuffering();
     },
 
     // Internal method to loop through collection and show each child view.
@@ -2605,12 +2602,7 @@
       // Wraps several of the view's methods
       // calling the methods first on each behavior
       // and then eventually calling the method on the view.
-      Behaviors.wrap(view, behaviors, [
-        'bindUIElements', 'unbindUIElements',
-        'delegateEvents', 'undelegateEvents',
-        'behaviorEvents', 'triggerMethod',
-        'setElement', 'destroy'
-      ]);
+      Behaviors.wrap(view, behaviors, _.keys(methods));
     }
 
     var methods = {

lib/core/backbone.marionette.js

@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v2.0.1
+// v2.0.2
 //
 // Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -30,7 +30,7 @@
 
   var Marionette = Backbone.Marionette = {};
 
-  Marionette.VERSION = '2.0.1';
+  Marionette.VERSION = '2.0.2';
 
   Marionette.noConflict = function() {
     root.Marionette = previousMarionette;
@@ -128,7 +128,7 @@
   // Mix in methods from Underscore, for iteration, and other
   // collection related features.
   // Borrowing this code from Backbone.Collection:
-  // http://backbonejs.org/docs/backbone.html#section-106
+  // http://backbonejs.org/docs/backbone.html#section-121
   Marionette.actAsCollection = function(object, listProperty) {
     var methods = ['forEach', 'each', 'map', 'find', 'detect', 'filter',
       'select', 'reject', 'every', 'all', 'some', 'any', 'include',
@@ -394,7 +394,6 @@
   // modules and routers, and as a mediator for workflow
   // and coordination of other objects, views, and more.
   Marionette.Controller = function(options) {
-    this.triggerMethod = Marionette.triggerMethod;
     this.options = options || {};
 
     if (_.isFunction(this.initialize)) {
@@ -1394,20 +1393,18 @@
     // more control over events being triggered, around the rendering
     // process
     _renderChildren: function() {
-      this.startBuffering();
-
       this.destroyEmptyView();
       this.destroyChildren();
 
-      if (!this.isEmpty(this.collection)) {
+      if (this.isEmpty(this.collection)) {
+        this.showEmptyView();
+      } else {
         this.triggerMethod('before:render:collection', this);
+        this.startBuffering();
         this.showCollection();
+        this.endBuffering();
         this.triggerMethod('render:collection', this);
-      } else {
-        this.showEmptyView();
       }
-
-      this.endBuffering();
     },
 
     // Internal method to loop through collection and show each child view.
@@ -2144,12 +2141,7 @@
       // Wraps several of the view's methods
       // calling the methods first on each behavior
       // and then eventually calling the method on the view.
-      Behaviors.wrap(view, behaviors, [
-        'bindUIElements', 'unbindUIElements',
-        'delegateEvents', 'undelegateEvents',
-        'behaviorEvents', 'triggerMethod',
-        'setElement', 'destroy'
-      ]);
+      Behaviors.wrap(view, behaviors, _.keys(methods));
     }
 
     var methods = {

package.json

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