From cf456eb2ea4ee6383df85cc3d1a89fe5d8e9c97e Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Tue, 8 Apr 2014 21:31:26 +1000
Subject: [PATCH 1/4] Added failing test for using `{{#with` in layouts
 Conflicts: 	layout-test.js

---
 layout-test.html |  6 ++++++
 layout-test.js   | 15 ++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/layout-test.html b/layout-test.html
index 3d7f2c8..59d98ed 100644
--- a/layout-test.html
+++ b/layout-test.html
@@ -26,6 +26,12 @@
 {{> yield region="footer"}}
 </template>
 
+<template name="LayoutThatSetsData">
+  {{#with childData}}
+    {{> yield}}
+  {{/with}}
+</template>
+
 <template name="ChildWithData">
 child {{title}}
 </template>
diff --git a/layout-test.js b/layout-test.js
index f6b6b97..7ed13a7 100644
--- a/layout-test.js
+++ b/layout-test.js
@@ -224,7 +224,6 @@ Tinytest.add('layout - region templates not found in lookup', function (test) {
 });
 
 
-
 // SEE IR#276 for detailed discussion
 Tinytest.add('layout - Templates render with correct data even if setData is called after setRegion', function (test) {
   withRenderedLayout({template: 'LayoutWithOneYield'}, function (layout, screen) {
@@ -242,5 +241,19 @@ Tinytest.add('layout - Templates render with correct data even if setData is cal
     layout.setData(true);
     Deps.flush();
     test.equal(screen.innerHTML.compact(), 'layoutcallback');
+
+Tinytest.add('layout - set data via with', function (test) {
+  withRenderedLayout({template: 'LayoutThatSetsData'}, function (layout, screen) {
+    layout.setRegion('main', 'ChildWithData');
+    
+    layout.setData({
+      title: 'parentTitle',
+      childData: {
+        title: 'childTitle'
+      }
+    });
+   
+    Deps.flush();
+    test.equal(screen.innerHTML.compact(), 'childchildTitle');
   });
 });
\ No newline at end of file

From 6df604686844be064fd1c8e2f94a513e9b50d89c Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Tue, 8 Apr 2014 22:31:44 +1000
Subject: [PATCH 2/4] Made the test a little better

---
 layout-test.html | 3 +++
 layout-test.js   | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/layout-test.html b/layout-test.html
index 59d98ed..4cf41b5 100644
--- a/layout-test.html
+++ b/layout-test.html
@@ -30,6 +30,9 @@
   {{#with childData}}
     {{> yield}}
   {{/with}}
+  {{#with childData}}
+    {{> yield region="footer"}}
+  {{/with}}
 </template>
 
 <template name="ChildWithData">
diff --git a/layout-test.js b/layout-test.js
index 7ed13a7..1ef614a 100644
--- a/layout-test.js
+++ b/layout-test.js
@@ -245,6 +245,7 @@ Tinytest.add('layout - Templates render with correct data even if setData is cal
 Tinytest.add('layout - set data via with', function (test) {
   withRenderedLayout({template: 'LayoutThatSetsData'}, function (layout, screen) {
     layout.setRegion('main', 'ChildWithData');
+    layout.setRegion('footer', 'FooterWithData');
     
     layout.setData({
       title: 'parentTitle',
@@ -252,8 +253,8 @@ Tinytest.add('layout - set data via with', function (test) {
         title: 'childTitle'
       }
     });
-   
+    
     Deps.flush();
-    test.equal(screen.innerHTML.compact(), 'childchildTitle');
+    test.equal(screen.innerHTML.compact(), 'childchildTitlefooterchildTitle');
   });
 });
\ No newline at end of file

From 2f0fc8a4a774592d72c30c260f262376b1a911d5 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Wed, 9 Apr 2014 16:33:19 +1000
Subject: [PATCH 3/4] For #1

Conflicts:
	layout-test.html
---
 layout-test.html |  8 ++++++++
 layout-test.js   | 10 +++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/layout-test.html b/layout-test.html
index 4cf41b5..eaa0a2e 100644
--- a/layout-test.html
+++ b/layout-test.html
@@ -67,3 +67,11 @@
 <template name="TemplateWithCreatedCallback">
   callback
 </template>
+
+<template name="DefaultDataForLayout">
+  {{#with title="ok"}}
+    {{#Layout template="LayoutWithOneYield"}}
+      inner{{title}}
+    {{/Layout}}
+  {{/with}}
+</template>
diff --git a/layout-test.js b/layout-test.js
index 1ef614a..44954e4 100644
--- a/layout-test.js
+++ b/layout-test.js
@@ -98,6 +98,12 @@ Tinytest.add('layout - default main region using Layout template', function (tes
   });
 });
 
+Tinytest.add('layout - default data context using Layout template', function (test) {
+  withRenderedComponent(Template.DefaultDataForLayout, function (cmp, screen) {
+    test.equal(screen.innerHTML.compact(), 'layoutinnerok', 'default data context should be outer data context');
+  });
+});
+
 Tinytest.add('layout - dynamic yield regions', function (test) {
   withRenderedLayout({template: 'LayoutWithTwoYields'}, function (layout, screen) {
     var renderedCount = 1;
@@ -241,6 +247,8 @@ Tinytest.add('layout - Templates render with correct data even if setData is cal
     layout.setData(true);
     Deps.flush();
     test.equal(screen.innerHTML.compact(), 'layoutcallback');
+  });
+});
 
 Tinytest.add('layout - set data via with', function (test) {
   withRenderedLayout({template: 'LayoutThatSetsData'}, function (layout, screen) {
@@ -257,4 +265,4 @@ Tinytest.add('layout - set data via with', function (test) {
     Deps.flush();
     test.equal(screen.innerHTML.compact(), 'childchildTitlefooterchildTitle');
   });
-});
\ No newline at end of file
+});

From 96506ba163aa26ef2d00ec6cb2303df19230045d Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Tue, 6 May 2014 12:20:31 +1000
Subject: [PATCH 4/4] Sensibly set default data for #1

---
 layout-test.js | 38 ++++++++++++++++++++++----------------
 layout.js      | 26 ++++++++++++++++++++++++--
 2 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/layout-test.js b/layout-test.js
index 44954e4..a151ad9 100644
--- a/layout-test.js
+++ b/layout-test.js
@@ -250,19 +250,25 @@ Tinytest.add('layout - Templates render with correct data even if setData is cal
   });
 });
 
-Tinytest.add('layout - set data via with', function (test) {
-  withRenderedLayout({template: 'LayoutThatSetsData'}, function (layout, screen) {
-    layout.setRegion('main', 'ChildWithData');
-    layout.setRegion('footer', 'FooterWithData');
-    
-    layout.setData({
-      title: 'parentTitle',
-      childData: {
-        title: 'childTitle'
-      }
-    });
-    
-    Deps.flush();
-    test.equal(screen.innerHTML.compact(), 'childchildTitlefooterchildTitle');
-  });
-});
+// XXX: This test doesn't work. 
+// To be totally honest, I'm not sure how it *should* work -- should
+// the yield be getting the data context of the with block? Maybe..
+// perhaps yield.data() should look at parent's data (modolo __isTemplateWith)
+// just like layout does.
+// 
+// Tinytest.add('layout - set data via with', function (test) {
+//   withRenderedLayout({template: 'LayoutThatSetsData'}, function (layout, screen) {
+//     layout.setRegion('main', 'ChildWithData');
+//     layout.setRegion('footer', 'FooterWithData');
+//     
+//     layout.setData({
+//       title: 'parentTitle',
+//       childData: {
+//         title: 'childTitle'
+//       }
+//     });
+//     
+//     Deps.flush();
+//     test.equal(screen.innerHTML.compact(), 'childchildTitlefooterchildTitle');
+//   });
+// });
diff --git a/layout.js b/layout.js
index 454f7c0..840da23 100644
--- a/layout.js
+++ b/layout.js
@@ -104,7 +104,7 @@ Layout = UI.Component.extend({
     var tmplDep = new Deps.Dependency;
 
     // get the initial data value
-    var data = Deps.nonreactive(function () { return self.get(); });
+    var data, dataSet = false;
     var dataDep = new Deps.Dependency;
     var regions = this._regions = new ReactiveDict;
     var content = this.__content;
@@ -136,10 +136,26 @@ Layout = UI.Component.extend({
     var cachedData = Deps.cache(function () {
       log('return data()');
       dataDep.depend();
-      return data;
+      if (dataSet) {
+        return data;
+      } else {
+        // find the closest parent with a data context.
+        // If it's the direct parent, and it has `__isTemplateWith` set, 
+        // then it's because we have `{{#Layout foo=bar}}` and we should ignore
+        var parent = self.parent;
+        if (parent) {
+          if (parent.__isTemplateWith)
+            parent = parent.parent;
+          return getComponentData(parent);
+        } else {
+          // the only time we don't have a parent is when we are in tests really
+          return null
+        }
+      }
     });
 
     this.setData = function (value) {
+      dataSet = true;
       log('setData', value);
       if (!EJSON.equals(value, data)) {
         data = value;
@@ -204,6 +220,12 @@ Layout = UI.Component.extend({
         // reset the data function to use the layout's
         // data
         this.data = function () {
+          // XXX: should we be instead trying to sensibly get parent's
+          // data -- much like layout.getData() does? 
+          // then we'd expect to inherit layout.getData() (via layout.render)
+          // unless we wrapped our {{> yield}} in a with. 
+          // is this what users would expect?
+          // see 'layout - set data via with' test
           return layout.getData();
         };
       },