Skip to content

Commit

Permalink
bump and build v1.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@samccone
samccone committed Feb 3, 2014
1 parent d15634e commit d5b8152
Show file tree
Hide file tree
Showing 36 changed files with 152 additions and 152 deletions.
2 changes: 1 addition & 1 deletion bower.json
View file
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/backbone.marionette.js", "./lib/core/amd/backbone.marionette.js"],
"version" : "1.6.0",
"version" : "1.6.1",

"keywords" : [
"backbone",
Expand Down
4 changes: 2 additions & 2 deletions component.json
View file
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": "1.5.1",
"version": "1.6.1",
"repo": "marionettejs/backbone.marionette",
"main": "lib/core/amd/backbone.marionette.js",
"keywords": [
Expand Down Expand Up @@ -34,6 +34,6 @@
"jashkenas/backbone": "*"
},
"scripts": [
"lib/core/amd/backbone.marionette.js"
"lib/core/amd/backbone.marionette.js"
]
}
4 changes: 2 additions & 2 deletions lib/backbone.marionette.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// MarionetteJS (Backbone.Marionette)
// ----------------------------------
// v1.6.0
// v1.6.1
//
// Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
// Distributed under MIT license
Expand Down Expand Up @@ -2493,7 +2493,7 @@ _.extend(Marionette.Module, {
} else if (_.isObject(def)){
// if an object is supplied
fn = def.define;
startWithParent = def.startWithParent;
startWithParent = (typeof def.startWithParent !== 'undefined') ? def.startWithParent : true;

} else {
// if nothing is supplied
Expand Down
2 changes: 1 addition & 1 deletion lib/backbone.marionette.map
View file

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions lib/core/amd/backbone.marionette.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// MarionetteJS (Backbone.Marionette)
// ----------------------------------
// v1.6.0
// v1.6.1
//
// Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
// Distributed under MIT license
Expand Down Expand Up @@ -2085,7 +2085,7 @@ _.extend(Marionette.Module, {
} else if (_.isObject(def)){
// if an object is supplied
fn = def.define;
startWithParent = def.startWithParent;
startWithParent = (typeof def.startWithParent !== 'undefined') ? def.startWithParent : true;

} else {
// if nothing is supplied
Expand Down
4 changes: 2 additions & 2 deletions lib/core/amd/backbone.marionette.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/core/backbone.marionette.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2049,7 +2049,7 @@ _.extend(Marionette.Module, {
} else if (_.isObject(def)){
// if an object is supplied
fn = def.define;
startWithParent = def.startWithParent;
startWithParent = (typeof def.startWithParent !== 'undefined') ? def.startWithParent : true;

} else {
// if nothing is supplied
Expand Down
2 changes: 1 addition & 1 deletion lib/core/backbone.marionette.map
View file

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
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": "1.6.0",
"version": "1.6.1",
"homepage": "https://github.com/marionettejs/backbone.marionette",
"main": "lib/core/amd/backbone.marionette.js",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion reports/coverage.json
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions reports/coverage/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ <h2>
Statements: <span class="metric">98.2% <small>(709 / 722)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;


Branches: <span class="metric">94.68% <small>(267 / 282)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Branches: <span class="metric">94.72% <small>(269 / 284)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;


Functions: <span class="metric">98.92% <small>(184 / 186)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Expand Down Expand Up @@ -232,8 +232,8 @@ <h2>
<td data-value="98.18" class="pic high"><span class="cover-fill" style="width: 98px;"></span><span class="cover-empty" style="width:2px;"></span></td>
<td data-value="98.18" class="pct high">98.18%</td>
<td data-value="716" class="abs high">(703&nbsp;/&nbsp;716)</td>
<td data-value="94.68" class="pct high">94.68%</td>
<td data-value="282" class="abs high">(267&nbsp;/&nbsp;282)</td>
<td data-value="94.72" class="pct high">94.72%</td>
<td data-value="284" class="abs high">(269&nbsp;/&nbsp;284)</td>
<td data-value="98.92" class="pct high">98.92%</td>
<td data-value="185" class="abs high">(183&nbsp;/&nbsp;185)</td>
<td data-value="98.7" class="pct high">98.7%</td>
Expand All @@ -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 Fri Jan 31 2014 17:14:54 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Feb 02 2014 20:35:12 GMT-0500 (EST)</div>
</div>

<script src="prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion reports/coverage/spec/javascripts/support/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 Fri Jan 31 2014 17:14:54 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Feb 02 2014 20:35:12 GMT-0500 (EST)</div>
</div>

<script src="../../../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion reports/coverage/spec/javascripts/support/marionette.support.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 Fri Jan 31 2014 17:14:54 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Feb 02 2014 20:35:12 GMT-0500 (EST)</div>
</div>

<script src="../../../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion reports/coverage/src/build/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 Fri Jan 31 2014 17:14:54 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Feb 02 2014 20:35:12 GMT-0500 (EST)</div>
</div>

<script src="../../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion reports/coverage/src/build/marionette.core.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 Fri Jan 31 2014 17:14:54 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Feb 02 2014 20:35:12 GMT-0500 (EST)</div>
</div>

<script src="../../prettify.js"></script>
Expand Down
8 changes: 4 additions & 4 deletions reports/coverage/src/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ <h2>
Statements: <span class="metric">98.18% <small>(703 / 716)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;


Branches: <span class="metric">94.68% <small>(267 / 282)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Branches: <span class="metric">94.72% <small>(269 / 284)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;


Functions: <span class="metric">98.92% <small>(183 / 185)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Expand Down Expand Up @@ -362,8 +362,8 @@ <h2>
<td data-value="98.77" class="pic high"><span class="cover-fill" style="width: 98px;"></span><span class="cover-empty" style="width:2px;"></span></td>
<td data-value="98.77" class="pct high">98.77%</td>
<td data-value="81" class="abs high">(80&nbsp;/&nbsp;81)</td>
<td data-value="93.75" class="pct high">93.75%</td>
<td data-value="32" class="abs high">(30&nbsp;/&nbsp;32)</td>
<td data-value="94.12" class="pct high">94.12%</td>
<td data-value="34" class="abs high">(32&nbsp;/&nbsp;34)</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>
Expand Down Expand Up @@ -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 Fri Jan 31 2014 17:14:54 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Feb 02 2014 20:35:12 GMT-0500 (EST)</div>
</div>

<script src="../prettify.js"></script>
Expand Down
46 changes: 23 additions & 23 deletions reports/coverage/src/marionette.application.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,16 +317,16 @@ <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">106</span>
<span class="cline-any cline-yes">106</span>
<span class="cline-any cline-yes">106</span>
<span class="cline-any cline-yes">106</span>
<span class="cline-any cline-yes">106</span>
<span class="cline-any cline-yes">106</span>
<span class="cline-any cline-yes">109</span>
<span class="cline-any cline-yes">109</span>
<span class="cline-any cline-yes">109</span>
<span class="cline-any cline-yes">109</span>
<span class="cline-any cline-yes">109</span>
<span class="cline-any cline-yes">109</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">106</span>
<span class="cline-any cline-yes">109</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">106</span>
<span class="cline-any cline-yes">109</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>
Expand All @@ -346,18 +346,18 @@ <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">75</span>
<span class="cline-any cline-yes">79</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>
<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">41</span>
<span class="cline-any cline-yes">41</span>
<span class="cline-any cline-yes">41</span>
<span class="cline-any cline-yes">44</span>
<span class="cline-any cline-yes">44</span>
<span class="cline-any cline-yes">44</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">41</span>
<span class="cline-any cline-yes">44</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>
Expand Down Expand Up @@ -389,31 +389,31 @@ <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">145</span>
<span class="cline-any cline-yes">148</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">145</span>
<span class="cline-any cline-yes">87</span>
<span class="cline-any cline-yes">148</span>
<span class="cline-any cline-yes">89</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>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">145</span>
<span class="cline-any cline-yes">145</span>
<span class="cline-any cline-yes">148</span>
<span class="cline-any cline-yes">148</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">145</span>
<span class="cline-any cline-yes">148</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>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">106</span>
<span class="cline-any cline-yes">109</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">106</span>
<span class="cline-any cline-yes">109</span>
<span class="cline-any cline-yes">16</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">106</span>
<span class="cline-any cline-yes">109</span>
<span class="cline-any cline-yes">2</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand Down Expand Up @@ -537,7 +537,7 @@ <h2>

</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Fri Jan 31 2014 17:14:54 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Feb 02 2014 20:35:12 GMT-0500 (EST)</div>
</div>

<script src="../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion reports/coverage/src/marionette.approuter.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 Fri Jan 31 2014 17:14:54 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Feb 02 2014 20:35:12 GMT-0500 (EST)</div>
</div>

<script src="../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion reports/coverage/src/marionette.bindEntityEvents.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 Fri Jan 31 2014 17:14:54 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Feb 02 2014 20:35:12 GMT-0500 (EST)</div>
</div>

<script src="../prettify.js"></script>
Expand Down
16 changes: 8 additions & 8 deletions reports/coverage/src/marionette.callbacks.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,8 @@ <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">389</span>
<span class="cline-any cline-yes">389</span>
<span class="cline-any cline-yes">398</span>
<span class="cline-any cline-yes">398</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>
Expand All @@ -261,19 +261,19 @@ <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">235</span>
<span class="cline-any cline-yes">239</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">235</span>
<span class="cline-any cline-yes">120</span>
<span class="cline-any cline-yes">120</span>
<span class="cline-any cline-yes">239</span>
<span class="cline-any cline-yes">124</span>
<span class="cline-any cline-yes">124</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>
<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-neutral">&nbsp;</span>
<span class="cline-any cline-yes">163</span>
<span class="cline-any cline-yes">167</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>
Expand Down Expand Up @@ -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 Fri Jan 31 2014 17:14:54 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Feb 02 2014 20:35:12 GMT-0500 (EST)</div>
</div>

<script src="../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion reports/coverage/src/marionette.collectionview.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1227,7 +1227,7 @@ <h2>

</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Fri Jan 31 2014 17:14:54 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Feb 02 2014 20:35:12 GMT-0500 (EST)</div>
</div>

<script src="../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion reports/coverage/src/marionette.compositeview.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ <h2>

</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Fri Jan 31 2014 17:14:54 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Feb 02 2014 20:35:12 GMT-0500 (EST)</div>
</div>

<script src="../prettify.js"></script>
Expand Down
8 changes: 4 additions & 4 deletions reports/coverage/src/marionette.controller.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,10 @@ <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">184</span>
<span class="cline-any cline-yes">184</span>
<span class="cline-any cline-yes">187</span>
<span class="cline-any cline-yes">187</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">184</span>
<span class="cline-any cline-yes">187</span>
<span class="cline-any cline-yes">7</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand Down Expand Up @@ -288,7 +288,7 @@ <h2>

</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Fri Jan 31 2014 17:14:54 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Feb 02 2014 20:35:12 GMT-0500 (EST)</div>
</div>

<script src="../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion reports/coverage/src/marionette.domRefresh.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 Fri Jan 31 2014 17:14:54 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Feb 02 2014 20:35:12 GMT-0500 (EST)</div>
</div>

<script src="../prettify.js"></script>
Expand Down
Loading

0 comments on commit d5b8152

Please sign in to comment.