From ae928a138cfc762e07ff26f6dd936468eb307551 Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Fri, 30 Oct 2015 16:37:47 -0700
Subject: [PATCH] [Representation] Update compilation approach
Update compilation approach for templateLinker to more
closely resemble ng-include; minimizes likelihood of
subtle behavioral differences (e.g. incorrect size
selection for split pane)
---
platform/representation/src/TemplateLinker.js | 4 +--
.../representation/test/TemplateLinkerSpec.js | 29 ++++++++++++++-----
2 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/platform/representation/src/TemplateLinker.js b/platform/representation/src/TemplateLinker.js
index 82cc1eb153..14d0aa041d 100644
--- a/platform/representation/src/TemplateLinker.js
+++ b/platform/representation/src/TemplateLinker.js
@@ -121,8 +121,8 @@ define(
function populateElement(template) {
destroyScope();
activeScope = scope.$new(false);
- element.empty();
- element.append(self.$compile(template)(activeScope));
+ element.html(template);
+ self.$compile(element.contents())(activeScope);
}
function badTemplate(templateUrl) {
diff --git a/platform/representation/test/TemplateLinkerSpec.js b/platform/representation/test/TemplateLinkerSpec.js
index 85d879f730..726e4deab1 100644
--- a/platform/representation/test/TemplateLinkerSpec.js
+++ b/platform/representation/test/TemplateLinkerSpec.js
@@ -27,7 +27,7 @@ define(
function (TemplateLinker) {
'use strict';
- var JQLITE_METHODS = [ 'replaceWith', 'empty', 'append' ],
+ var JQLITE_METHODS = [ 'replaceWith', 'empty', 'html', 'contents' ],
SCOPE_METHODS = [ '$on', '$new', '$destroy' ];
describe("TemplateLinker", function () {
@@ -39,6 +39,7 @@ define(
mockElement,
mockTemplates,
mockElements,
+ mockContents,
mockNewScope,
mockPromise,
linker;
@@ -54,9 +55,12 @@ define(
mockPromise = jasmine.createSpyObj('promise', ['then']);
mockTemplates = {};
mockElements = {};
+ mockContents = {};
mockTemplateRequest.andReturn(mockPromise);
- mockCompile.andCallFake(function (html) {
+ mockCompile.andCallFake(function (toCompile) {
+ var html = typeof toCompile === 'string' ?
+ toCompile : toCompile.testHtml;
mockTemplates[html] = jasmine.createSpy('template');
mockElements[html] =
jasmine.createSpyObj('templateEl', JQLITE_METHODS);
@@ -67,6 +71,16 @@ define(
return { trusted: url };
});
mockScope.$new.andReturn(mockNewScope);
+ mockElement.html.andCallFake(function (html) {
+ mockContents[html] =
+ jasmine.createSpyObj('contentsEl', JQLITE_METHODS);
+ mockContents[html].testHtml = html;
+ });
+ mockElement.contents.andCallFake(function () {
+ return mockContents[
+ mockElement.html.mostRecentCall.args[0]
+ ];
+ });
linker = new TemplateLinker(
mockTemplateRequest,
@@ -135,8 +149,9 @@ define(
}, false);
});
- it("compiles loaded templates with a new scope", function () {
- expect(mockCompile).toHaveBeenCalledWith(testTemplate);
+ it("compiles element contents with a new scope", function () {
+ expect(mockCompile)
+ .toHaveBeenCalledWith(mockContents[testTemplate]);
expect(mockTemplates[testTemplate])
.toHaveBeenCalledWith(mockNewScope);
});
@@ -146,9 +161,9 @@ define(
.toHaveBeenCalledWith(mockElement);
});
- it("appends rendered content to the specified element", function () {
- expect(mockElement.append)
- .toHaveBeenCalledWith(mockElements[testTemplate]);
+ it("inserts HTML content into the specified element", function () {
+ expect(mockElement.html)
+ .toHaveBeenCalledWith(testTemplate);
});
it("clears templates when called with undefined", function () {