Revert "fix(Compiler): fix text nodes after content tags"

This reverts commit d599fd3434.
but keeps the integration test. The test is made green by the
following commits.
This commit is contained in:
Tobias Bosch
2015-06-18 12:43:19 -07:00
parent bc798b182d
commit 180e617866
4 changed files with 30 additions and 35 deletions
@@ -13,6 +13,7 @@ import {DOM} from 'angular2/src/dom/dom_adapter';
import {Content} from 'angular2/src/render/dom/shadow_dom/content_tag';
var _scriptStart = `<script start=""></script>`;
var _scriptEnd = `<script end=""></script>`;
export function main() {
describe('Content', function() {
@@ -20,32 +21,35 @@ export function main() {
var content;
beforeEach(() => {
parent = el(`<div>${_scriptStart}</div>`);
let contentStartMarker = DOM.firstChild(parent);
content = new Content(contentStartMarker, '');
parent = el(`<div>${_scriptStart}${_scriptEnd}`);
content = DOM.firstChild(parent);
});
it("should insert the nodes", () => {
content.init(null);
content.insert([el("<a>A</a>"), el("<b>B</b>")]);
var c = new Content(content, '');
c.init(null);
c.insert([el("<a></a>"), el("<b></b>")])
expect(parent).toHaveText('AB');
expect(DOM.getInnerHTML(parent))
.toEqual(`${_scriptStart}<a></a><b></b>${_scriptEnd}`);
});
it("should remove the nodes from the previous insertion", () => {
content.init(null);
content.insert([el("<a>A</a>")]);
content.insert([el("<b>B</b>")]);
var c = new Content(content, '');
c.init(null);
c.insert([el("<a></a>")]);
c.insert([el("<b></b>")]);
expect(parent).toHaveText('B');
expect(DOM.getInnerHTML(parent)).toEqual(`${_scriptStart}<b></b>${_scriptEnd}`);
});
it("should clear nodes on inserting an empty list", () => {
content.init(null);
content.insert([el("<a>A</a>")]);
content.insert([]);
it("should insert empty list", () => {
var c = new Content(content, '');
c.init(null);
c.insert([el("<a></a>")]);
c.insert([]);
expect(parent).toHaveText('');
expect(DOM.getInnerHTML(parent)).toEqual(`${_scriptStart}${_scriptEnd}`);
});
});
}
@@ -10,7 +10,7 @@ import {
it,
xit,
beforeEachBindings,
SpyObject
SpyObject,
} from 'angular2/test_lib';
import {bind} from 'angular2/di';