Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions packages/binding.template/src/nativeTemplateEngine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,7 @@ nativeTemplateEngine.prototype.renderTemplateSource = function (
options: TemplateOptions<any>,
templateDocument?: Document
): Node[] {
let version: number
if (ieVersion instanceof Array) {
version = parseInt(ieVersion[1], 10)
} else {
version = ieVersion ?? 0
}
const useNodesIfAvailable = !(version < 9), // IE<9 cloneNode doesn't work properly
templateNodesFunc = useNodesIfAvailable ? templateSource.nodes : null,
templateNodes = templateNodesFunc ? templateSource.nodes?.() : null
const templateNodes = templateSource.nodes ? templateSource.nodes() : null

if (templateNodes) {
return makeArray(templateNodes.cloneNode(true).childNodes)
Expand Down
23 changes: 13 additions & 10 deletions packages/binding.template/src/templateSources.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,21 @@ import { tagNameLower as tagNameLowerFn, setHtml, domData, parseHtmlForTemplateN
const templateScript = 1,
templateTextArea = 2,
templateTemplate = 3,
templateElement = 4
templateElement = 4,
templateAnonymous = 5

export interface TemplateSource {
//constructor(element: Node);

text(): string
text(valueToWrite: string): void
text(valueToWrite?: string): string | void

data(key: string): any
data<T>(key: string): T
data<T>(key: string, valueToWrite: T): void

nodes?: { (): Node; (valueToWrite: Node): void }
nodes(): Node
nodes(valueToWrite: Node): undefined
nodes(valueToWrite?: any): Node | undefined
}

const dataDomDataPrefix = domData.nextKey() + '_'
Expand All @@ -55,8 +57,8 @@ function setTemplateDomData(element, data) {
}

export class domElement implements TemplateSource {
domElement: Element | Comment
templateType: number
protected domElement: Element | Comment
protected templateType: number

constructor(element: Element | Comment) {
this.domElement = element
Expand Down Expand Up @@ -143,21 +145,22 @@ export class domElement implements TemplateSource {
export class anonymousTemplate extends domElement {
constructor(element: Element | Comment) {
super(element)
//The old prototype construct uses an empty-constructor from domElement, so templateType and element was 'undefined'.
//With the new templateType = templateAnonymous (5) we achieve the same behavior in the "nodes" Method
this.templateType = templateAnonymous
}

override text(): string
override text(valueToWrite: string): undefined
override text(/* valueToWrite */): string | undefined {
override text(valueToWrite: string): void
override text(valueToWrite?: string): string | void {
if (arguments.length == 0) {
const templateData = getTemplateDomData(this.domElement)
if (templateData.textData === undefined && templateData.containerData) {
templateData.textData = templateData.containerData.innerHTML
}
return templateData.textData
} else {
const valueToWrite = arguments[0]
setTemplateDomData(this.domElement, { textData: valueToWrite })
}
return undefined
}
}