marionette-rails 0.10.1 → 0.10.2

data/vendor/assets/javascripts/backbone.marionette.js

@@ -1,4 +1,4 @@
-// Backbone.Marionette, v0.10.1
+// Backbone.Marionette, v0.10.2
 // Copyright (c)2012 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
 // http://github.com/derickbailey/backbone.marionette
@@ -740,7 +740,9 @@ Marionette.Region.extend = Backbone.View.extend;
 // Used for composite view management and sub-application areas.
 Marionette.Layout = Marionette.ItemView.extend({
   regionType: Marionette.Region,
-
+  
+  // Ensure the regions are avialable when the `initialize` method
+  // is called.
   constructor: function () {
     this.initializeRegions();
     Backbone.Marionette.ItemView.apply(this, arguments);
@@ -751,18 +753,16 @@ Marionette.Layout = Marionette.ItemView.extend({
   // views that the regions are showing and then reset the `el`
   // for the regions to the newly rendered DOM elements.
   render: function(){
-    var result = Marionette.ItemView.prototype.render.apply(this, arguments);
-
-    // Rewrite this function to handle re-rendering and
+    // If this is not the first render call, then we need to 
     // re-initializing the `el` for each region
-    this.render = function(){
+    if (!this._firstRender){
       this.closeRegions();
       this.reInitializeRegions();
+    } else {
+      this._firstRender = false;
+    }
 
-      var result = Marionette.ItemView.prototype.render.apply(this, arguments);
-      return result;
-    };
-
+    var result = Marionette.ItemView.prototype.render.apply(this, arguments);
     return result;
   },
 
@@ -1374,8 +1374,10 @@ _.extend(Marionette.Callbacks.prototype, {
   // to be run multiple times - whenever the `run` method is called.
   reset: function(){
     var that = this;
+    var callbacks = this._callbacks;
     this._deferred = $.Deferred();
-    _.each(this._callbacks, function(cb){
+    this._callbacks = [];
+    _.each(callbacks, function(cb){
       that.add(cb.cb, cb.ctx);
     });
   }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 10
-  - 1
-  version: 0.10.1
+  - 2
+  version: 0.10.2
 platform: ruby
 authors: 
 - Godfrey Chan