Bump and build v2.2.0-pre.2

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.2.0-pre",
+  "version": "2.2.0-pre.2",
   "keywords": [
     "backbone",
     "framework",

changelog.md

@@ -1,3 +1,5 @@
+### v2.2.0-pre.2 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v2.1.0...v2.2.0-pre.2)
+
 ### v2.2.0-pre [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v2.1.0...v2.2.0-pre)
 
 ### v2.1.0 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v2.0.3...v2.1.0)

lib/backbone.marionette.js

@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v2.2.0-pre
+// v2.2.0-pre.2
 //
 // Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -493,7 +493,7 @@
 
   var Marionette = Backbone.Marionette = {};
 
-  Marionette.VERSION = '2.2.0-pre';
+  Marionette.VERSION = '2.2.0-pre.2';
 
   Marionette.noConflict = function() {
     root.Marionette = previousMarionette;
@@ -1019,10 +1019,8 @@
   // http://lostechies.com/derickbailey/2011/12/12/composite-js-apps-regions-and-region-managers/
 
   Marionette.Region = function(options) {
-    this.options   = options || {};
-    this.el        = this.getOption('el');
-    this._parentEl = this.getOption('parentEl');
-    this._el       = this.el;
+    this.options = options || {};
+    this.el = this.getOption('el');
 
     // Handle when this.el is passed in as a $ wrapped element.
     this.el = this.el instanceof Backbone.$ ? this.el[0] : this.el;
@@ -1098,7 +1096,28 @@
         options.el = regionConfig.selector;
       }
 
-      return new RegionClass(options);
+      var region = new RegionClass(options);
+
+      // override the `getEl` function if we have a parentEl
+      // this must be overridden to ensure the selector is found
+      // on the first use of the region. if we try to assign the
+      // region's `el` to `parentEl.find(selector)` in the object
+      // literal to build the region, the element will not be
+      // guaranteed to be in the DOM already, and will cause problems
+      if (regionConfig.parentEl) {
+        region.getEl = function(el) {
+          if (_.isObject(el)) {
+            return Backbone.$(el);
+          }
+          var parentEl = regionConfig.parentEl;
+          if (_.isFunction(parentEl)) {
+            parentEl = parentEl();
+          }
+          return parentEl.find(el);
+        };
+      }
+
+      return region;
     },
 
     // Build the region directly from a given `RegionClass`
@@ -1199,14 +1218,7 @@
     // Override this method to change how the region finds the
     // DOM element that it manages. Return a jQuery selector object.
     getEl: function(el) {
-      if (!this._parentEl || _.isObject(el)) {
-        return Backbone.$(el);
-      }
-
-      // If we have a `parentEl`, then we attempt to find the
-      // region within it.
-      var parentEl = _.result(this, '_parentEl');
-      return parentEl.find(el);
+      return Backbone.$(el);
     },
 
     // Override this method to change how the new view is
@@ -1271,7 +1283,7 @@
       this.empty();
 
       if (this.$el) {
-        this.el = this._el;
+        this.el = this.$el.selector;
       }
 
       delete this.$el;
@@ -1946,7 +1958,7 @@
     },
 
     // Attaches the content of a given view.
-    // This method can be overriden to optimize rendering,
+    // This method can be overridden to optimize rendering,
     // or to render in a non standard way.
     //
     // For example, using `innerHTML` instead of `$el.html`
@@ -2566,7 +2578,7 @@
     },
 
     // Attaches the content of the root.
-    // This method can be overriden to optimize rendering,
+    // This method can be overridden to optimize rendering,
     // or to render in a non standard way.
     //
     // For example, using `innerHTML` instead of `$el.html`
@@ -2655,9 +2667,11 @@
     // is called.
     constructor: function(options) {
       options = options || {};
+
       this._firstRender = true;
-      Marionette.ItemView.call(this, options);
       this._initializeRegions(options);
+
+      Marionette.ItemView.call(this, options);
     },
 
     // LayoutView's render will use the existing region objects the
@@ -2771,8 +2785,8 @@
       });
     },
 
-    // Enable easy overiding of the default `RegionManager`
-    // for customized region interactions and buisness specific
+    // Enable easy overriding of the default `RegionManager`
+    // for customized region interactions and business specific
     // view logic for better control over single regions.
     getRegionManager: function() {
       return new Marionette.RegionManager();
@@ -2863,7 +2877,7 @@
 
     // Borrow Backbones extend implementation
     // this allows us to setup a proper
-    // inheritence pattern that follow in suite
+    // inheritance pattern that follows suit
     // with the rest of Marionette views.
     Behavior.extend = Marionette.extend;
 
@@ -2875,7 +2889,7 @@
   // --------
 
   // Behaviors is a utility class that takes care of
-  // glueing your behavior instances to their given View.
+  // gluing your behavior instances to their given View.
   // The most important part of this class is that you
   // **MUST** override the class level behaviorsLookup
   // method for things to work properly.
@@ -2900,7 +2914,6 @@
     }
 
     var methods = {
-
       behaviorTriggers: function(behaviorTriggers, behaviors) {
         var triggerBuilder = new BehaviorTriggersBuilder(this, behaviors);
         return triggerBuilder.buildBehaviorTriggers();

lib/core/backbone.marionette.js

@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v2.2.0-pre
+// v2.2.0-pre.2
 //
 // Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -30,7 +30,7 @@
 
   var Marionette = Backbone.Marionette = {};
 
-  Marionette.VERSION = '2.2.0-pre';
+  Marionette.VERSION = '2.2.0-pre.2';
 
   Marionette.noConflict = function() {
     root.Marionette = previousMarionette;
@@ -554,10 +554,8 @@
   // http://lostechies.com/derickbailey/2011/12/12/composite-js-apps-regions-and-region-managers/
 
   Marionette.Region = function(options) {
-    this.options   = options || {};
-    this.el        = this.getOption('el');
-    this._parentEl = this.getOption('parentEl');
-    this._el       = this.el;
+    this.options = options || {};
+    this.el = this.getOption('el');
 
     // Handle when this.el is passed in as a $ wrapped element.
     this.el = this.el instanceof Backbone.$ ? this.el[0] : this.el;
@@ -633,7 +631,28 @@
         options.el = regionConfig.selector;
       }
 
-      return new RegionClass(options);
+      var region = new RegionClass(options);
+
+      // override the `getEl` function if we have a parentEl
+      // this must be overridden to ensure the selector is found
+      // on the first use of the region. if we try to assign the
+      // region's `el` to `parentEl.find(selector)` in the object
+      // literal to build the region, the element will not be
+      // guaranteed to be in the DOM already, and will cause problems
+      if (regionConfig.parentEl) {
+        region.getEl = function(el) {
+          if (_.isObject(el)) {
+            return Backbone.$(el);
+          }
+          var parentEl = regionConfig.parentEl;
+          if (_.isFunction(parentEl)) {
+            parentEl = parentEl();
+          }
+          return parentEl.find(el);
+        };
+      }
+
+      return region;
     },
 
     // Build the region directly from a given `RegionClass`
@@ -734,14 +753,7 @@
     // Override this method to change how the region finds the
     // DOM element that it manages. Return a jQuery selector object.
     getEl: function(el) {
-      if (!this._parentEl || _.isObject(el)) {
-        return Backbone.$(el);
-      }
-
-      // If we have a `parentEl`, then we attempt to find the
-      // region within it.
-      var parentEl = _.result(this, '_parentEl');
-      return parentEl.find(el);
+      return Backbone.$(el);
     },
 
     // Override this method to change how the new view is
@@ -806,7 +818,7 @@
       this.empty();
 
       if (this.$el) {
-        this.el = this._el;
+        this.el = this.$el.selector;
       }
 
       delete this.$el;
@@ -1481,7 +1493,7 @@
     },
 
     // Attaches the content of a given view.
-    // This method can be overriden to optimize rendering,
+    // This method can be overridden to optimize rendering,
     // or to render in a non standard way.
     //
     // For example, using `innerHTML` instead of `$el.html`
@@ -2101,7 +2113,7 @@
     },
 
     // Attaches the content of the root.
-    // This method can be overriden to optimize rendering,
+    // This method can be overridden to optimize rendering,
     // or to render in a non standard way.
     //
     // For example, using `innerHTML` instead of `$el.html`
@@ -2190,9 +2202,11 @@
     // is called.
     constructor: function(options) {
       options = options || {};
+
       this._firstRender = true;
-      Marionette.ItemView.call(this, options);
       this._initializeRegions(options);
+
+      Marionette.ItemView.call(this, options);
     },
 
     // LayoutView's render will use the existing region objects the
@@ -2306,8 +2320,8 @@
       });
     },
 
-    // Enable easy overiding of the default `RegionManager`
-    // for customized region interactions and buisness specific
+    // Enable easy overriding of the default `RegionManager`
+    // for customized region interactions and business specific
     // view logic for better control over single regions.
     getRegionManager: function() {
       return new Marionette.RegionManager();
@@ -2398,7 +2412,7 @@
 
     // Borrow Backbones extend implementation
     // this allows us to setup a proper
-    // inheritence pattern that follow in suite
+    // inheritance pattern that follows suit
     // with the rest of Marionette views.
     Behavior.extend = Marionette.extend;
 
@@ -2410,7 +2424,7 @@
   // --------
 
   // Behaviors is a utility class that takes care of
-  // glueing your behavior instances to their given View.
+  // gluing your behavior instances to their given View.
   // The most important part of this class is that you
   // **MUST** override the class level behaviorsLookup
   // method for things to work properly.
@@ -2435,7 +2449,6 @@
     }
 
     var methods = {
-
       behaviorTriggers: function(behaviorTriggers, behaviors) {
         var triggerBuilder = new BehaviorTriggersBuilder(this, behaviors);
         return triggerBuilder.buildBehaviorTriggers();

package.json

@@ -1,7 +1,7 @@
 {
   "name": "backbone.marionette",
   "description": "Make your Backbone.js apps dance!",
-  "version": "2.2.0-pre",
+  "version": "2.2.0-pre.2",
   "homepage": "https://github.com/marionettejs/backbone.marionette",
   "main": "lib/core/backbone.marionette.js",
   "keywords": [