marionette-rails 0.9.0 → 0.9.1

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

@@ -1,4 +1,4 @@
-// Backbone.Marionette v0.9.0
+// Backbone.Marionette v0.9.1
 //
 // Copyright (C)2012 Derick Bailey, Muted Solutions, LLC
 // Distributed Under MIT License
@@ -264,6 +264,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();
     return this.addItemView(item, ItemView, options.index);
   },
@@ -274,30 +275,66 @@ Marionette.CollectionView = Marionette.View.extend({
     this.onShowCallbacks.run();
   },
 
-  // Loop through all of the items and render 
-  // each of them with the specified `itemView`.
-  render: function(){
-    var that = this;
-    var ItemView = this.getItemView();
-    var EmptyView = this.options.emptyView || this.emptyView;
-
+  // Internal method to trigger the before render callbacks
+  // and events
+  triggerBeforeRender: function(){
     if (this.beforeRender) { this.beforeRender(); }
     this.trigger("collection:before:render", this);
+  },
 
+  // Internal method to trigger the rendered callbacks and
+  // events
+  triggerRendered: function(){
+    if (this.onRender) { this.onRender(); }
+    this.trigger("collection:rendered", this);
+  },
+
+  // Render the collection of items. Override this method to
+  // provide your own implementation of a render function for
+  // the collection view.
+  render: function(){
+    this.triggerBeforeRender();
     this.closeChildren();
 
-    if (this.collection) {
-      if (this.collection.length === 0 && EmptyView) {
-        this.addItemView(new Backbone.Model(), EmptyView, 0);
-      } else {
-        this.collection.each(function(item, index){
-          that.addItemView(item, ItemView, index);
-        });
-      }
+    if (this.collection && this.collection.length > 0) {
+      this.showCollection();
+    } else {
+      this.showEmptyView();
     }
 
-    if (this.onRender) { this.onRender(); }
-    this.trigger("collection:rendered", this);
+    this.triggerRendered();
+  },
+
+  // Internal method to loop through each item in the
+  // collection view and show it
+  showCollection: function(){
+    var that = this;
+    var ItemView = this.getItemView();
+    this.collection.each(function(item, index){
+      that.addItemView(item, ItemView, index);
+    });
+  },
+
+  // Internal method to show an empty view in place of
+  // a collection of item views, when the collection is
+  // empty
+  showEmptyView: function(){
+    var EmptyView = this.options.emptyView || this.emptyView;
+    if (EmptyView){
+      this.showingEmptyView = true;
+      var model = new Backbone.Model();
+      this.addItemView(model, EmptyView, 0);
+    }
+  },
+
+  // Internal method to close an existing emptyView instance
+  // if one exists. Called when a collection view has been
+  // rendered empty, and then an item is added to the collection.
+  closeEmptyView: function(){
+    if (this.showingEmptyView){
+      this.closeChildren();
+      delete this.showingEmptyView;
+    }
   },
 
   // Retrieve the itemView type, either from `this.options.itemView`
@@ -380,6 +417,11 @@ Marionette.CollectionView = Marionette.View.extend({
       view.close();
       delete this.children[item.cid];
     }
+
+    if (this.collection.length === 0){
+      this.showEmptyView();
+    }
+
     this.trigger("item:removed", view);
   },
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marionette-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails