v1.2.2 bump and build

marionettejs · Oct 31, 2013 · 6c98ecc · 6c98ecc
1 parent 6485c5b
commit 6c98ecc
Show file tree

Hide file tree

Showing 36 changed files with 105 additions and 70 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.1",
+  "version"     : "1.2.2",
 
   "keywords"     : [
     "backbone",

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,8 @@
+### 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```
+This is needed since backbone views no longer set the view options in the constructor
+
 ### v1.2.1 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v1.2.0...v1.2.1)
 * Views
   * fixed a bug so now view options are {} by default and not undefined.

diff --git a/lib/backbone.marionette.js b/lib/backbone.marionette.js
@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v1.2.1
+// v1.2.2
 //
 // Copyright (c)2013 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -1206,8 +1206,13 @@ Marionette.View = Backbone.View.extend({
     _.bindAll(this, "render");
 
     var args = Array.prototype.slice.apply(arguments);
-    Backbone.View.prototype.constructor.apply(this, args);
+
+    // this exposes view options to the view initializer
+    // this is a backfill since backbone removed the assignment
+    // of this.options
+    // at some point however this may be removed
     this.options = options || {};
+    Backbone.View.prototype.constructor.apply(this, args);
 
     Marionette.MonitorDOMRefresh(this);
     this.listenTo(this, "show", this.onShowCalled, this);

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.1
+// v1.2.2
 //
 // Copyright (c)2013 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -798,8 +798,13 @@ Marionette.View = Backbone.View.extend({
     _.bindAll(this, "render");
 
     var args = Array.prototype.slice.apply(arguments);
-    Backbone.View.prototype.constructor.apply(this, args);
+
+    // this exposes view options to the view initializer
+    // this is a backfill since backbone removed the assignment
+    // of this.options
+    // at some point however this may be removed
     this.options = options || {};
+    Backbone.View.prototype.constructor.apply(this, args);
 
     Marionette.MonitorDOMRefresh(this);
     this.listenTo(this, "show", this.onShowCalled, this);

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
@@ -762,8 +762,13 @@ Marionette.View = Backbone.View.extend({
     _.bindAll(this, "render");
 
     var args = Array.prototype.slice.apply(arguments);
-    Backbone.View.prototype.constructor.apply(this, args);
+
+    // this exposes view options to the view initializer
+    // this is a backfill since backbone removed the assignment
+    // of this.options
+    // at some point however this may be removed
     this.options = options || {};
+    Backbone.View.prototype.constructor.apply(this, args);
 
     Marionette.MonitorDOMRefresh(this);
     this.listenTo(this, "show", this.onShowCalled, this);

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.1",
+  "version": "1.2.2",
   "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
@@ -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 Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <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 Tue Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <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 Tue Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <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 Tue Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <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 Tue Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <script src="../../prettify.js"></script>

diff --git a/reports/coverage/src/index.html b/reports/coverage/src/index.html
@@ -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 Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <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 Tue Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <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 Tue Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <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">2011</span>
+<span class="cline-any cline-yes">2015</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">1001</span>
+<span class="cline-any cline-yes">1003</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">1010</span>
+<span class="cline-any cline-yes">1012</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 Tue Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <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 Tue Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <script src="../prettify.js"></script>

diff --git a/reports/coverage/src/marionette.collectionview.js.html b/reports/coverage/src/marionette.collectionview.js.html
@@ -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 Tue Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <script src="../prettify.js"></script>

diff --git a/reports/coverage/src/marionette.compositeview.js.html b/reports/coverage/src/marionette.compositeview.js.html
@@ -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 Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <script src="../prettify.js"></script>

diff --git a/reports/coverage/src/marionette.controller.js.html b/reports/coverage/src/marionette.controller.js.html
@@ -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 Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <script src="../prettify.js"></script>

diff --git a/reports/coverage/src/marionette.domRefresh.js.html b/reports/coverage/src/marionette.domRefresh.js.html
@@ -272,11 +272,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">498</span>
+<span class="cline-any cline-yes">499</span>
 <span class="cline-any cline-yes">25</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">498</span>
+<span class="cline-any cline-yes">499</span>
 <span class="cline-any cline-yes">374</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -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 Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <script src="../prettify.js"></script>

diff --git a/reports/coverage/src/marionette.helpers.js.html b/reports/coverage/src/marionette.helpers.js.html
@@ -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">3341</span>
-<span class="cline-any cline-yes">3341</span>
+<span class="cline-any cline-yes">3345</span>
+<span class="cline-any cline-yes">3345</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3341</span>
+<span class="cline-any cline-yes">3345</span>
 <span class="cline-any cline-yes">178</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3163</span>
+<span class="cline-any cline-yes">3167</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3341</span>
+<span class="cline-any cline-yes">3345</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
 // -------
@@ -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 Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <script src="../prettify.js"></script>

diff --git a/reports/coverage/src/marionette.itemview.js.html b/reports/coverage/src/marionette.itemview.js.html
@@ -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 Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <script src="../prettify.js"></script>

diff --git a/reports/coverage/src/marionette.layout.js.html b/reports/coverage/src/marionette.layout.js.html
@@ -591,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 Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <script src="../prettify.js"></script>

diff --git a/reports/coverage/src/marionette.module.js.html b/reports/coverage/src/marionette.module.js.html
@@ -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 Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <script src="../prettify.js"></script>

diff --git a/reports/coverage/src/marionette.region.js.html b/reports/coverage/src/marionette.region.js.html
@@ -786,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 Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <script src="../prettify.js"></script>

diff --git a/reports/coverage/src/marionette.regionManager.js.html b/reports/coverage/src/marionette.regionManager.js.html
@@ -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 Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <script src="../prettify.js"></script>

diff --git a/reports/coverage/src/marionette.renderer.js.html b/reports/coverage/src/marionette.renderer.js.html
@@ -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 Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <script src="../prettify.js"></script>

diff --git a/reports/coverage/src/marionette.templatecache.js.html b/reports/coverage/src/marionette.templatecache.js.html
@@ -486,7 +486,7 @@ <h2>
 
 </div>
 <div class="footer">
-    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <script src="../prettify.js"></script>

diff --git a/reports/coverage/src/marionette.triggermethod.js.html b/reports/coverage/src/marionette.triggermethod.js.html
@@ -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 Oct 29 2013 20:51:46 GMT-0400 (EDT)</div>
+    <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>
 
 <script src="../prettify.js"></script>