From 7cfbf133cd7f09d5469bdd71036c7562db3dc159 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Tue, 27 Oct 2020 16:17:04 -0600
Subject: [PATCH] Etemplate: Also expand grids if they're inside a box

---
 api/js/etemplate/et2_widget_box.js | 2 +-
 api/js/etemplate/et2_widget_box.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/js/etemplate/et2_widget_box.js b/api/js/etemplate/et2_widget_box.js
index 4252f610f1..80fc18d0f0 100644
--- a/api/js/etemplate/et2_widget_box.js
+++ b/api/js/etemplate/et2_widget_box.js
@@ -83,7 +83,7 @@ var et2_box = /** @class */ (function (_super) {
             }
             // Create the new element, if no expansion needed
             var id = et2_readAttrWithDefault(node, "id", "");
-            if (id.indexOf('$') < 0 || widgetType != 'box') {
+            if (id.indexOf('$') < 0 || ['box', 'grid'].indexOf(widgetType) == -1) {
                 this.createElementFromNode(node);
                 childIndex++;
             }
diff --git a/api/js/etemplate/et2_widget_box.ts b/api/js/etemplate/et2_widget_box.ts
index 8845a8dd00..fcbbf2a94e 100644
--- a/api/js/etemplate/et2_widget_box.ts
+++ b/api/js/etemplate/et2_widget_box.ts
@@ -93,7 +93,7 @@ export class et2_box extends et2_baseWidget implements et2_IDetachedDOM
 
 			// Create the new element, if no expansion needed
 			var id = et2_readAttrWithDefault(node, "id", "");
-			if(id.indexOf('$') < 0 || widgetType != 'box')
+			if(id.indexOf('$') < 0 || ['box','grid'].indexOf(widgetType) == -1)
 			{
 				this.createElementFromNode(node);
 				childIndex++;