Permalink
Browse files

build v1.0.1

  • Loading branch information...
1 parent 7c16684 commit 4cecfd4e5a2841e259f3a377d3a19930abc42fb8 @derickbailey derickbailey committed Mar 24, 2013
Showing with 103 additions and 91 deletions.
  1. +3 −1 lib/backbone.marionette.js
  2. +1 −1 lib/backbone.marionette.map
  3. +2 −2 lib/backbone.marionette.min.js
  4. +2 −0 lib/core/amd/backbone.marionette.js
  5. +2 −2 lib/core/amd/backbone.marionette.min.js
  6. +2 −0 lib/core/backbone.marionette.js
  7. +1 −1 lib/core/backbone.marionette.map
  8. +2 −2 lib/core/backbone.marionette.min.js
  9. +1 −1 reports/coverage.json
  10. +11 −11 reports/coverage/index.html
  11. +1 −1 reports/coverage/spec/javascripts/support/index.html
  12. +1 −1 reports/coverage/spec/javascripts/support/marionette.support.js.html
  13. +1 −1 reports/coverage/src/build/index.html
  14. +1 −1 reports/coverage/src/build/marionette.core.js.html
  15. +14 −14 reports/coverage/src/index.html
  16. +1 −1 reports/coverage/src/marionette.application.js.html
  17. +1 −1 reports/coverage/src/marionette.approuter.js.html
  18. +1 −1 reports/coverage/src/marionette.bindEntityEvents.js.html
  19. +1 −1 reports/coverage/src/marionette.callbacks.js.html
  20. +1 −1 reports/coverage/src/marionette.collectionview.js.html
  21. +1 −1 reports/coverage/src/marionette.compositeview.js.html
  22. +1 −1 reports/coverage/src/marionette.controller.js.html
  23. +1 −1 reports/coverage/src/marionette.domRefresh.js.html
  24. +6 −6 reports/coverage/src/marionette.helpers.js.html
  25. +1 −1 reports/coverage/src/marionette.itemview.js.html
  26. +1 −1 reports/coverage/src/marionette.layout.js.html
  27. +1 −1 reports/coverage/src/marionette.module.js.html
  28. +25 −25 reports/coverage/src/marionette.region.js.html
  29. +12 −6 reports/coverage/src/marionette.regionManager.js.html
  30. +1 −1 reports/coverage/src/marionette.renderer.js.html
  31. +1 −1 reports/coverage/src/marionette.templatecache.js.html
  32. +1 −1 reports/coverage/src/marionette.triggermethod.js.html
  33. +1 −1 reports/coverage/src/marionette.view.js.html
@@ -1,6 +1,6 @@
// MarionetteJS (Backbone.Marionette)
// ----------------------------------
-// v1.0.0
+// v1.0.1
//
// Copyright (c)2013 Derick Bailey, Muted Solutions, LLC.
// Distributed under MIT license
@@ -1007,6 +1007,8 @@ Marionette.RegionManager = (function(Marionette){
if (isString || (isObject && hasSelector)){
region = Marionette.Region.buildRegion(definition, Marionette.Region);
+ } else if (_.isFunction(definition)){
+ region = Marionette.Region.buildRegion(definition, Marionette.Region);
} else {
region = definition;
}

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -545,6 +545,8 @@ Marionette.RegionManager = (function(Marionette){
if (isString || (isObject && hasSelector)){
region = Marionette.Region.buildRegion(definition, Marionette.Region);
+ } else if (_.isFunction(definition)){
+ region = Marionette.Region.buildRegion(definition, Marionette.Region);
} else {
region = definition;
}

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -527,6 +527,8 @@ Marionette.RegionManager = (function(Marionette){
if (isString || (isObject && hasSelector)){
region = Marionette.Region.buildRegion(definition, Marionette.Region);
+ } else if (_.isFunction(definition)){
+ region = Marionette.Region.buildRegion(definition, Marionette.Region);
} else {
region = definition;
}

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -181,16 +181,16 @@
<h1>Code coverage report for <span class='entity'>All files</span></h1>
<h2>
- Statements: <span class='metric'>98.25% <small>(616 / 627)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+ Statements: <span class='metric'>98.41% <small>(619 / 629)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
- Branches: <span class='metric'>93.67% <small>(207 / 221)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+ Branches: <span class='metric'>94.17% <small>(210 / 223)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Functions: <span class='metric'>98.79% <small>(163 / 165)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
- Lines: <span class='metric'>98.84% <small>(598 / 605)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+ Lines: <span class='metric'>99.01% <small>(601 / 607)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
</h2>
<div class="path"></div>
@@ -227,15 +227,15 @@
<tr>
<td class="file high" data-value="src/"><a href="src/index.html">src/</a></td>
- <td data-value="98.23" class="pic high"><span class="cover-fill" style="width: 98px;"></span><span class="cover-empty" style="width:2px;"></span></td>
- <td data-value="98.23" class="pct high">98.23%</td>
- <td data-value="620" class="abs high">(609&nbsp;/&nbsp;620)</td>
- <td data-value="93.67" class="pct high">93.67%</td>
- <td data-value="221" class="abs high">(207&nbsp;/&nbsp;221)</td>
+ <td data-value="98.39" class="pic high"><span class="cover-fill" style="width: 98px;"></span><span class="cover-empty" style="width:2px;"></span></td>
+ <td data-value="98.39" class="pct high">98.39%</td>
+ <td data-value="622" class="abs high">(612&nbsp;/&nbsp;622)</td>
+ <td data-value="94.17" class="pct high">94.17%</td>
+ <td data-value="223" class="abs high">(210&nbsp;/&nbsp;223)</td>
<td data-value="98.78" class="pct high">98.78%</td>
<td data-value="164" class="abs high">(162&nbsp;/&nbsp;164)</td>
- <td data-value="98.83" class="pct high">98.83%</td>
- <td data-value="598" class="abs high">(591&nbsp;/&nbsp;598)</td>
+ <td data-value="99" class="pct high">99%</td>
+ <td data-value="600" class="abs high">(594&nbsp;/&nbsp;600)</td>
</tr>
<tr>
@@ -256,7 +256,7 @@
</div>
</div>
<div class='footer'>
- <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sat Mar 23 2013 13:11:51 GMT-0500 (CDT)</div>
+ <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sun Mar 24 2013 14:29:29 GMT-0500 (CDT)</div>
</div>
</body>
@@ -230,7 +230,7 @@
</div>
</div>
<div class='footer'>
- <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sat Mar 23 2013 13:11:51 GMT-0500 (CDT)</div>
+ <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sun Mar 24 2013 14:29:29 GMT-0500 (CDT)</div>
</div>
</body>
@@ -205,7 +205,7 @@
</div>
<div class='footer'>
- <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sat Mar 23 2013 13:11:51 GMT-0500 (CDT)</div>
+ <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sun Mar 24 2013 14:29:29 GMT-0500 (CDT)</div>
</div>
</body>
@@ -230,7 +230,7 @@
</div>
</div>
<div class='footer'>
- <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sat Mar 23 2013 13:11:51 GMT-0500 (CDT)</div>
+ <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sun Mar 24 2013 14:29:29 GMT-0500 (CDT)</div>
</div>
</body>
@@ -310,7 +310,7 @@
</div>
<div class='footer'>
- <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sat Mar 23 2013 13:11:51 GMT-0500 (CDT)</div>
+ <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sun Mar 24 2013 14:29:29 GMT-0500 (CDT)</div>
</div>
</body>
@@ -181,16 +181,16 @@
<h1>Code coverage report for <span class='entity'>src/</span></h1>
<h2>
- Statements: <span class='metric'>98.23% <small>(609 / 620)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+ Statements: <span class='metric'>98.39% <small>(612 / 622)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
- Branches: <span class='metric'>93.67% <small>(207 / 221)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+ Branches: <span class='metric'>94.17% <small>(210 / 223)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Functions: <span class='metric'>98.78% <small>(162 / 164)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
- Lines: <span class='metric'>98.83% <small>(591 / 598)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+ Lines: <span class='metric'>99% <small>(594 / 600)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
</h2>
<div class="path"><a href="../index.html">All files</a> &#187; src/</div>
@@ -370,28 +370,28 @@
<tr>
<td class="file high" data-value="marionette.region.js"><a href="marionette.region.js.html">marionette.region.js</a></td>
- <td data-value="96.83" class="pic high"><span class="cover-fill" style="width: 96px;"></span><span class="cover-empty" style="width:4px;"></span></td>
- <td data-value="96.83" class="pct high">96.83%</td>
- <td data-value="63" class="abs high">(61&nbsp;/&nbsp;63)</td>
- <td data-value="92.68" class="pct high">92.68%</td>
- <td data-value="41" class="abs high">(38&nbsp;/&nbsp;41)</td>
+ <td data-value="98.41" class="pic high"><span class="cover-fill" style="width: 98px;"></span><span class="cover-empty" style="width:2px;"></span></td>
+ <td data-value="98.41" class="pct high">98.41%</td>
+ <td data-value="63" class="abs high">(62&nbsp;/&nbsp;63)</td>
+ <td data-value="95.12" class="pct high">95.12%</td>
+ <td data-value="41" class="abs high">(39&nbsp;/&nbsp;41)</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="96.67" class="pct high">96.67%</td>
- <td data-value="60" class="abs high">(58&nbsp;/&nbsp;60)</td>
+ <td data-value="98.33" class="pct high">98.33%</td>
+ <td data-value="60" class="abs high">(59&nbsp;/&nbsp;60)</td>
</tr>
<tr>
<td class="file high" data-value="marionette.regionManager.js"><a href="marionette.regionManager.js.html">marionette.regionManager.js</a></td>
<td data-value="100" class="pic high"><span class="cover-fill cover-full" style="width: 100px;"></span><span class="cover-empty" style="width:0px;"></span></td>
<td data-value="100" class="pct high">100%</td>
- <td data-value="45" class="abs high">(45&nbsp;/&nbsp;45)</td>
+ <td data-value="47" class="abs high">(47&nbsp;/&nbsp;47)</td>
<td data-value="100" class="pct high">100%</td>
- <td data-value="9" class="abs high">(9&nbsp;/&nbsp;9)</td>
+ <td data-value="11" class="abs high">(11&nbsp;/&nbsp;11)</td>
<td data-value="100" class="pct high">100%</td>
<td data-value="16" class="abs high">(16&nbsp;/&nbsp;16)</td>
<td data-value="100" class="pct high">100%</td>
- <td data-value="45" class="abs high">(45&nbsp;/&nbsp;45)</td>
+ <td data-value="47" class="abs high">(47&nbsp;/&nbsp;47)</td>
</tr>
<tr>
@@ -451,7 +451,7 @@
</div>
</div>
<div class='footer'>
- <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sat Mar 23 2013 13:11:51 GMT-0500 (CDT)</div>
+ <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sun Mar 24 2013 14:29:29 GMT-0500 (CDT)</div>
</div>
</body>
@@ -478,7 +478,7 @@
</div>
<div class='footer'>
- <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sat Mar 23 2013 13:11:51 GMT-0500 (CDT)</div>
+ <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sun Mar 24 2013 14:29:29 GMT-0500 (CDT)</div>
</div>
</body>
@@ -343,7 +343,7 @@
</div>
<div class='footer'>
- <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sat Mar 23 2013 13:11:51 GMT-0500 (CDT)</div>
+ <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sun Mar 24 2013 14:29:29 GMT-0500 (CDT)</div>
</div>
</body>
@@ -472,7 +472,7 @@
</div>
<div class='footer'>
- <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sat Mar 23 2013 13:11:51 GMT-0500 (CDT)</div>
+ <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sun Mar 24 2013 14:29:29 GMT-0500 (CDT)</div>
</div>
</body>
@@ -337,7 +337,7 @@
</div>
<div class='footer'>
- <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sat Mar 23 2013 13:11:51 GMT-0500 (CDT)</div>
+ <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sun Mar 24 2013 14:29:29 GMT-0500 (CDT)</div>
</div>
</body>
@@ -991,7 +991,7 @@
</div>
<div class='footer'>
- <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sat Mar 23 2013 13:11:51 GMT-0500 (CDT)</div>
+ <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sun Mar 24 2013 14:29:29 GMT-0500 (CDT)</div>
</div>
</body>
@@ -607,7 +607,7 @@
</div>
<div class='footer'>
- <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sat Mar 23 2013 13:11:51 GMT-0500 (CDT)</div>
+ <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sun Mar 24 2013 14:29:29 GMT-0500 (CDT)</div>
</div>
</body>
@@ -286,7 +286,7 @@
</div>
<div class='footer'>
- <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sat Mar 23 2013 13:11:51 GMT-0500 (CDT)</div>
+ <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sun Mar 24 2013 14:29:29 GMT-0500 (CDT)</div>
</div>
</body>
@@ -325,7 +325,7 @@
</div>
<div class='footer'>
- <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sat Mar 23 2013 13:11:51 GMT-0500 (CDT)</div>
+ <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sun Mar 24 2013 14:29:29 GMT-0500 (CDT)</div>
</div>
</body>
@@ -262,16 +262,16 @@
<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">2982</span>
-<span class="cline-any cline-yes">2982</span>
+<span class="cline-any cline-yes">2984</span>
+<span class="cline-any cline-yes">2984</span>
<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2982</span>
+<span class="cline-any cline-yes">2984</span>
<span class="cline-any cline-yes">165</span>
<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2817</span>
+<span class="cline-any cline-yes">2819</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2982</span>
+<span class="cline-any cline-yes">2984</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">// Helpers
// -------
@@ -316,7 +316,7 @@
</div>
<div class='footer'>
- <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sat Mar 23 2013 13:11:51 GMT-0500 (CDT)</div>
+ <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sun Mar 24 2013 14:29:29 GMT-0500 (CDT)</div>
</div>
</body>
@@ -403,7 +403,7 @@
</div>
<div class='footer'>
- <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sat Mar 23 2013 13:11:51 GMT-0500 (CDT)</div>
+ <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sun Mar 24 2013 14:29:29 GMT-0500 (CDT)</div>
</div>
</body>
@@ -580,7 +580,7 @@
</div>
<div class='footer'>
- <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sat Mar 23 2013 13:11:51 GMT-0500 (CDT)</div>
+ <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sun Mar 24 2013 14:29:29 GMT-0500 (CDT)</div>
</div>
</body>
@@ -823,7 +823,7 @@
</div>
<div class='footer'>
- <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sat Mar 23 2013 13:11:51 GMT-0500 (CDT)</div>
+ <div class='meta'>Generated by <a href='http://istanbul-js.org' target='_blank'>istanbul</a> at Sun Mar 24 2013 14:29:29 GMT-0500 (CDT)</div>
</div>
</body>
Oops, something went wrong.

0 comments on commit 4cecfd4

Please sign in to comment.