v1.2.1 bump and build

marionettejs · Oct 30, 2013 · df37891 · df37891
1 parent 7244a74
commit df37891
Show file tree

Hide file tree

Showing 36 changed files with 147 additions and 142 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.0",
+  "version"     : "1.2.1",
 
   "keywords"     : [
     "backbone",

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,8 @@
+### 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.
+  * fixed a bug where the triggers preventDefault and stopPropigaton were executing in the wrong context – triggers now prevent default and stop propigation by default once more.
+
 ### v1.2.0 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v1.1.0...v1.2.0)
 * Update Backbone to [1.1.0](https://github.com/jashkenas/backbone/compare/1.0.0...1.1.0)
 

diff --git a/lib/backbone.marionette.js b/lib/backbone.marionette.js
@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v1.2.0
+// v1.2.1
 //
 // Copyright (c)2013 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -1207,7 +1207,7 @@ Marionette.View = Backbone.View.extend({
 
     var args = Array.prototype.slice.apply(arguments);
     Backbone.View.prototype.constructor.apply(this, args);
-    this.options = options;
+    this.options = options || {};
 
     Marionette.MonitorDOMRefresh(this);
     this.listenTo(this, "show", this.onShowCalled, this);
@@ -1267,8 +1267,8 @@ Marionette.View = Backbone.View.extend({
           var shouldPrevent = hasOptions ? value.preventDefault : prevent;
           var shouldStop = hasOptions ? value.stopPropagation : stop;
 
-          if (shouldPrevent && prevent) { prevent(); }
-          if (shouldStop && stop) { stop(); }
+          if (shouldPrevent && prevent) { prevent.apply(e); }
+          if (shouldStop && stop) { stop.apply(e); }
         }
 
         // build the args for the event

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.0
+// v1.2.1
 //
 // Copyright (c)2013 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -799,7 +799,7 @@ Marionette.View = Backbone.View.extend({
 
     var args = Array.prototype.slice.apply(arguments);
     Backbone.View.prototype.constructor.apply(this, args);
-    this.options = options;
+    this.options = options || {};
 
     Marionette.MonitorDOMRefresh(this);
     this.listenTo(this, "show", this.onShowCalled, this);
@@ -859,8 +859,8 @@ Marionette.View = Backbone.View.extend({
           var shouldPrevent = hasOptions ? value.preventDefault : prevent;
           var shouldStop = hasOptions ? value.stopPropagation : stop;
 
-          if (shouldPrevent && prevent) { prevent(); }
-          if (shouldStop && stop) { stop(); }
+          if (shouldPrevent && prevent) { prevent.apply(e); }
+          if (shouldStop && stop) { stop.apply(e); }
         }
 
         // build the args for the event

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
@@ -763,7 +763,7 @@ Marionette.View = Backbone.View.extend({
 
     var args = Array.prototype.slice.apply(arguments);
     Backbone.View.prototype.constructor.apply(this, args);
-    this.options = options;
+    this.options = options || {};
 
     Marionette.MonitorDOMRefresh(this);
     this.listenTo(this, "show", this.onShowCalled, this);
@@ -823,8 +823,8 @@ Marionette.View = Backbone.View.extend({
           var shouldPrevent = hasOptions ? value.preventDefault : prevent;
           var shouldStop = hasOptions ? value.stopPropagation : stop;
 
-          if (shouldPrevent && prevent) { prevent(); }
-          if (shouldStop && stop) { stop(); }
+          if (shouldPrevent && prevent) { prevent.apply(e); }
+          if (shouldStop && stop) { stop.apply(e); }
         }
 
         // build the args for the event

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.0",
+  "version": "1.2.1",
   "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
@@ -186,7 +186,7 @@ <h2>
         Statements: <span class="metric">98.33% <small>(648 / 659)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
-        Branches: <span class="metric">94.33% <small>(233 / 247)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Branches: <span class="metric">94.38% <small>(235 / 249)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
         Functions: <span class="metric">98.84% <small>(170 / 172)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
@@ -232,8 +232,8 @@ <h2>
 	<td data-value="98.32" class="pic high"><span class="cover-fill" style="width: 98px;"></span><span class="cover-empty" style="width:2px;"></span></td>
 	<td data-value="98.32" class="pct high">98.32%</td>
 	<td data-value="653" class="abs high">(642&nbsp;/&nbsp;653)</td>
-	<td data-value="94.33" class="pct high">94.33%</td>
-	<td data-value="247" class="abs high">(233&nbsp;/&nbsp;247)</td>
+	<td data-value="94.38" class="pct high">94.38%</td>
+	<td data-value="249" class="abs high">(235&nbsp;/&nbsp;249)</td>
 	<td data-value="98.83" class="pct high">98.83%</td>
 	<td data-value="171" class="abs high">(169&nbsp;/&nbsp;171)</td>
 	<td data-value="98.89" class="pct high">98.89%</td>
@@ -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 Mon Oct 21 2013 21:18:52 GMT-0400 (EDT)</div>
+    <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>
 
 <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 Mon Oct 21 2013 21:18:52 GMT-0400 (EDT)</div>
+    <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>
 
 <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 Mon Oct 21 2013 21:18:52 GMT-0400 (EDT)</div>
+    <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>
 
 <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 Mon Oct 21 2013 21:18:52 GMT-0400 (EDT)</div>
+    <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>
 
 <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 Mon Oct 21 2013 21:18:52 GMT-0400 (EDT)</div>
+    <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>
 
 <script src="../../prettify.js"></script>

diff --git a/reports/coverage/src/index.html b/reports/coverage/src/index.html
@@ -186,7 +186,7 @@ <h2>
         Statements: <span class="metric">98.32% <small>(642 / 653)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
-        Branches: <span class="metric">94.33% <small>(233 / 247)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Branches: <span class="metric">94.38% <small>(235 / 249)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
         Functions: <span class="metric">98.83% <small>(169 / 171)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
@@ -440,8 +440,8 @@ <h2>
 	<td data-value="98.59" class="pic high"><span class="cover-fill" style="width: 98px;"></span><span class="cover-empty" style="width:2px;"></span></td>
 	<td data-value="98.59" class="pct high">98.59%</td>
 	<td data-value="71" class="abs high">(70&nbsp;/&nbsp;71)</td>
-	<td data-value="92.11" class="pct high">92.11%</td>
-	<td data-value="38" class="abs high">(35&nbsp;/&nbsp;38)</td>
+	<td data-value="92.5" class="pct high">92.5%</td>
+	<td data-value="40" class="abs high">(37&nbsp;/&nbsp;40)</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="15" class="abs high">(15&nbsp;/&nbsp;15)</td>
 	<td data-value="100" class="pct high">100%</td>
@@ -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 Mon Oct 21 2013 21:18:52 GMT-0400 (EDT)</div>
+    <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>
 
 <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 Mon Oct 21 2013 21:18:52 GMT-0400 (EDT)</div>
+    <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>
 
 <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 Mon Oct 21 2013 21:18:52 GMT-0400 (EDT)</div>
+    <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>
 
 <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">1995</span>
+<span class="cline-any cline-yes">2011</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">993</span>
+<span class="cline-any cline-yes">1001</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">1002</span>
+<span class="cline-any cline-yes">1010</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 Mon Oct 21 2013 21:18:52 GMT-0400 (EDT)</div>
+    <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>
 
 <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 Mon Oct 21 2013 21:18:52 GMT-0400 (EDT)</div>
+    <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>
 
 <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 Mon Oct 21 2013 21:18:52 GMT-0400 (EDT)</div>
+    <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>
 
 <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 Mon Oct 21 2013 21:18:52 GMT-0400 (EDT)</div>
+    <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>
 
 <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 Mon Oct 21 2013 21:18:52 GMT-0400 (EDT)</div>
+    <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>
 
 <script src="../prettify.js"></script>

diff --git a/reports/coverage/src/marionette.domRefresh.js.html b/reports/coverage/src/marionette.domRefresh.js.html
@@ -257,13 +257,13 @@ <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">372</span>
-<span class="cline-any cline-yes">372</span>
+<span class="cline-any cline-yes">374</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>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1</span>
-<span class="cline-any cline-yes">397</span>
+<span class="cline-any cline-yes">399</span>
 <span class="cline-any cline-yes">14</span>
 <span class="cline-any cline-yes">14</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -272,12 +272,12 @@ <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">494</span>
+<span class="cline-any cline-yes">498</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">494</span>
-<span class="cline-any cline-yes">372</span>
+<span class="cline-any cline-yes">498</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>
 <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 Mon Oct 21 2013 21:18:52 GMT-0400 (EDT)</div>
+    <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>
 
 <script src="../prettify.js"></script>

diff --git a/reports/coverage/src/marionette.helpers.js.html b/reports/coverage/src/marionette.helpers.js.html
@@ -243,7 +243,7 @@ <h2>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1</span>
 <span class="cline-any cline-yes">1</span>
-<span class="cline-any cline-yes">1228</span>
+<span class="cline-any cline-yes">1232</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>
@@ -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">3321</span>
-<span class="cline-any cline-yes">3321</span>
+<span class="cline-any cline-yes">3341</span>
+<span class="cline-any cline-yes">3341</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3321</span>
+<span class="cline-any cline-yes">3341</span>
 <span class="cline-any cline-yes">178</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3143</span>
+<span class="cline-any cline-yes">3163</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3321</span>
+<span class="cline-any cline-yes">3341</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 Mon Oct 21 2013 21:18:52 GMT-0400 (EDT)</div>
+    <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>
 
 <script src="../prettify.js"></script>