marionette-rails 0.9.12 → 0.9.13

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

@@ -1,4 +1,4 @@
-// Backbone.Marionette, v0.9.12
+// Backbone.Marionette, v0.9.13
 // Copyright (c)2012 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
 // http://github.com/derickbailey/backbone.marionette
@@ -66,19 +66,23 @@ Marionette.EventBinder.extend = Backbone.View.extend;
 
 // The core view type that other Marionette views extend from.
 Marionette.View = Backbone.View.extend({
+
   constructor: function(){
     var eventBinder = new Marionette.EventBinder();
     _.extend(this, eventBinder);
 
     Backbone.View.prototype.constructor.apply(this, arguments);
 
+    this.bindBackboneEntityTo(this.model, this.modelEvents);
+    this.bindBackboneEntityTo(this.collection, this.collectionEvents);
+
     this.bindTo(this, "show", this.onShowCalled, this);
   },
 
   // Get the template for this view
   // instance. You can set a `template` attribute in the view
   // definition or pass a `template: "whatever"` parameter in
-  // to the constructor options. 
+  // to the constructor options.
   getTemplate: function(){
     var template;
 
@@ -96,14 +100,14 @@ Marionette.View = Backbone.View.extend({
   // Serialize the model or collection for the view. If a model is
   // found, `.toJSON()` is called. If a collection is found, `.toJSON()`
   // is also called, but is used to populate an `items` array in the
-  // resulting data. If both are found, defaults to the model. 
-  // You can override the `serializeData` method in your own view 
+  // resulting data. If both are found, defaults to the model.
+  // You can override the `serializeData` method in your own view
   // definition, to provide custom serialization for your view's data.
   serializeData: function(){
     var data;
 
-    if (this.model) { 
-      data = this.model.toJSON(); 
+    if (this.model) {
+      data = this.model.toJSON();
     }
     else if (this.collection) {
       data = { items: this.collection.toJSON() };
@@ -205,10 +209,24 @@ Marionette.View = Backbone.View.extend({
       var selector = that.uiBindings[key];
       that.ui[key] = that.$(selector);
     });
-  }
+  },
 
-});
+  // This method is used to bind a backbone "entity" (collection/model) to methods on the view.
+  bindBackboneEntityTo: function(entity, bindings){
+    if (!entity || !bindings) { return; }
+
+    var view = this;
+    _.each(bindings, function(methodName, evt){
+
+      var method = view[methodName];
+      if(!method) {
+        throw new Error("View method '"+ methodName +"' was configured as an event handler, but does not exist.");
+      }
 
+      view.bindTo(entity, evt, method, view);
+    });
+  }
+});
 
 // Item View
 // ---------
@@ -269,7 +287,7 @@ Marionette.CollectionView = Marionette.View.extend({
     this.onShowCallbacks = new Marionette.Callbacks();
   },
 
-  // Configured the initial events that the collection view 
+  // Configured the initial events that the collection view
   // binds to. Override this method to prevent the initial
   // events, or to add your own initial events.
   initialEvents: function(){
@@ -283,7 +301,7 @@ Marionette.CollectionView = Marionette.View.extend({
   // Handle a child item added to the collection
   addChildView: function(item, collection, options){
     this.closeEmptyView();
-    var ItemView = this.getItemView();
+    var ItemView = this.getItemView(item);
     return this.addItemView(item, ItemView, options.index);
   },
 
@@ -331,8 +349,9 @@ Marionette.CollectionView = Marionette.View.extend({
   // collection view and show it
   showCollection: function(){
     var that = this;
-    var ItemView = this.getItemView();
+    var ItemView;
     this.collection.each(function(item, index){
+      ItemView = that.getItemView(item);
       that.addItemView(item, ItemView, index);
     });
   },
@@ -362,7 +381,7 @@ Marionette.CollectionView = Marionette.View.extend({
   // Retrieve the itemView type, either from `this.options.itemView`
   // or from the `itemView` in the object definition. The "options"
   // takes precedence.
-  getItemView: function(){
+  getItemView: function(item){
     var itemView = this.options.itemView || this.itemView;
 
     if (!itemView){
@@ -381,7 +400,7 @@ Marionette.CollectionView = Marionette.View.extend({
 
     var view = this.buildItemView(item, ItemView);
 
-    // Store the child view itself so we can properly 
+    // Store the child view itself so we can properly
     // remove and/or close it later
     this.storeChild(view);
     if (this.onItemAdded){ this.onItemAdded(view); }
@@ -409,17 +428,17 @@ Marionette.CollectionView = Marionette.View.extend({
     // them when removing / closing the child view
     this.childBindings = this.childBindings || {};
     this.childBindings[view.cid] = childBinding;
-    
+
     return renderResult;
   },
-  
+
   // render the item view
   renderItemView: function(view, index) {
     view.render();
     this.appendHtml(this, view, index);
   },
 
-  // Build an `itemView` for every model in the collection. 
+  // Build an `itemView` for every model in the collection.
   buildItemView: function(item, ItemView){
     var itemViewOptions = _.result(this, "itemViewOptions");
     var options = _.extend({model: item}, itemViewOptions);
@@ -471,8 +490,8 @@ Marionette.CollectionView = Marionette.View.extend({
   close: function(){
     this.trigger("collection:before:close");
     this.closeChildren();
-    Marionette.View.prototype.close.apply(this, arguments);
     this.trigger("collection:closed");
+    Marionette.View.prototype.close.apply(this, arguments);
   },
 
   // Close the child views that this collection view
@@ -500,7 +519,7 @@ Marionette.CompositeView = Marionette.CollectionView.extend({
     this.itemView = this.getItemView();
   },
 
-  // Configured the initial events that the composite view 
+  // Configured the initial events that the composite view
   // binds to. Override this method to prevent the initial
   // events, or to add your own initial events.
   initialEvents: function(){
@@ -515,8 +534,16 @@ Marionette.CompositeView = Marionette.CollectionView.extend({
   // the items in the collection. The default is to return
   // `this.itemView` or Marionette.CompositeView if no `itemView`
   // has been defined
-  getItemView: function(){
-    return this.itemView || this.constructor;
+  getItemView: function(item){
+    var itemView = this.options.itemView || this.itemView || this.constructor;
+
+    if (!itemView){
+      var err = new Error("An `itemView` must be specified");
+      err.name = "NoItemViewError";
+      throw err;
+    }
+
+    return itemView;
   },
 
   // Renders the model once, and the collection once. Calling
@@ -708,8 +735,8 @@ Marionette.Layout = Marionette.ItemView.extend({
   regionType: Marionette.Region,
 
   constructor: function () {
-    Backbone.Marionette.ItemView.apply(this, arguments);
     this.initializeRegions();
+    Backbone.Marionette.ItemView.apply(this, arguments);
   },
 
   // Layout's render will use the existing region objects the

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 12
-  version: 0.9.12
+  - 13
+  version: 0.9.13
 platform: ruby
 authors: 
 - Godfrey Chan