marionette-rails 0.9.11 → 0.9.12

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

@@ -1,4 +1,4 @@
-// Backbone.Marionette, v0.9.11
+// Backbone.Marionette, v0.9.12
 // Copyright (c)2012 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
 // http://github.com/derickbailey/backbone.marionette
@@ -752,17 +752,29 @@ Marionette.Layout = Marionette.ItemView.extend({
 
     var that = this;
     _.each(this.regions, function (region, name) {
-      if (    typeof region != 'string' 
-           && typeof region.selector != 'string' ) {
-        throw new Exception('Region must be specified as a selector ' +
-                            'string or an object with selector property');
+      var regionIsString = (typeof region === "string");
+      var regionSelectorIsString = (typeof region.selector === "string");
+      var regionTypeIsUndefined = (typeof region.regionType === "undefined");
+
+      if (!regionIsString && !regionSelectorIsString) {
+        throw new Error("Region must be specified as a selector string or an object with selector property");
+      }
+
+      var selector, RegionType;
+     
+      if (regionIsString) {
+        selector = region;
+      } else {
+        selector = region.selector;
       }
 
-      var selector = typeof region === 'string' ? region : region.selector;
-      var regionType = typeof region.regionType === 'undefined' 
-        ? that.regionType : region.regionType;
+      if (regionTypeIsUndefined){
+        RegionType = that.regionType;
+      } else {
+        RegionType = region.regionType;
+      }
       
-      var regionManager = new regionType({
+      var regionManager = new RegionType({
         el: selector,
           getEl: function(selector){
             return that.$(selector);
@@ -848,18 +860,18 @@ _.extend(Marionette.Application.prototype, Backbone.Events, {
   // addRegions({something: "#someRegion"})
   // addRegions{{something: Region.extend({el: "#someRegion"}) });
   addRegions: function(regions){
-    var regionValue, regionObj, region;
+    var RegionValue, regionObj, region;
 
     for(region in regions){
       if (regions.hasOwnProperty(region)){
-        regionValue = regions[region];
+        RegionValue = regions[region];
 
-        if (typeof regionValue === "string"){
+        if (typeof RegionValue === "string"){
           regionObj = new Marionette.Region({
-            el: regionValue
+            el: RegionValue
           });
         } else {
-          regionObj = new regionValue();
+          regionObj = new RegionValue();
         }
 
         this[region] = regionObj;

metadata

@@ -1,65 +1,81 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: marionette-rails
-version: !ruby/object:Gem::Version
-  version: 0.9.11
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 12
+  version: 0.9.12
 platform: ruby
-authors:
+authors: 
 - Godfrey Chan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-09-26 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 1
+        - 0
         version: 3.1.0
+  type: :runtime
+  version_requirements: *id001
 description: Vendors Backbone.Marionette for use with asset pipeline.
-email:
+email: 
 - godfreykfc@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/marionette-rails.rb
 - vendor/assets/javascripts/backbone.marionette.js
 - LICENSE
 - README.md
+has_rdoc: true
 homepage: https://github.com/chancancode/marionette-rails
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Backbone.Marionette for Rails
 test_files: []
+