allow fillIn as well as mixin

mutualmobile · Nov 30, 2015 · 37356fd · 37356fd
1 parent 4d65c68
commit 37356fd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/mvc/ChildViewManager.js b/src/mvc/ChildViewManager.js
@@ -5,6 +5,7 @@ define(function(require) {
     Disposable = require('lavaca/util/Disposable'),
     contains = require('mout/array/contains'),
     merge = require('mout/object/merge'),
+    fillIn = require('mout/object/fillIn'),
     History = require('lavaca/net/History'),
     removeAll = require('mout/array/removeAll');
 
@@ -97,6 +98,9 @@ define(function(require) {
           if (typeof this.childViewMixin === 'object') {
             merge(childView, this.childViewMixin);
           }
+          if (typeof this.childViewfillin === 'object') {
+            fillIn(childView, this.childViewFillin);
+          }
           if (typeof params === 'object') {
             merge(childView, params);
           }

diff --git a/src/mvc/View.js b/src/mvc/View.js
@@ -749,11 +749,14 @@ define(function(require) {
      *     The map should be in the form {selector: {TView : TView, model : lavaca.mvc.Model, step: Int}}. For example, {'form': {TView : ExampleView, model : new Model(), step: 1}}
      *
     */
-    mapChildViewManager:function(el, map, mixin){
+    mapChildViewManager:function(el, map, mixin, fillin){
       this.childViewManager = new ChildViewManager(el, map, this);
       if (typeof mixin === 'object') {
         this.childViewManager.childViewMixin = mixin;
       }
+      if (typeof fillin === 'object') {
+        this.childViewManager.childViewFillin = fillin;
+      }
     },
 
     /**

diff --git a/src/mvc/ViewManager.js b/src/mvc/ViewManager.js
@@ -5,6 +5,7 @@ define(function(require) {
     Cache = require('lavaca/util/Cache'),
     Disposable = require('lavaca/util/Disposable'),
     merge = require('mout/object/merge'),
+    fillIn = require('mout/object/fillIn'),
     contains = require('mout/array/contains'),
     removeAll = require('mout/array/removeAll');
 
@@ -115,6 +116,9 @@ define(function(require) {
         if (typeof this.pageViewMixin === 'object') {
           merge(pageView, this.pageViewMixin);
         }
+        if (typeof this.pageViewFillin === 'object') {
+          fillIn(pageView, this.pageViewFillin);
+        }
         if (typeof params === 'object') {
           merge(pageView, params);
         }