build v0.9.12

kevindente · Sep 2, 2012 · 84a65f0 · 84a65f0
1 parent 419169d
commit 84a65f0
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 28 deletions.
diff --git a/lib/amd/backbone.marionette.js b/lib/amd/backbone.marionette.js
@@ -768,17 +768,29 @@
 
       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);
@@ -864,18 +876,18 @@
     // 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;