fixup!

intercom · Dec 23, 2016 · 9ca886a · 9ca886a
1 parent 47cdd53
commit 9ca886a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/ember-runtime.js b/ember-runtime.js
@@ -10377,7 +10377,9 @@ enifed('ember-metal/transaction', ['exports', 'ember-metal/meta', 'ember-metal/d
           referenceMap[key] = reference;
 
           var templateMap = meta.writableLastRenderedTemplateMap();
-          templateMap[key] = debugStack.peek();
+          if (templateMap[key] === undefined) {
+            templateMap[key] = debugStack.peek();
+          }
         });
       };
 

diff --git a/ember-template-compiler.js b/ember-template-compiler.js
@@ -9424,7 +9424,9 @@ enifed('ember-metal/transaction', ['exports', 'ember-metal/meta', 'ember-metal/d
           referenceMap[key] = reference;
 
           var templateMap = meta.writableLastRenderedTemplateMap();
-          templateMap[key] = debugStack.peek();
+          if (templateMap[key] === undefined) {
+            templateMap[key] = debugStack.peek();
+          }
         });
       };
 

diff --git a/ember.debug.js b/ember.debug.js
@@ -13692,7 +13692,7 @@ enifed('ember-glimmer/syntax/render', ['exports', 'glimmer-runtime', 'glimmer-re
   _emberMetal.runInDebug(function () {
     AbstractRenderManager.prototype._pushToDebugStack = function (controllerName, environment) {
       this.debugStack = environment.debugStack;
-      this.debugStack.push('controller:' + controllerName + ' (with render helper)');
+      this.debugStack.push('controller:' + controllerName + ' (with the render helper)');
     };
   });
 
@@ -22887,7 +22887,9 @@ enifed('ember-metal/transaction', ['exports', 'ember-metal/meta', 'ember-metal/d
           referenceMap[key] = reference;
 
           var templateMap = meta.writableLastRenderedTemplateMap();
-          templateMap[key] = debugStack.peek();
+          if (templateMap[key] === undefined) {
+            templateMap[key] = debugStack.peek();
+          }
         });
       };
 

diff --git a/ember.js b/ember.js
@@ -13692,7 +13692,7 @@ enifed('ember-glimmer/syntax/render', ['exports', 'glimmer-runtime', 'glimmer-re
   _emberMetal.runInDebug(function () {
     AbstractRenderManager.prototype._pushToDebugStack = function (controllerName, environment) {
       this.debugStack = environment.debugStack;
-      this.debugStack.push('controller:' + controllerName + ' (with render helper)');
+      this.debugStack.push('controller:' + controllerName + ' (with the render helper)');
     };
   });
 
@@ -22887,7 +22887,9 @@ enifed('ember-metal/transaction', ['exports', 'ember-metal/meta', 'ember-metal/d
           referenceMap[key] = reference;
 
           var templateMap = meta.writableLastRenderedTemplateMap();
-          templateMap[key] = debugStack.peek();
+          if (templateMap[key] === undefined) {
+            templateMap[key] = debugStack.peek();
+          }
         });
       };