v1.2.3 bump and build

marionettejs · Nov 14, 2013 · 3761df5 · 3761df5
1 parent cf0491e
commit 3761df5
Show file tree

Hide file tree

Showing 36 changed files with 166 additions and 126 deletions.
diff --git a/bower.json b/bower.json
@@ -3,7 +3,7 @@
   "description" : "Make your Backbone.js apps dance with a composite application architecture!",
   "url"         : "http://marionettejs.org",
   "main"        : "./lib/backbone.marionette.js",
-  "version"     : "1.2.2",
+  "version"     : "1.2.3",
 
   "keywords"     : [
     "backbone",

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,7 @@
+### v1.2.3 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v1.2.2...v1.2.3)
+* CompositeView
+  * Fixed bug where ```child views``` were being added before the initial render, thus raising errors.
+
 ### v1.2.2 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v1.2.1...v1.2.2)
 * Views
 	* Move the instantiation of ```view``` options above the ```constructor``` This allows for view options to be accessed from within the ```initialize``` method for a given ```view```

diff --git a/lib/backbone.marionette.js b/lib/backbone.marionette.js
@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v1.2.2
+// v1.2.3
 //
 // Copyright (c)2013 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -1750,11 +1750,17 @@ Marionette.CompositeView = Marionette.CollectionView.extend({
   // binds to. Override this method to prevent the initial
   // events, or to add your own initial events.
   _initialEvents: function(){
-    if (this.collection){
-      this.listenTo(this.collection, "add", this.addChildView, this);
-      this.listenTo(this.collection, "remove", this.removeItemView, this);
-      this.listenTo(this.collection, "reset", this._renderChildren, this);
-    }
+
+    // Bind only after composite view in rendered to avoid adding child views
+    // to unexisting itemViewContainer
+    this.once('render', function () {
+      if (this.collection){
+        this.listenTo(this.collection, "add", this.addChildView, this);
+        this.listenTo(this.collection, "remove", this.removeItemView, this);
+        this.listenTo(this.collection, "reset", this._renderChildren, this);
+      }
+    });
+
   },
 
   // Retrieve the `itemView` to be used when rendering each of

diff --git a/lib/backbone.marionette.map b/lib/backbone.marionette.map
diff --git a/lib/backbone.marionette.min.js b/lib/backbone.marionette.min.js
diff --git a/lib/core/amd/backbone.marionette.js b/lib/core/amd/backbone.marionette.js
@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v1.2.2
+// v1.2.3
 //
 // Copyright (c)2013 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -1342,11 +1342,17 @@ Marionette.CompositeView = Marionette.CollectionView.extend({
   // binds to. Override this method to prevent the initial
   // events, or to add your own initial events.
   _initialEvents: function(){
-    if (this.collection){
-      this.listenTo(this.collection, "add", this.addChildView, this);
-      this.listenTo(this.collection, "remove", this.removeItemView, this);
-      this.listenTo(this.collection, "reset", this._renderChildren, this);
-    }
+
+    // Bind only after composite view in rendered to avoid adding child views
+    // to unexisting itemViewContainer
+    this.once('render', function () {
+      if (this.collection){
+        this.listenTo(this.collection, "add", this.addChildView, this);
+        this.listenTo(this.collection, "remove", this.removeItemView, this);
+        this.listenTo(this.collection, "reset", this._renderChildren, this);
+      }
+    });
+
   },
 
   // Retrieve the `itemView` to be used when rendering each of

diff --git a/lib/core/amd/backbone.marionette.min.js b/lib/core/amd/backbone.marionette.min.js
diff --git a/lib/core/backbone.marionette.js b/lib/core/backbone.marionette.js
@@ -1306,11 +1306,17 @@ Marionette.CompositeView = Marionette.CollectionView.extend({
   // binds to. Override this method to prevent the initial
   // events, or to add your own initial events.
   _initialEvents: function(){
-    if (this.collection){
-      this.listenTo(this.collection, "add", this.addChildView, this);
-      this.listenTo(this.collection, "remove", this.removeItemView, this);
-      this.listenTo(this.collection, "reset", this._renderChildren, this);
-    }
+
+    // Bind only after composite view in rendered to avoid adding child views
+    // to unexisting itemViewContainer
+    this.once('render', function () {
+      if (this.collection){
+        this.listenTo(this.collection, "add", this.addChildView, this);
+        this.listenTo(this.collection, "remove", this.removeItemView, this);
+        this.listenTo(this.collection, "reset", this._renderChildren, this);
+      }
+    });
+
   },
 
   // Retrieve the `itemView` to be used when rendering each of

diff --git a/lib/core/backbone.marionette.map b/lib/core/backbone.marionette.map
diff --git a/lib/core/backbone.marionette.min.js b/lib/core/backbone.marionette.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "backbone.marionette",
   "description": "Make your Backbone.js apps dance!",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "homepage": "https://github.com/marionettejs/backbone.marionette",
   "main": "lib/core/amd/backbone.marionette.js",
   "keywords": [

diff --git a/reports/coverage.json b/reports/coverage.json
diff --git a/reports/coverage/index.html b/reports/coverage/index.html
@@ -183,16 +183,16 @@
     <h1>Code coverage report for <span class="entity">All files</span></h1>
     <h2>
 
-        Statements: <span class="metric">98.33% <small>(648 / 659)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Statements: <span class="metric">98.33% <small>(649 / 660)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
-        Branches: <span class="metric">94.38% <small>(235 / 249)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Branches: <span class="metric">93.98% <small>(234 / 249)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
-        Functions: <span class="metric">98.84% <small>(170 / 172)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Functions: <span class="metric">98.84% <small>(171 / 173)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
-        Lines: <span class="metric">98.9% <small>(629 / 636)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Lines: <span class="metric">98.9% <small>(630 / 637)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
     </h2>
     <div class="path"></div>
@@ -231,13 +231,13 @@ <h2>
 	<td class="file high" data-value="src/"><a href="src/index.html">src/</a></td>
 	<td data-value="98.32" class="pic high"><span class="cover-fill" style="width: 98px;"></span><span class="cover-empty" style="width:2px;"></span></td>
 	<td data-value="98.32" class="pct high">98.32%</td>
-	<td data-value="653" class="abs high">(642&nbsp;/&nbsp;653)</td>
-	<td data-value="94.38" class="pct high">94.38%</td>
-	<td data-value="249" class="abs high">(235&nbsp;/&nbsp;249)</td>
-	<td data-value="98.83" class="pct high">98.83%</td>
-	<td data-value="171" class="abs high">(169&nbsp;/&nbsp;171)</td>
+	<td data-value="654" class="abs high">(643&nbsp;/&nbsp;654)</td>
+	<td data-value="93.98" class="pct high">93.98%</td>
+	<td data-value="249" class="abs high">(234&nbsp;/&nbsp;249)</td>
+	<td data-value="98.84" class="pct high">98.84%</td>
+	<td data-value="172" class="abs high">(170&nbsp;/&nbsp;172)</td>
 	<td data-value="98.89" class="pct high">98.89%</td>
-	<td data-value="630" class="abs high">(623&nbsp;/&nbsp;630)</td>
+	<td data-value="631" class="abs high">(624&nbsp;/&nbsp;631)</td>
 	</tr>
 
 <tr>
@@ -258,7 +258,7 @@ <h2>
 </div>
 </div>
 <div class="footer">
-    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Oct 31 2013 17:36:07 GMT-0400 (EDT)</div>
+    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Nov 13 2013 22:13:46 GMT-0500 (EST)</div>
 </div>
 
 <script src="prettify.js"></script>

diff --git a/reports/coverage/spec/javascripts/support/index.html b/reports/coverage/spec/javascripts/support/index.html
@@ -232,7 +232,7 @@ <h2>
 </div>
 </div>
 <div class="footer">
-    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Oct 31 2013 17:36:07 GMT-0400 (EDT)</div>
+    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Nov 13 2013 22:13:46 GMT-0500 (EST)</div>
 </div>
 
 <script src="../../../prettify.js"></script>

diff --git a/reports/coverage/spec/javascripts/support/marionette.support.js.html b/reports/coverage/spec/javascripts/support/marionette.support.js.html
@@ -207,7 +207,7 @@ <h2>
 
 </div>
 <div class="footer">
-    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Oct 31 2013 17:36:07 GMT-0400 (EDT)</div>
+    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Nov 13 2013 22:13:46 GMT-0500 (EST)</div>
 </div>
 
 <script src="../../../prettify.js"></script>

diff --git a/reports/coverage/src/build/index.html b/reports/coverage/src/build/index.html
@@ -232,7 +232,7 @@ <h2>
 </div>
 </div>
 <div class="footer">
-    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Oct 31 2013 17:36:07 GMT-0400 (EDT)</div>
+    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Nov 13 2013 22:13:46 GMT-0500 (EST)</div>
 </div>
 
 <script src="../../prettify.js"></script>

diff --git a/reports/coverage/src/build/marionette.core.js.html b/reports/coverage/src/build/marionette.core.js.html
@@ -312,7 +312,7 @@ <h2>
 
 </div>
 <div class="footer">
-    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Oct 31 2013 17:36:07 GMT-0400 (EDT)</div>
+    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Nov 13 2013 22:13:46 GMT-0500 (EST)</div>
 </div>
 
 <script src="../../prettify.js"></script>

diff --git a/reports/coverage/src/index.html b/reports/coverage/src/index.html
@@ -183,16 +183,16 @@
     <h1>Code coverage report for <span class="entity">src/</span></h1>
     <h2>
 
-        Statements: <span class="metric">98.32% <small>(642 / 653)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Statements: <span class="metric">98.32% <small>(643 / 654)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
-        Branches: <span class="metric">94.38% <small>(235 / 249)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Branches: <span class="metric">93.98% <small>(234 / 249)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
-        Functions: <span class="metric">98.83% <small>(169 / 171)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Functions: <span class="metric">98.84% <small>(170 / 172)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
-        Lines: <span class="metric">98.89% <small>(623 / 630)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Lines: <span class="metric">98.89% <small>(624 / 631)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
     </h2>
     <div class="path"><a href="../index.html">All files</a> &#187; src/</div>
@@ -281,15 +281,15 @@ <h2>
 
 <tr>
 	<td class="file high" data-value="marionette.compositeview.js"><a href="marionette.compositeview.js.html">marionette.compositeview.js</a></td>
-	<td data-value="98" class="pic high"><span class="cover-fill" style="width: 98px;"></span><span class="cover-empty" style="width:2px;"></span></td>
-	<td data-value="98" class="pct high">98%</td>
-	<td data-value="50" class="abs high">(49&nbsp;/&nbsp;50)</td>
-	<td data-value="90" class="pct high">90%</td>
-	<td data-value="20" class="abs high">(18&nbsp;/&nbsp;20)</td>
+	<td data-value="98.04" class="pic high"><span class="cover-fill" style="width: 98px;"></span><span class="cover-empty" style="width:2px;"></span></td>
+	<td data-value="98.04" class="pct high">98.04%</td>
+	<td data-value="51" class="abs high">(50&nbsp;/&nbsp;51)</td>
+	<td data-value="85" class="pct high">85%</td>
+	<td data-value="20" class="abs high">(17&nbsp;/&nbsp;20)</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="10" class="abs high">(10&nbsp;/&nbsp;10)</td>
-	<td data-value="98" class="pct high">98%</td>
-	<td data-value="50" class="abs high">(49&nbsp;/&nbsp;50)</td>
+	<td data-value="11" class="abs high">(11&nbsp;/&nbsp;11)</td>
+	<td data-value="98.04" class="pct high">98.04%</td>
+	<td data-value="51" class="abs high">(50&nbsp;/&nbsp;51)</td>
 	</tr>
 
 <tr>
@@ -453,7 +453,7 @@ <h2>
 </div>
 </div>
 <div class="footer">
-    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Oct 31 2013 17:36:07 GMT-0400 (EDT)</div>
+    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Nov 13 2013 22:13:46 GMT-0500 (EST)</div>
 </div>
 
 <script src="../prettify.js"></script>

diff --git a/reports/coverage/src/marionette.application.js.html b/reports/coverage/src/marionette.application.js.html
@@ -516,7 +516,7 @@ <h2>
 
 </div>
 <div class="footer">
-    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Oct 31 2013 17:36:07 GMT-0400 (EDT)</div>
+    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Nov 13 2013 22:13:46 GMT-0500 (EST)</div>
 </div>
 
 <script src="../prettify.js"></script>

diff --git a/reports/coverage/src/marionette.approuter.js.html b/reports/coverage/src/marionette.approuter.js.html
@@ -399,7 +399,7 @@ <h2>
 
 </div>
 <div class="footer">
-    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Oct 31 2013 17:36:07 GMT-0400 (EDT)</div>
+    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Nov 13 2013 22:13:46 GMT-0500 (EST)</div>
 </div>
 
 <script src="../prettify.js"></script>

diff --git a/reports/coverage/src/marionette.bindEntityEvents.js.html b/reports/coverage/src/marionette.bindEntityEvents.js.html
@@ -348,7 +348,7 @@ <h2>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1</span>
-<span class="cline-any cline-yes">2015</span>
+<span class="cline-any cline-yes">2031</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">74</span>
@@ -371,11 +371,11 @@ <h2>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1</span>
-<span class="cline-any cline-yes">1003</span>
+<span class="cline-any cline-yes">1011</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1</span>
-<span class="cline-any cline-yes">1012</span>
+<span class="cline-any cline-yes">1020</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -474,7 +474,7 @@ <h2>
 
 </div>
 <div class="footer">
-    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Oct 31 2013 17:36:07 GMT-0400 (EDT)</div>
+    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Nov 13 2013 22:13:46 GMT-0500 (EST)</div>
 </div>
 
 <script src="../prettify.js"></script>

diff --git a/reports/coverage/src/marionette.callbacks.js.html b/reports/coverage/src/marionette.callbacks.js.html
@@ -339,7 +339,7 @@ <h2>
 
 </div>
 <div class="footer">
-    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Oct 31 2013 17:36:07 GMT-0400 (EDT)</div>
+    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Nov 13 2013 22:13:46 GMT-0500 (EST)</div>
 </div>
 
 <script src="../prettify.js"></script>

diff --git a/reports/coverage/src/marionette.collectionview.js.html b/reports/coverage/src/marionette.collectionview.js.html
@@ -479,11 +479,11 @@ <h2>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">139</span>
+<span class="cline-any cline-yes">143</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">139</span>
+<span class="cline-any cline-yes">143</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">139</span>
+<span class="cline-any cline-yes">143</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -710,7 +710,7 @@ <h2>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">139</span>
+<span class="cline-any cline-yes">143</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1008,7 +1008,7 @@ <h2>
 
 </div>
 <div class="footer">
-    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Oct 31 2013 17:36:07 GMT-0400 (EDT)</div>
+    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Nov 13 2013 22:13:46 GMT-0500 (EST)</div>
 </div>
 
 <script src="../prettify.js"></script>