added index that takes into consideration 'options' being undefined

kevindente · Oct 4, 2012 · 224768c · 224768c
1 parent 5239b12
commit 224768c
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 5 deletions.
diff --git a/lib/amd/backbone.marionette.js b/lib/amd/backbone.marionette.js
@@ -318,7 +318,15 @@
     addChildView: function(item, collection, options){
       this.closeEmptyView();
       var ItemView = this.getItemView(item);
-      return this.addItemView(item, ItemView, options.index);
+      var index = (function get_index(options){
+        if(options && options.index){
+          return options.index;
+        }
+        else{
+          return 0;
+        }
+      })(options);
+      return this.addItemView(item, ItemView, index);
     },
 
     // Override from `Marionette.View` to guarantee the `onShow` method

diff --git a/lib/amd/backbone.marionette.min.js b/lib/amd/backbone.marionette.min.js
diff --git a/lib/backbone.marionette.js b/lib/backbone.marionette.js
@@ -302,7 +302,15 @@ Marionette.CollectionView = Marionette.View.extend({
   addChildView: function(item, collection, options){
     this.closeEmptyView();
     var ItemView = this.getItemView(item);
-    return this.addItemView(item, ItemView, options.index);
+    var index = (function get_index(options){
+      if(options && options.index){
+        return options.index;
+      }
+      else{
+        return 0;
+      }
+    })(options);
+    return this.addItemView(item, ItemView, index);
   },
 
   // Override from `Marionette.View` to guarantee the `onShow` method

diff --git a/lib/backbone.marionette.min.js b/lib/backbone.marionette.min.js
diff --git a/src/backbone.marionette.collectionview.js b/src/backbone.marionette.collectionview.js
@@ -26,7 +26,15 @@ Marionette.CollectionView = Marionette.View.extend({
   addChildView: function(item, collection, options){
     this.closeEmptyView();
     var ItemView = this.getItemView(item);
-    return this.addItemView(item, ItemView, options.index);
+    var index = (function get_index(options){
+      if(options && options.index){
+        return options.index;
+      }
+      else{
+        return 0;
+      }
+    })(options);
+    return this.addItemView(item, ItemView, index);
   },
 
   // Override from `Marionette.View` to guarantee the `onShow` method