marionette-rails 0.8.2 → 0.8.3

data/README.md

@@ -30,4 +30,20 @@ Or, if you are using pure javascript, add this to `app/assets/javascripts/applic
 
 ## Versioning
 
-The gem will mirror the [Backbone.Marionette](https://github.com/derickbailey/backbone.marionette) versioning scheme. That is, version 0.8.2.* of `marionette-rails` would vendor [Backbone.Marionette](https://github.com/derickbailey/backbone.marionette) v0.8.2.
+The gem will mirror the [Backbone.Marionette](https://github.com/derickbailey/backbone.marionette) versioning scheme. That is, version 0.8.2.* of `marionette-rails` would vendor [Backbone.Marionette](https://github.com/derickbailey/backbone.marionette) v0.8.2.
+
+## Contributing
+
+For bugs in [Backbone.Marionette](https://github.com/derickbailey/backbone.marionette) itself, head over to their [issue tracker](https://github.com/derickbailey/backbone.marionette/issues). If you have a question, post it at [StackOverflow under the `backbone.marionette` tag](http://stackoverflow.com/questions/tagged/backbone.marionette).
+
+For bugs in this gem distribution, use the [GitHub issue tracker](https://github.com/chancancode/marionette-rails/issues). If you could submit a pull request - that's even better!
+
+## Donations
+
+If you're using Marionette and you're finding that it is saving you time and effort, then please consider donating to the upstream [Backbone.Marionette](https://github.com/derickbailey/backbone.marionette) project.
+
+[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=7SJHYWJ487SF4)
+
+## License
+
+This library is distributed under the MIT license. Please see the LICENSE file.

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

@@ -1,4 +1,4 @@
-// Backbone.Marionette v0.8.2
+// Backbone.Marionette v0.8.3
 //
 // Copyright (C)2012 Derick Bailey, Muted Solutions, LLC
 // Distributed Under MIT License
@@ -9,7 +9,7 @@
 Backbone.Marionette = (function(Backbone, _, $){
   var Marionette = {};
 
-  Marionette.version = "0.8.2";
+  Marionette.version = "0.8.3";
 
   // Marionette.View
   // ---------------
@@ -696,55 +696,6 @@ Backbone.Marionette = (function(Backbone, _, $){
           this[region] = regionObj;
         }
       }
-    },
-
-    // Add modules to the application, providing direct
-    // access to your applicaiton object, Backbone, 
-    // Marionette, jQuery and Underscore as parameters 
-    // to a callback function.
-    module: function(moduleNames, moduleDefinition){
-      var moduleName, module, moduleOverride;
-      var parentModule = this;
-      var moduleNames = moduleNames.split(".");
-
-      // Loop through all the parts of the module definition
-      var length = moduleNames.length;
-      for(var i = 0; i < length; i++){
-
-        // only run the module definition if this is the
-        // last module in the chaing: "Foo.Bar.Baz" only 
-        // runs the module definition for the "Baz" module
-        var defineModule = (i === length-1);
-
-        // Get the module name, and check if it exists on
-        // the current parent already
-        moduleName = moduleNames[i];
-        module = parentModule[moduleName];
-
-        if (!module){ 
-          // Create the module
-          module = new Marionette.Application();
-
-          // Build the module definition if this is the last
-          // module specified in the . chain
-          if (defineModule && moduleDefinition){
-            moduleOverride = moduleDefinition(module, this, Backbone, Marionette, jQuery, _);
-            // Override it if necessary
-            if (moduleOverride){
-              module = moduleOverride;
-            }
-          }
-          
-          // And attach it to the parent module
-          parentModule[moduleName] = module;
-        }
-
-        // Reset the parent module so that the next child
-        // in the list will be added to the correct parent
-        parentModule = module;
-      }
-
-      return module;
     }
   });
 
@@ -966,6 +917,67 @@ Backbone.Marionette = (function(Backbone, _, $){
 
   };
 
+  // Modules
+  // -------
+
+  // The "Modules" object builds modules on an
+  // object that it is attached to. It should not be
+  // used on it's own, but should be attached to
+  // another object that will define modules.
+  Marionette.Modules = {
+
+    // Add modules to the application, providing direct
+    // access to your applicaiton object, Backbone, 
+    // Marionette, jQuery and Underscore as parameters 
+    // to a callback function.
+    module: function(moduleNames, moduleDefinition){
+      var moduleName, module, moduleOverride;
+      var parentModule = this;
+      var moduleNames = moduleNames.split(".");
+
+      // Loop through all the parts of the module definition
+      var length = moduleNames.length;
+      for(var i = 0; i < length; i++){
+        var isLastModuleInChain = (i === length-1);
+
+        // Get the module name, and check if it exists on
+        // the current parent already
+        moduleName = moduleNames[i];
+        module = parentModule[moduleName];
+
+        // Create a new module if we don't have one already
+        if (!module){ 
+          module = new Marionette.Application();
+        }
+
+        // Check to see if we need to run the definition
+        // for the module. Only run the definition if one
+        // is supplied, and if we're at the last segment
+        // of the "Module.Name" chain.
+        if (isLastModuleInChain && moduleDefinition){
+          moduleOverride = moduleDefinition(module, parentModule, Backbone, Marionette, jQuery, _);
+          // If we have a module override, use it instead.
+          if (moduleOverride){
+            module = moduleOverride;
+          }
+        }
+
+        // If the defined module is not what we are
+        // currently storing as the module, replace it
+        if (parentModule[moduleName] !== module){
+          parentModule[moduleName] = module;
+        }
+
+        // Reset the parent module so that the next child
+        // in the list will be added to the correct parent
+        parentModule = module;
+      }
+
+      // Return the last module in the definition chain
+      return module;
+    }
+  };
+
   // Helpers
   // -------
 
@@ -977,6 +989,9 @@ Backbone.Marionette = (function(Backbone, _, $){
   Marionette.Region.extend = extend;
   Marionette.Application.extend = extend;
 
+  // Copy the `modules` feature on to the `Application` object
+  Marionette.Application.prototype.module = Marionette.Modules.module;
+
   // Copy the features of `BindTo` on to these objects
   _.extend(Marionette.View.prototype, Marionette.BindTo);
   _.extend(Marionette.Application.prototype, Marionette.BindTo);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marionette-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors: