Skip to content

Commit

Permalink
build v1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Derick Bailey committed Aug 14, 2013
1 parent 888be67 commit b2ef9db
Show file tree
Hide file tree
Showing 33 changed files with 62 additions and 50 deletions.
4 changes: 3 additions & 1 deletion lib/backbone.marionette.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -784,6 +784,7 @@ _.extend(Marionette.Region, {
// ```
//
buildRegion: function(regionConfig, defaultRegionType){

var regionIsString = (typeof regionConfig === "string");
var regionSelectorIsString = (typeof regionConfig.selector === "string");
var regionTypeIsUndefined = (typeof regionConfig.regionType === "undefined");
Expand Down Expand Up @@ -1909,7 +1910,7 @@ Marionette.Layout = Marionette.ItemView.extend({
addRegion: function(name, definition){
var regions = {};
regions[name] = definition;
return this.addRegions(regions)[name];
return this._buildRegions(regions)[name];
},

// Add multiple regions as a {name: definition, name2: def2} object literal
Expand All @@ -1929,6 +1930,7 @@ Marionette.Layout = Marionette.ItemView.extend({
var that = this;

var defaults = {
regionType: Marionette.getOption(this, "regionType"),
parentEl: function(){ return that.$el; }
};

Expand Down
2 changes: 1 addition & 1 deletion lib/backbone.marionette.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/backbone.marionette.min.js
View file

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion lib/core/amd/backbone.marionette.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ _.extend(Marionette.Region, {
// ```
//
buildRegion: function(regionConfig, defaultRegionType){

var regionIsString = (typeof regionConfig === "string");
var regionSelectorIsString = (typeof regionConfig.selector === "string");
var regionTypeIsUndefined = (typeof regionConfig.regionType === "undefined");
Expand Down Expand Up @@ -1501,7 +1502,7 @@ Marionette.Layout = Marionette.ItemView.extend({
addRegion: function(name, definition){
var regions = {};
regions[name] = definition;
return this.addRegions(regions)[name];
return this._buildRegions(regions)[name];
},

// Add multiple regions as a {name: definition, name2: def2} object literal
Expand All @@ -1521,6 +1522,7 @@ Marionette.Layout = Marionette.ItemView.extend({
var that = this;

var defaults = {
regionType: Marionette.getOption(this, "regionType"),
parentEl: function(){ return that.$el; }
};

Expand Down
2 changes: 1 addition & 1 deletion lib/core/amd/backbone.marionette.min.js
View file

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion lib/core/backbone.marionette.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ _.extend(Marionette.Region, {
// ```
//
buildRegion: function(regionConfig, defaultRegionType){

var regionIsString = (typeof regionConfig === "string");
var regionSelectorIsString = (typeof regionConfig.selector === "string");
var regionTypeIsUndefined = (typeof regionConfig.regionType === "undefined");
Expand Down Expand Up @@ -1465,7 +1466,7 @@ Marionette.Layout = Marionette.ItemView.extend({
addRegion: function(name, definition){
var regions = {};
regions[name] = definition;
return this.addRegions(regions)[name];
return this._buildRegions(regions)[name];
},

// Add multiple regions as a {name: definition, name2: def2} object literal
Expand All @@ -1485,6 +1486,7 @@ Marionette.Layout = Marionette.ItemView.extend({
var that = this;

var defaults = {
regionType: Marionette.getOption(this, "regionType"),
parentEl: function(){ return that.$el; }
};

Expand Down
2 changes: 1 addition & 1 deletion lib/core/backbone.marionette.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/core/backbone.marionette.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion reports/coverage.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion reports/coverage/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 Tue Aug 13 2013 10:27:10 GMT-0500 (CDT)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 21:19:17 GMT-0500 (CDT)</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 Tue Aug 13 2013 10:27:10 GMT-0500 (CDT)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 21:19:17 GMT-0500 (CDT)</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 Tue Aug 13 2013 10:27:10 GMT-0500 (CDT)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 21:19:17 GMT-0500 (CDT)</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 Tue Aug 13 2013 10:27:10 GMT-0500 (CDT)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 21:19:17 GMT-0500 (CDT)</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 Tue Aug 13 2013 10:27:10 GMT-0500 (CDT)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 21:19:17 GMT-0500 (CDT)</div>
</div>

<script src="../../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion reports/coverage/src/index.html
View file
Original file line number Diff line number Diff line change
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 Tue Aug 13 2013 10:27:10 GMT-0500 (CDT)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 21:19:17 GMT-0500 (CDT)</div>
</div>

<script src="../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion reports/coverage/src/marionette.application.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 Tue Aug 13 2013 10:27:10 GMT-0500 (CDT)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 21:19:17 GMT-0500 (CDT)</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 Tue Aug 13 2013 10:27:10 GMT-0500 (CDT)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 21:19:17 GMT-0500 (CDT)</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 Tue Aug 13 2013 10:27:10 GMT-0500 (CDT)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 21:19:17 GMT-0500 (CDT)</div>
</div>

<script src="../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion reports/coverage/src/marionette.callbacks.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 Tue Aug 13 2013 10:27:10 GMT-0500 (CDT)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 21:19:17 GMT-0500 (CDT)</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 @@ -993,7 +993,7 @@ <h2>

</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 10:27:10 GMT-0500 (CDT)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 21:19:17 GMT-0500 (CDT)</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 @@ -615,7 +615,7 @@ <h2>

</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 10:27:10 GMT-0500 (CDT)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 21:19:17 GMT-0500 (CDT)</div>
</div>

<script src="../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion reports/coverage/src/marionette.controller.js.html
View file
Original file line number Diff line number Diff line change
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 Tue Aug 13 2013 10:27:10 GMT-0500 (CDT)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 21:19:17 GMT-0500 (CDT)</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 @@ -327,7 +327,7 @@ <h2>

</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 10:27:10 GMT-0500 (CDT)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 21:19:17 GMT-0500 (CDT)</div>
</div>

<script src="../prettify.js"></script>
Expand Down
14 changes: 7 additions & 7 deletions reports/coverage/src/marionette.helpers.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,16 +264,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">3260</span>
<span class="cline-any cline-yes">3260</span>
<span class="cline-any cline-yes">3303</span>
<span class="cline-any cline-yes">3303</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">3260</span>
<span class="cline-any cline-yes">184</span>
<span class="cline-any cline-yes">3303</span>
<span class="cline-any cline-yes">178</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">3076</span>
<span class="cline-any cline-yes">3125</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">3260</span>
<span class="cline-any cline-yes">3303</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
// -------
Expand Down Expand Up @@ -318,7 +318,7 @@ <h2>

</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 10:27:10 GMT-0500 (CDT)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 21:19:17 GMT-0500 (CDT)</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 Tue Aug 13 2013 10:27:10 GMT-0500 (CDT)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 21:19:17 GMT-0500 (CDT)</div>
</div>

<script src="../prettify.js"></script>
Expand Down
13 changes: 8 additions & 5 deletions reports/coverage/src/marionette.layout.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,8 @@ <h2>
126
127
128
129</td><td class="line-coverage"><span class="cline-any cline-neutral">&nbsp;</span>
129
130</td><td class="line-coverage"><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>
Expand Down Expand Up @@ -394,8 +395,8 @@ <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">49</span>
<span class="cline-any cline-yes">49</span>
<span class="cline-any cline-yes">38</span>
<span class="cline-any cline-yes">38</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 All @@ -409,6 +410,7 @@ <h2>
<span class="cline-any cline-yes">49</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">49</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">32</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand Down Expand Up @@ -517,7 +519,7 @@ <h2>
addRegion: function(name, definition){
var regions = {};
regions[name] = definition;
return this.addRegions(regions)[name];
return this._buildRegions(regions)[name];
},
&nbsp;
// Add multiple regions as a {name: definition, name2: def2} object literal
Expand All @@ -537,6 +539,7 @@ <h2>
var that = this;
&nbsp;
var defaults = {
regionType: Marionette.getOption(this, "regionType"),
parentEl: function(){ return that.$el; }
};
&nbsp;
Expand Down Expand Up @@ -588,7 +591,7 @@ <h2>

</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 10:27:10 GMT-0500 (CDT)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 21:19:17 GMT-0500 (CDT)</div>
</div>

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

</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 10:27:10 GMT-0500 (CDT)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 21:19:17 GMT-0500 (CDT)</div>
</div>

<script src="../prettify.js"></script>
Expand Down
19 changes: 11 additions & 8 deletions reports/coverage/src/marionette.region.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,24 +392,25 @@ <h2>
191
192
193
194</td><td class="line-coverage"><span class="cline-any cline-neutral">&nbsp;</span>
194
195</td><td class="line-coverage"><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">1</span>
<span class="cline-any cline-yes">137</span>
<span class="cline-any cline-yes">131</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">137</span>
<span class="cline-any cline-yes">131</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">137</span>
<span class="cline-any cline-yes">131</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">136</span>
<span class="cline-any cline-yes">130</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand All @@ -436,6 +437,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-neutral">&nbsp;</span>
<span class="cline-any cline-yes">104</span>
<span class="cline-any cline-yes">104</span>
<span class="cline-any cline-yes">104</span>
Expand Down Expand Up @@ -464,11 +466,11 @@ <h2>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">104</span>
<span class="cline-any cline-yes">92</span>
<span class="cline-any cline-yes">40</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">104</span>
<span class="cline-any cline-yes">10</span>
<span class="cline-any cline-yes">62</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 @@ -629,6 +631,7 @@ <h2>
// ```
//
buildRegion: function(regionConfig, defaultRegionType){
&nbsp;
var regionIsString = (typeof regionConfig === "string");
var regionSelectorIsString = (typeof regionConfig.selector === "string");
var regionTypeIsUndefined = (typeof regionConfig.regionType === "undefined");
Expand Down Expand Up @@ -783,7 +786,7 @@ <h2>

</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 10:27:10 GMT-0500 (CDT)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 21:19:17 GMT-0500 (CDT)</div>
</div>

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

</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 10:27:10 GMT-0500 (CDT)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 21:19:17 GMT-0500 (CDT)</div>
</div>

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

</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 10:27:10 GMT-0500 (CDT)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Aug 13 2013 21:19:17 GMT-0500 (CDT)</div>
</div>

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

0 comments on commit b2ef9db

Please sign in to comment.