Skip to content

Commit

Permalink
Bump and build 1.6.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamesplease
jamesplease committed Mar 4, 2014
1 parent 5006992 commit b20f629
Show file tree
Hide file tree
Showing 37 changed files with 147 additions and 143 deletions.
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"./lib/backbone.marionette.js",
"./lib/core/amd/backbone.marionette.js"
],
"version": "1.6.3",
"version": "1.6.4",
"keywords": [
"backbone",
"framework",
Expand Down
4 changes: 4 additions & 0 deletions changelog.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### v1.6.4 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v1.6.3...v1.6.4)
* Fixes
* Patches a bug that would cause modules to be initialized twice when a custom module class is passed

### v1.6.3 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v1.6.2...v1.6.3)
* Improvements
* Enable more direct module instantiation on `Marionette.App`.
Expand Down
2 changes: 1 addition & 1 deletion 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.6.3",
"version": "1.6.4",
"repo": "marionettejs/backbone.marionette",
"main": "lib/core/amd/backbone.marionette.js",
"keywords": [
Expand Down
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.3
// v1.6.4
//
// Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
// Distributed under MIT license
Expand Down Expand Up @@ -2505,7 +2505,7 @@ _.extend(Marionette.Module, {
var fn;
var startWithParent;

if (_.isFunction(def)){
if (_.isFunction(def) && !(def.prototype instanceof Marionette.Module)){
// if a function is supplied for the module definition
fn = def;
startWithParent = true;
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.3
// v1.6.4
//
// Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
// Distributed under MIT license
Expand Down Expand Up @@ -2095,7 +2095,7 @@ _.extend(Marionette.Module, {
var fn;
var startWithParent;

if (_.isFunction(def)){
if (_.isFunction(def) && !(def.prototype instanceof Marionette.Module)){
// if a function is supplied for the module definition
fn = def;
startWithParent = true;
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 @@ -2059,7 +2059,7 @@ _.extend(Marionette.Module, {
var fn;
var startWithParent;

if (_.isFunction(def)){
if (_.isFunction(def) && !(def.prototype instanceof Marionette.Module)){
// if a function is supplied for the module definition
fn = def;
startWithParent = true;
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.3",
"version": "1.6.4",
"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.48% <small>(712 / 723)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;


Branches: <span class="metric">94.76% <small>(271 / 286)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Branches: <span class="metric">94.79% <small>(273 / 288)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;


Functions: <span class="metric">98.94% <small>(187 / 189)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Expand Down Expand Up @@ -232,8 +232,8 @@ <h2>
<td data-value="98.47" class="pic high"><span class="cover-fill" style="width: 98px;"></span><span class="cover-empty" style="width:2px;"></span></td>
<td data-value="98.47" class="pct high">98.47%</td>
<td data-value="717" class="abs high">(706&nbsp;/&nbsp;717)</td>
<td data-value="94.76" class="pct high">94.76%</td>
<td data-value="286" class="abs high">(271&nbsp;/&nbsp;286)</td>
<td data-value="94.79" class="pct high">94.79%</td>
<td data-value="288" class="abs high">(273&nbsp;/&nbsp;288)</td>
<td data-value="98.94" class="pct high">98.94%</td>
<td data-value="188" class="abs high">(186&nbsp;/&nbsp;188)</td>
<td data-value="98.99" class="pct high">98.99%</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 Feb 28 2014 18:05:15 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 04 2014 13:27:22 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 Feb 28 2014 18:05:15 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 04 2014 13:27:22 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 Feb 28 2014 18:05:15 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 04 2014 13:27:22 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 Feb 28 2014 18:05:15 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 04 2014 13:27:22 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 Feb 28 2014 18:05:15 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 04 2014 13:27:22 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.47% <small>(706 / 717)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;


Branches: <span class="metric">94.76% <small>(271 / 286)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Branches: <span class="metric">94.79% <small>(273 / 288)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;


Functions: <span class="metric">98.94% <small>(186 / 188)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Expand Down Expand Up @@ -362,8 +362,8 @@ <h2>
<td data-value="98.82" class="pic high"><span class="cover-fill" style="width: 98px;"></span><span class="cover-empty" style="width:2px;"></span></td>
<td data-value="98.82" class="pct high">98.82%</td>
<td data-value="85" class="abs high">(84&nbsp;/&nbsp;85)</td>
<td data-value="94.44" class="pct high">94.44%</td>
<td data-value="36" class="abs high">(34&nbsp;/&nbsp;36)</td>
<td data-value="94.74" class="pct high">94.74%</td>
<td data-value="38" class="abs high">(36&nbsp;/&nbsp;38)</td>
<td data-value="100" class="pct high">100%</td>
<td data-value="17" class="abs high">(17&nbsp;/&nbsp;17)</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 Feb 28 2014 18:05:15 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 04 2014 13:27:22 GMT-0500 (EST)</div>
</div>

<script src="../prettify.js"></script>
Expand Down
34 changes: 17 additions & 17 deletions reports/coverage/src/marionette.application.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,16 +312,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">121</span>
<span class="cline-any cline-yes">121</span>
<span class="cline-any cline-yes">121</span>
<span class="cline-any cline-yes">121</span>
<span class="cline-any cline-yes">121</span>
<span class="cline-any cline-yes">121</span>
<span class="cline-any cline-yes">123</span>
<span class="cline-any cline-yes">123</span>
<span class="cline-any cline-yes">123</span>
<span class="cline-any cline-yes">123</span>
<span class="cline-any cline-yes">123</span>
<span class="cline-any cline-yes">123</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">121</span>
<span class="cline-any cline-yes">123</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">121</span>
<span class="cline-any cline-yes">123</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 @@ -339,7 +339,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">91</span>
<span class="cline-any cline-yes">93</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 @@ -384,26 +384,26 @@ <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">160</span>
<span class="cline-any cline-yes">162</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">160</span>
<span class="cline-any cline-yes">160</span>
<span class="cline-any cline-yes">162</span>
<span class="cline-any cline-yes">162</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">160</span>
<span class="cline-any cline-yes">162</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">121</span>
<span class="cline-any cline-yes">123</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">121</span>
<span class="cline-any cline-yes">123</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">121</span>
<span class="cline-any cline-yes">123</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 @@ -522,7 +522,7 @@ <h2>

</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Fri Feb 28 2014 18:05:15 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 04 2014 13:27:22 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 Feb 28 2014 18:05:15 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 04 2014 13:27:22 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 Feb 28 2014 18:05:15 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 04 2014 13:27:22 GMT-0500 (EST)</div>
</div>

<script src="../prettify.js"></script>
Expand Down
12 changes: 6 additions & 6 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">442</span>
<span class="cline-any cline-yes">442</span>
<span class="cline-any cline-yes">440</span>
<span class="cline-any cline-yes">440</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,9 +261,9 @@ <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">251</span>
<span class="cline-any cline-yes">253</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">251</span>
<span class="cline-any cline-yes">253</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>
Expand All @@ -273,7 +273,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">179</span>
<span class="cline-any cline-yes">181</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 Feb 28 2014 18:05:15 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 04 2014 13:27:22 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 @@ -1224,7 +1224,7 @@ <h2>

</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Fri Feb 28 2014 18:05:15 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 04 2014 13:27:22 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 Feb 28 2014 18:05:15 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 04 2014 13:27:22 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">199</span>
<span class="cline-any cline-yes">199</span>
<span class="cline-any cline-yes">201</span>
<span class="cline-any cline-yes">201</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">199</span>
<span class="cline-any cline-yes">201</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 Feb 28 2014 18:05:15 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 04 2014 13:27:22 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 Feb 28 2014 18:05:15 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 04 2014 13:27:22 GMT-0500 (EST)</div>
</div>

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

</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Fri Feb 28 2014 18:05:15 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 04 2014 13:27:22 GMT-0500 (EST)</div>
</div>

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

</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Fri Feb 28 2014 18:05:15 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 04 2014 13:27:22 GMT-0500 (EST)</div>
</div>

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

</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Fri Feb 28 2014 18:05:15 GMT-0500 (EST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Mar 04 2014 13:27:22 GMT-0500 (EST)</div>
</div>

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

0 comments on commit b20f629

Please sign in to comment.