marionette-rails 1.0.0.rc3 → 1.0.0.rc4

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

@@ -1,4 +1,4 @@
- // Backbone.Marionette, v1.0.0-rc3
+ // Backbone.Marionette, v1.0.0-rc4
  // Copyright (c)2013 Derick Bailey, Muted Solutions, LLC.
  // Distributed under MIT license
  // http://github.com/marionettejs/backbone.marionette
@@ -207,12 +207,12 @@ Backbone.ChildViewContainer = (function(Backbone, _){
   return Container;
 })(Backbone, _);
 
-// Backbone.Wreqr, v0.2.0
-// Copyright (c)2012 Derick Bailey, Muted Solutions, LLC.
+// Backbone.Wreqr, v0.1.1
+// Copyright (c)2013 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
 // http://github.com/marionettejs/backbone.wreqr
 Backbone.Wreqr = (function(Backbone, Marionette, _){
-  "option strict";
+  "use strict";
   var Wreqr = {};
 
   // Handlers
@@ -220,13 +220,12 @@ Backbone.Wreqr = (function(Backbone, Marionette, _){
   // A registry of functions to call, given a name
   
   Wreqr.Handlers = (function(Backbone, _){
-    "option strict";
+    "use strict";
     
     // Constructor
     // -----------
   
     var Handlers = function(){
-      "use strict";
       this._handlers = {};
     };
   
@@ -284,7 +283,7 @@ Backbone.Wreqr = (function(Backbone, Marionette, _){
   // A simple command pattern implementation. Register a command
   // handler and execute it.
   Wreqr.Commands = (function(Wreqr){
-    "option strict";
+    "use strict";
   
     return Wreqr.Handlers.extend({
       execute: function(){
@@ -303,7 +302,7 @@ Backbone.Wreqr = (function(Backbone, Marionette, _){
   // A simple request/response implementation. Register a
   // request handler, and return a response from it
   Wreqr.RequestResponse = (function(Wreqr){
-    "option strict";
+    "use strict";
   
     return Wreqr.Handlers.extend({
       request: function(){
@@ -322,32 +321,16 @@ Backbone.Wreqr = (function(Backbone, Marionette, _){
   // of an application through event-driven architecture.
   
   Wreqr.EventAggregator = (function(Backbone, _){
+    "use strict";
+    var EA = function(){};
   
-    // Grab a reference to the original listenTo
-    var listenTo = Backbone.Events.listenTo;
+    // Copy the `extend` function used by Backbone's classes
+    EA.extend = Backbone.Model.extend;
   
-    // Create a version of listenTo that allows contexting binding
-    function contextBoundListenTo(obj, evtSource, events, callback, context){
-      context = context || obj;
-      return listenTo.call(obj, evtSource, events, _.bind(callback, context));
-    }
+    // Copy the basic Backbone.Events on to the event aggregator
+    _.extend(EA.prototype, Backbone.Events);
   
-    // Define the EventAggregator
-    function EventAggregator(){}
-  
-    // Mix Backbone.Events in to it
-    _.extend(EventAggregator.prototype, Backbone.Events, {
-      // Override the listenTo so that we can have a version that
-      // correctly binds context
-      listenTo: function(evtSource, events, callback, context){
-        return contextBoundListenTo(this, evtSource, events, callback, context);
-      }
-    });
-  
-    // Allow it to be extended
-    EventAggregator.extend = Backbone.Model.extend;
-  
-    return EventAggregator;
+    return EA;
   })(Backbone, _);
   
 
@@ -381,7 +364,7 @@ Marionette.getOption = function(target, optionName){
   if (!target || !optionName){ return; }
   var value;
 
-  if (target.options && target.options[optionName]){
+  if (target.options && (optionName in target.options) && (target.options[optionName] !== undefined)){
     value = target.options[optionName];
   } else {
     value = target[optionName];
@@ -509,56 +492,6 @@ Marionette.MonitorDOMRefresh = (function(){
 })();
 
 
-// addEventBinder
-// --------------
-//
-// Mixes in Backbone.Events to the target object, if it is not present
-// already. Also adjusts the listenTo method to accept a 4th parameter
-// for the callback context.
-
-(function(Backbone, Marionette, _){
-
-  // grab a reference to the original listenTo
-  var listenTo = Backbone.Events.listenTo;
-
-  // Fix the listenTo method on the target object, allowing the 4th
-  // context parameter to be specified
-  Marionette.addEventBinder = function(target){
-    // If the target is not already extending Backbone.Events,
-    // then extend that on to it first
-    if (!target.on && !target.off && !target.listenTo && !target.stopListening){
-      _.extend(target, Backbone.Events);
-    }
-
-    // Override the built-in listenTo method to make sure we 
-    // account for context
-    target.listenTo = function(evtSource, events, callback, context){
-      context = context || this;
-      return listenTo.call(this, evtSource, events, _.bind(callback, context));
-    };
-  };
-
-})(Backbone, Marionette, _);
-
-
-// Event Aggregator
-// ----------------
-// A pub-sub object that can be used to decouple various parts
-// of an application through event-driven architecture.
-//
-// Extends [Backbone.Wreqr.EventAggregator](https://github.com/marionettejs/backbone.wreqr)
-// and mixes in an EventBinder from [Backbone.EventBinder](https://github.com/marionettejs/backbone.eventbinder).
-Marionette.EventAggregator = Backbone.Wreqr.EventAggregator.extend({
-
-  constructor: function(){
-    Marionette.addEventBinder(this);
-
-    var args = Array.prototype.slice.apply(arguments);
-    Backbone.Wreqr.EventAggregator.prototype.constructor.apply(this, args);
-  }
-
-});
-
 // Marionette.bindEntityEvents & unbindEntityEvents
 // ---------------------------
 //
@@ -707,8 +640,6 @@ Marionette.Controller = function(options){
   this.triggerMethod = Marionette.triggerMethod;
   this.options = options || {};
 
-  Marionette.addEventBinder(this);
-
   if (_.isFunction(this.initialize)){
     this.initialize(this.options);
   }
@@ -737,8 +668,6 @@ _.extend(Marionette.Controller.prototype, Backbone.Events, {
 Marionette.Region = function(options){
   this.options = options || {};
 
-  Marionette.addEventBinder(this);
-
   this.el = Marionette.getOption(this, "el");
 
   if (!this.el){
@@ -953,7 +882,7 @@ _.extend(Marionette.TemplateCache, {
 // and know whether or not it has been loaded
 _.extend(Marionette.TemplateCache.prototype, {
 
-  // Internal method to load the template asynchronously.
+  // Internal method to load the template
   load: function(){
     var that = this;
 
@@ -970,8 +899,10 @@ _.extend(Marionette.TemplateCache.prototype, {
   },
 
   // Load a template from the DOM, by default. Override
-  // this method to provide your own template retrieval,
-  // such as asynchronous loading from a server.
+  // this method to provide your own template retrieval
+  // For asynchronous loading with AMD/RequireJS, consider
+  // using a template-loader plugin as described here: 
+  // https://github.com/marionettejs/backbone.marionette/wiki/Using-marionette-with-requirejs
   loadTemplate: function(templateId){
     var template = $(templateId).html();
 
@@ -1023,7 +954,6 @@ Marionette.View = Backbone.View.extend({
 
   constructor: function(){
     _.bindAll(this, "render");
-    Marionette.addEventBinder(this);
 
     var args = Array.prototype.slice.apply(arguments);
     Backbone.View.prototype.constructor.apply(this, args);
@@ -1088,7 +1018,7 @@ Marionette.View = Backbone.View.extend({
         };
 
         // trigger the event
-        that.trigger(value, args);
+        that.triggerMethod(value, args);
       };
 
     });
@@ -1444,6 +1374,7 @@ Marionette.CollectionView = Marionette.View.extend({
   removeItemView: function(item){
     var view = this.children.findByModel(item);
     this.removeChildView(view);
+    this.checkEmpty();
   },
 
   // Remove the child view and close it
@@ -1461,13 +1392,16 @@ Marionette.CollectionView = Marionette.View.extend({
       this.children.remove(view);
     }
 
+    this.triggerMethod("item:removed", view);
+  },
+
+  // helper to show the empty view if the collection is empty
+  checkEmpty: function() {
     // check if we're empty now, and if we are, show the
     // empty view
     if (!this.collection || this.collection.length === 0){
       this.showEmptyView();
     }
-
-    this.triggerMethod("item:removed", view);
   },
 
   // Append the HTML to the collection's `el`.
@@ -1502,9 +1436,7 @@ Marionette.CollectionView = Marionette.View.extend({
     this.children.each(function(child){
       this.removeChildView(child);
     }, this);
-
-    // re-initialize to clean up after ourselves
-    this._initChildViewStorage();
+    this.checkEmpty();
   }
 });
 
@@ -1842,14 +1774,13 @@ Marionette.AppRouter = Backbone.Router.extend({
 // event aggregator as `app.vent`
 Marionette.Application = function(options){
   this.initCallbacks = new Marionette.Callbacks();
-  this.vent = new Marionette.EventAggregator();
+  this.vent = new Backbone.Wreqr.EventAggregator();
   this.commands = new Backbone.Wreqr.Commands();
   this.reqres = new Backbone.Wreqr.RequestResponse();
   this.submodules = {};
 
   _.extend(this, options);
 
-  Marionette.addEventBinder(this);
   this.triggerMethod = Marionette.triggerMethod;
 };
 
@@ -1936,8 +1867,6 @@ Marionette.Module = function(moduleName, app){
   this.app = app;
   this.startWithParent = true;
 
-  // extend this module with an event binder
-  Marionette.addEventBinder(this);
   this.triggerMethod = Marionette.triggerMethod;
 };
 
@@ -1998,7 +1927,7 @@ _.extend(Marionette.Module.prototype, Backbone.Events, {
     _.each(this.submodules, function(mod){ mod.stop(); });
 
     // run the finalizers
-    this._finalizerCallbacks.run();
+    this._finalizerCallbacks.run(undefined,this);
 
     // reset the initializers and finalizers
     this._initializerCallbacks.reset();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marionette-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
   prerelease: 6
 platform: ruby
 authors: