Merge pull request #2943 from marionettejs/patch

v2.4.5

.jscsrc

@@ -1,4 +1,5 @@
 {
   "preset": "google",
-  "maximumLineLength": 120
-}
+  "maximumLineLength": 120,
+  "disallowSpaceAfterObjectKeys": false
+}

.travis.yml

@@ -15,6 +15,8 @@ matrix:
     - env: UNDERSCORE=1.7 BACKBONE=1.2.3
     - node_js: "0.10"
       env: UNDERSCORE=1.8 BACKBONE=1.2.3
+    - env: UNDERSCORE=1.8 BACKBONE=1.3.2
+    - env: LODASH=3.1 BACKBONE=1.3.2
     - env: LODASH=2.4 BACKBONE=1.1
     - env: LODASH=3.0 BACKBONE=1.1
     - env: LODASH=3.1 BACKBONE=1.0

bower.json

@@ -3,7 +3,7 @@
   "description": "Make your Backbone.js apps dance with a composite application architecture!",
   "homepage": "http://marionettejs.org",
   "main": "./lib/core/backbone.marionette.js",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "keywords": [
     "backbone",
     "framework",
@@ -36,10 +36,9 @@
     "upgradeGuide.md"
   ],
   "dependencies": {
-    "backbone": "1.0.0 - 1.2.3",
+    "backbone": "1.0.0 - 1.3.2",
     "underscore": "1.4.4 - 1.8.3",
     "backbone.babysitter": "^0.1.0",
-    "backbone.wreqr": "^1.0.0",
-    "jquery": "^1.8.0 || ^2.0.0"
+    "backbone.wreqr": "^1.0.0"
   }
 }

changelog.md

@@ -1,3 +1,16 @@
+### v2.4.5 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v2.4.4...v2.4.5)
+
+#### Fixes
+
+* `Marionette.View#ui` will now bind events when names are hyphenated.
+* Nonexistent event handlers now fail silently.
+
+#### Misc
+
+* Updated Backbone dependency to 1.3.2.
+* devDependencies updated.
+* Updated uglify to fix deprecated sourcemap pragma //@ replaced with //#.
+
 ### v2.4.4 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v2.4.3...v2.4.4)
 
 #### Fixes

component.json

@@ -1,7 +1,7 @@
 {
   "name": "backbone.marionette",
   "description": "Make your Backbone.js apps dance!",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "repo": "marionettejs/backbone.marionette",
   "main": "lib/core/backbone.marionette.js",
   "keywords": [
@@ -31,7 +31,7 @@
   "dependencies": {
     "marionettejs/backbone.babysitter": "*",
     "marionettejs/backbone.wreqr": "*",
-    "jashkenas/backbone": "1.0.0 - 1.2.3",
+    "jashkenas/backbone": "1.0.0 - 1.3.2",
     "jashkenas/underscore": "1.4.4 - 1.8.3"
   },
   "scripts": [

lib/backbone.marionette.js

@@ -1,8 +1,8 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v2.4.4
+// v2.4.5
 //
-// Copyright (c)2015 Derick Bailey, Muted Solutions, LLC.
+// Copyright (c)2016 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
 //
 // http://marionettejs.com
@@ -38,9 +38,9 @@
   /* istanbul ignore next */
   // Backbone.BabySitter
   // -------------------
-  // v0.1.10
+  // v0.1.11
   //
-  // Copyright (c)2015 Derick Bailey, Muted Solutions, LLC.
+  // Copyright (c)2016 Derick Bailey, Muted Solutions, LLC.
   // Distributed under MIT license
   //
   // http://github.com/marionettejs/backbone.babysitter
@@ -167,7 +167,7 @@
       // return the public API
       return Container;
     }(Backbone, _);
-    Backbone.ChildViewContainer.VERSION = "0.1.10";
+    Backbone.ChildViewContainer.VERSION = "0.1.11";
     Backbone.ChildViewContainer.noConflict = function() {
       Backbone.ChildViewContainer = previousChildViewContainer;
       return this;
@@ -178,17 +178,17 @@
   /* istanbul ignore next */
   // Backbone.Wreqr (Backbone.Marionette)
   // ----------------------------------
-  // v1.3.5
+  // v1.3.6
   //
-  // Copyright (c)2015 Derick Bailey, Muted Solutions, LLC.
+  // Copyright (c)2016 Derick Bailey, Muted Solutions, LLC.
   // Distributed under MIT license
   //
   // http://github.com/marionettejs/backbone.wreqr
   (function(Backbone, _) {
     "use strict";
     var previousWreqr = Backbone.Wreqr;
     var Wreqr = Backbone.Wreqr = {};
-    Backbone.Wreqr.VERSION = "1.3.5";
+    Backbone.Wreqr.VERSION = "1.3.6";
     Backbone.Wreqr.noConflict = function() {
       Backbone.Wreqr = previousWreqr;
       return this;
@@ -489,7 +489,7 @@
 
   var Marionette = Backbone.Marionette = {};
 
-  Marionette.VERSION = '2.4.4';
+  Marionette.VERSION = '2.4.5';
 
   Marionette.noConflict = function() {
     root.Marionette = previousMarionette;
@@ -577,7 +577,7 @@
   // utility method for parsing @ui. syntax strings
   // into associated selector
   Marionette.normalizeUIString = function(uiString, ui) {
-    return uiString.replace(/@ui\.[a-zA-Z_$0-9]*/g, function(r) {
+    return uiString.replace(/@ui\.[a-zA-Z-_$0-9]*/g, function(r) {
       return ui[r.slice(4)];
     });
   };
@@ -649,7 +649,11 @@
     }
   };
 
-  deprecate._warn = typeof console !== 'undefined' && (console.warn || console.log) || function() {};
+  deprecate._console = typeof console !== 'undefined' ? console : {};
+  deprecate._warn = function() {
+    var warn = deprecate._console.warn || deprecate._console.log || function() {};
+    return warn.apply(deprecate._console, arguments);
+  };
   deprecate._cache = {};
 
   /* jshint maxstatements: 14, maxcomplexity: 7 */
@@ -1114,7 +1118,7 @@
         this.triggerMethod('before:swapOut', this.currentView, this, options);
       }
 
-      if (this.currentView) {
+      if (this.currentView && isDifferentView) {
         delete this.currentView._parent;
       }
 
@@ -3333,7 +3337,7 @@
 
             var eventKey  = eventName + selector;
             var handler   = _.isFunction(behaviour) ? behaviour : b[behaviour];
-
+            if (!handler) { return; }
             _events[eventKey] = _.bind(handler, b);
           }, this);
 

lib/core/backbone.marionette.js

@@ -1,8 +1,8 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v2.4.4
+// v2.4.5
 //
-// Copyright (c)2015 Derick Bailey, Muted Solutions, LLC.
+// Copyright (c)2016 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
 //
 // http://marionettejs.com
@@ -31,7 +31,7 @@
 
   var Marionette = Backbone.Marionette = {};
 
-  Marionette.VERSION = '2.4.4';
+  Marionette.VERSION = '2.4.5';
 
   Marionette.noConflict = function() {
     root.Marionette = previousMarionette;
@@ -124,7 +124,7 @@
   // utility method for parsing @ui. syntax strings
   // into associated selector
   Marionette.normalizeUIString = function(uiString, ui) {
-    return uiString.replace(/@ui\.[a-zA-Z_$0-9]*/g, function(r) {
+    return uiString.replace(/@ui\.[a-zA-Z-_$0-9]*/g, function(r) {
       return ui[r.slice(4)];
     });
   };
@@ -196,7 +196,11 @@
     }
   };
 
-  deprecate._warn = typeof console !== 'undefined' && (console.warn || console.log) || function() {};
+  deprecate._console = typeof console !== 'undefined' ? console : {};
+  deprecate._warn = function() {
+    var warn = deprecate._console.warn || deprecate._console.log || function() {};
+    return warn.apply(deprecate._console, arguments);
+  };
   deprecate._cache = {};
 
   /* jshint maxstatements: 14, maxcomplexity: 7 */
@@ -661,7 +665,7 @@
         this.triggerMethod('before:swapOut', this.currentView, this, options);
       }
 
-      if (this.currentView) {
+      if (this.currentView && isDifferentView) {
         delete this.currentView._parent;
       }
 
@@ -2880,7 +2884,7 @@
 
             var eventKey  = eventName + selector;
             var handler   = _.isFunction(behaviour) ? behaviour : b[behaviour];
-
+            if (!handler) { return; }
             _events[eventKey] = _.bind(handler, b);
           }, this);
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "backbone.marionette",
   "description": "Make your Backbone.js apps dance!",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "homepage": "https://github.com/marionettejs/backbone.marionette",
   "main": "lib/core/backbone.marionette.js",
   "keywords": [
@@ -42,40 +42,40 @@
   "dependencies": {
     "backbone.babysitter": "^0.1.0",
     "backbone.wreqr": "^1.0.0",
-    "backbone": "1.0.0 - 1.2.3",
+    "backbone": "1.0.0 - 1.3.2",
     "underscore": "1.4.4 - 1.8.3"
   },
   "devDependencies": {
-    "chai": "1.9.1",
-    "chai-jq": "0.0.7",
-    "chai-jquery": "1.2.1",
+    "chai": "3.4.1",
+    "chai-jq": "0.0.9",
+    "chai-jquery": "2.0.0",
     "dox": "git://github.com/jasonLaster/dox.git#marked",
     "grunt": "0.4.5",
     "grunt-cli": "0.1.13",
-    "grunt-contrib-clean": "0.5.0",
-    "grunt-contrib-concat": "0.1.2",
-    "grunt-contrib-connect": "0.1.2",
-    "grunt-contrib-jshint": "0.10.0",
-    "grunt-contrib-uglify": "0.2.0",
+    "grunt-contrib-clean": "0.7.0",
+    "grunt-contrib-concat": "0.5.1",
+    "grunt-contrib-connect": "0.11.2",
+    "grunt-contrib-jshint": "0.11.3",
+    "grunt-contrib-uglify": "1.0.1",
     "grunt-contrib-watch": "0.6.1",
-    "grunt-coveralls": "0.3.0",
-    "grunt-env": "0.4.1",
-    "grunt-istanbul": "0.3.0",
-    "grunt-jscs": "^1.5.0",
-    "grunt-lintspaces": "0.7.0",
-    "grunt-mocha-test": "0.10.2",
-    "grunt-plato": "0.1.4",
-    "grunt-preprocess": "4.0.0",
+    "grunt-coveralls": "1.0.0",
+    "grunt-env": "0.4.4",
+    "grunt-istanbul": "0.6.1",
+    "grunt-jscs": "2.6.0",
+    "grunt-lintspaces": "0.7.1",
+    "grunt-mocha-test": "0.12.7",
+    "grunt-plato": "1.2.1",
+    "grunt-preprocess": "5.0.1",
     "grunt-template": "0.2.3",
-    "highlight.js": "8.2.0",
-    "jquery": "2.1.1",
-    "js-yaml": "3.1.0",
-    "jsdom": "2.0.0",
-    "load-grunt-tasks": "0.3.0",
+    "highlight.js": "9.1.0",
+    "jquery": "2.2.0",
+    "js-yaml": "3.5.2",
+    "jsdom": "3.1.2",
+    "load-grunt-tasks": "3.4.0",
     "marked": "0.3",
-    "mocha": "1.19.0",
+    "mocha": "2.3.4",
     "sinon": "1.10.3",
-    "sinon-chai": "2.5.0",
+    "sinon-chai": "2.8.0",
     "unwrap": "0.1.0",
     "grunt-yaml-validate": "~0.1.1"
   }

readme.md

@@ -58,16 +58,15 @@ We're happy to discuss design patterns and learn how you're using Marionette.
 
 ### Key Benefits
 
-* Scalable: applications are built in modules, and with event-driven architecture
+* Scalable: applications built in modules with event-driven architecture
 * Sensible defaults: Underscore templates are used for view rendering
-* Easily modifiable: make it work with your application's specific needs
-* Reduce boilerplate for views, with specialized view types
-* Build on a modular architecture with an `Application` and modules that attach to it
-* Compose your application's visuals at runtime, with the `Region` and `LayoutView` objects
-* Nested views and layouts within visual regions
-* Built-in memory management and zombie-killing in views, regions and layoutViews
-* Event-driven architecture with `Backbone.Wreqr.EventAggregator`
-* Flexible, "as-needed" architecture allowing you to pick and choose what you need
+* Easily modifiable: works with the specific needs of your application
+* Reduce boilerplate: for all views, including specialized types
+* Create: application visuals at runtime with `Region` and `LayoutView` objects
+* Nested: views and layouts within visual regions
+* Built-in: memory management and zombie-killing for views, layoutViews and regions
+* Event-driven architecture: utilizing the `Backbone.Wreqr.EventAggregator`
+* Flexible: "as-needed" architecture allowing you to pick and choose what you need
 * And much, much more
 
 
@@ -112,7 +111,7 @@ for information on upgrading to the latest version of Marionette.
 ### Annotated Source Code
 
 The source code for Marionette is heavily documented.
-You can read the annotations for all the details of how Marionette works, and advice on which methods to override.
+You can read the annotations for all the details of how Marionette works and advice on which methods to override.
 
 ##### [View the annotated source code](http://marionettejs.com/annotated-src/backbone.marionette)
 
@@ -142,4 +141,4 @@ bring into the next release.
 
 Report issues with Marionette, submit pull requests to fix problems, or to
 create summarized and documented feature requests (preferably with pull
-requests that implement the feature).
+requests that implement the feature).

src/behaviors.js

@@ -59,7 +59,7 @@ Marionette.Behaviors = (function(Marionette, _) {
 
           var eventKey  = eventName + selector;
           var handler   = _.isFunction(behaviour) ? behaviour : b[behaviour];
-
+          if (!handler) { return; }
           _events[eventKey] = _.bind(handler, b);
         }, this);
 

src/helpers.js

@@ -73,7 +73,7 @@ Marionette.normalizeMethods = function(hash) {
 // utility method for parsing @ui. syntax strings
 // into associated selector
 Marionette.normalizeUIString = function(uiString, ui) {
-  return uiString.replace(/@ui\.[a-zA-Z_$0-9]*/g, function(r) {
+  return uiString.replace(/@ui\.[a-zA-Z-_$0-9]*/g, function(r) {
     return ui[r.slice(4)];
   });
 };
@@ -145,5 +145,9 @@ var deprecate = Marionette.deprecate = function(message, test) {
   }
 };
 
-deprecate._warn = typeof console !== 'undefined' && (console.warn || console.log) || function() {};
+deprecate._console = typeof console !== 'undefined' ? console : {};
+deprecate._warn = function() {
+  var warn = deprecate._console.warn || deprecate._console.log || function() {};
+  return warn.apply(deprecate._console, arguments);
+};
 deprecate._cache = {};