quick hack bugfix for tabbar

tabbar children should be views not array or object
mwaylabs · Dec 13, 2013 · 20fea44 · 20fea44
1 parent ae3aff8
commit 20fea44
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/ui/layouts/tab-layout.js b/src/ui/layouts/tab-layout.js
@@ -127,6 +127,12 @@ M.TabLayout = M.Layout.extend({
                 }
             }
         }).create();
+    },
+
+    //TODO
+    _mergeChildView: function(selector, view){
+        this.childViews[selector] = view;
+        return this;
     }
 
 });
diff --git a/src/ui/views/view.js b/src/ui/views/view.js
@@ -714,12 +714,23 @@
          */
         addChildView: function( selector, view ) {
             if( _.isObject(selector) ) {
+                // this can be an object if the you use it as addChildViews function
+                /**
+                 * @example
+                 *
+                 * var children = {
+                 *  b1: M.View.extend(),
+                 *  b2: M.View.extend()
+                 * };
+                 *
+                 * M.View.create().addChildView(children);
+                 *
+                 */
                 _.each(selector, function( view, selector ) {
                     this._mergeChildView(selector, view);
-
                 }, this);
             } else {
-                this._mergeChildView(selector, view);
+                return this._mergeChildView(selector, view);
             }
             return this;
         },
@@ -732,7 +743,7 @@
          */
         _mergeChildView: function( selector, view ) {
             if( !(_.isString(selector)) || !(M.isView(view)) ) {
-                return;
+                return void 0;
             }
 
             var existingChildViews = this.childViews[selector];