marionette-rails 0.9.6.1 → 0.9.7

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

@@ -1,4 +1,4 @@
-// Backbone.Marionette v0.9.6
+// Backbone.Marionette v0.9.7
 //
 // Copyright (C)2012 Derick Bailey, Muted Solutions, LLC
 // Distributed Under MIT License
@@ -1003,6 +1003,9 @@ _.extend(Marionette.Module.prototype, Backbone.Events, {
 
   // Start the module, and run all of it's initializers
   start: function(options){
+    // Prevent re-start the module
+    if (this._isInitialized){ return; }
+
     this._runModuleDefinition();
     this._initializerCallbacks.run(options, this);
     this._isInitialized = true;
@@ -1010,7 +1013,7 @@ _.extend(Marionette.Module.prototype, Backbone.Events, {
     // start the sub-modules
     if (this.submodules){
       _.each(this.submodules, function(mod){
-        mod.start();
+        mod.start(options);
       });
     }
   },
@@ -1257,7 +1260,7 @@ Marionette.Renderer = {
   // template function. Override this method to provide your own
   // custom rendering and template handling for all of Marionette.
   render: function(template, data){
-    var templateFunc = Marionette.TemplateCache.get(template);
+    var templateFunc = typeof template === 'function' ? template : Marionette.TemplateCache.get(template);
     var html = templateFunc(data);
     return html;
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marionette-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.6.1
+  version: 0.9.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails