From 568729434184fc2f5ac823ed537f11c6211c2e34 Mon Sep 17 00:00:00 2001 From: Antonino Porcino Date: Mon, 23 Nov 2015 17:53:11 +0100 Subject: [PATCH] Aligned with Riot v2.3.11 API --- README.md | 5 ++++- Test/elements/timer.html | 2 +- Test/elements/timer.ts | 3 ++- Test/index.html | 8 +++---- Test/specRunner.html | 3 +-- Test/specRunner.js | 3 --- Test/specRunner.js.map | 2 +- Test/specRunner.ts | 4 ---- Test/web.config | 5 +++++ bower.json | 6 +++--- riot-ts.d.ts | 13 ++++++++++-- riot-ts.js | 22 ++++++-------------- riot-ts.js.map | 2 +- riot-ts.ts | 45 ++++++++++++++++++++-------------------- web.config | 5 +++++ 15 files changed, 66 insertions(+), 62 deletions(-) diff --git a/README.md b/README.md index 2f43b6b..4daf40a 100644 --- a/README.md +++ b/README.md @@ -333,7 +333,7 @@ module.exports = function(grunt) { }; ``` -- Then run `grunt htmlCovert` from the command line. +- Then run `grunt htmlConvert` from the command line. A file named `elements/template-cache.js` will be built with all templates from the `elements\` directory. That file can be inlined with a ` - + - +

Riot with TypeScript example

- this is inside timer + this is inside timer diff --git a/Test/specRunner.html b/Test/specRunner.html index d963464..42426ec 100644 --- a/Test/specRunner.html +++ b/Test/specRunner.html @@ -14,8 +14,7 @@ - - + diff --git a/Test/specRunner.js b/Test/specRunner.js index 359fe48..b172457 100644 --- a/Test/specRunner.js +++ b/Test/specRunner.js @@ -50,9 +50,6 @@ function RunSpecs() { it('creates correct element bodies', function () { expect(instance.inner_div.innerHTML).toBe("test1 element"); }); - it('creates elements with correct riot-tag', function () { - expect(instance.opts["riot-tag"]).toBe("test1"); - }); it('creates elements with correct template', function () { expect(el.innerHTML).toBe('
test1 element
'); }); diff --git a/Test/specRunner.js.map b/Test/specRunner.js.map index ec4ad53..cf91d33 100644 --- a/Test/specRunner.js.map +++ b/Test/specRunner.js.map @@ -1 +1 @@ -{"version":3,"file":"specRunner.js","sourceRoot":"","sources":["specRunner.ts"],"names":["waitFor","querySelector","getClass","implements","RunSpecs"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"specRunner.js","sourceRoot":"","sources":["specRunner.ts"],"names":["waitFor","querySelector","getClass","implements","RunSpecs"],"mappings":"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"} \ No newline at end of file diff --git a/Test/specRunner.ts b/Test/specRunner.ts index 8bf1e24..fbf7e09 100644 --- a/Test/specRunner.ts +++ b/Test/specRunner.ts @@ -67,10 +67,6 @@ function RunSpecs() expect(instance.inner_div.innerHTML).toBe("test1 element"); }); - it('creates elements with correct riot-tag', () => { - expect(instance.opts["riot-tag"]).toBe("test1"); - }); - it('creates elements with correct template', () => { expect(el.innerHTML).toBe('
test1 element
'); }); diff --git a/Test/web.config b/Test/web.config index bfb640d..9f2197e 100644 --- a/Test/web.config +++ b/Test/web.config @@ -8,4 +8,9 @@ + + + + + \ No newline at end of file diff --git a/bower.json b/bower.json index 1bb2ee8..73d0687 100644 --- a/bower.json +++ b/bower.json @@ -7,14 +7,14 @@ ], "description": "Riot for TypeScript", "main": "riot-ts.js", - "license": "MIT", + "license": "MIT", "ignore": [ "/*", "!riot-ts.*", "!LICENSE.txt", "!README.md" - ], + ], "dependencies": { - "riot": "~2.2.3" + "riot": "~2.3.11" } } diff --git a/riot-ts.d.ts b/riot-ts.d.ts index 54264ac..5cb2111 100644 --- a/riot-ts.d.ts +++ b/riot-ts.d.ts @@ -17,6 +17,13 @@ declare module Riot { exec(callback: Function): any; parser(parser: Function): any; } + interface CompilerResult { + tagName: string; + html: string; + css: string; + attribs: string; + js: string; + } interface Base { version: string; settings: Riot.Settings; @@ -24,8 +31,8 @@ declare module Riot { mount(selector: string, tagName: string, opts?: any): Array; mount(domNode: Node, tagName: string, opts?: any): Array; render(tagName: string, opts?: any): string; - tag(tagName: string, html: string, css?: string, attrs?: string, constructor?: Function): any; - tag(tagName: string, html: string, constructor?: Function): any; + tag(tagName: string, html: string, css: string, attrs: string, constructor: Function): any; + tag2(tagName: string, html: string, css: string, attrs: string, constructor: Function, bpair: string): any; class(element: Function): void; observable(object: any): void; mixin(mixinName: string, mixinObject: any): void; @@ -33,6 +40,8 @@ declare module Riot { compile(url: string, callback: Function): void; compile(tag: string): string; compile(tag: string, dontExecute: boolean): string; + compile(tag: string, options: any): string; + compile(tag: string, dontExecute: boolean, options: any): CompilerResult[]; route: Riot.Router; } interface LifeCycle { diff --git a/riot-ts.js b/riot-ts.js index 7f574f3..1defc21 100644 --- a/riot-ts.js +++ b/riot-ts.js @@ -66,10 +66,8 @@ var Riot; function registerClass(element) { function registerTag(template) { var transformFunction = function (opts) { - // copies prototype into "this" - extend(this, element); - // calls class constructor applying it on "this" - element.apply(this, [opts]); + extend(this, element); // copies prototype into "this" + element.apply(this, [opts]); // calls class constructor applying it on "this" if (element.prototype.mounted !== undefined) this.on("mount", this.mounted); if (element.prototype.unmounted !== undefined) @@ -78,19 +76,11 @@ var Riot; this.on("update", this.updating); if (element.prototype.updated !== undefined) this.on("updated", this.updated); + // TODO support for init(opts) ? }; - var compiled = riot.compile(template, true); - var r = compiled.indexOf("riot.tag("); - var stripped = compiled.substr(r + 9); - var x = stripped.lastIndexOf(", function(opts) {"); - stripped = stripped.substr(0, x); - var compiledTemplate = eval("[" + stripped + "]"); - var tagName = compiledTemplate.length > 0 ? compiledTemplate[0] : ""; - var html = compiledTemplate.length > 1 ? compiledTemplate[1] : ""; - var css = compiledTemplate.length > 2 ? compiledTemplate[2] : ""; - var attr = compiledTemplate.length > 3 ? compiledTemplate[3] : undefined; - riot.tag(tagName, html, css, attr, transformFunction); - return tagName; + var compiledTag = riot.compile(template, true, { entities: true })[0]; + riot.tag2(compiledTag.tagName, compiledTag.html, compiledTag.css, compiledTag.attribs, transformFunction, riot.settings.brackets); + return compiledTag.tagName; } function loadTemplateFromHTTP(template) { var req = new XMLHttpRequest(); diff --git a/riot-ts.js.map b/riot-ts.js.map index 5c39f9d..600f877 100644 --- a/riot-ts.js.map +++ b/riot-ts.js.map @@ -1 +1 @@ -{"version":3,"file":"riot-ts.js","sourceRoot":"","sources":["riot-ts.ts"],"names":["Riot","Riot.Observable","Riot.Observable.constructor","Riot.Observable.on","Riot.Observable.one","Riot.Observable.off","Riot.Observable.trigger","Riot.Element","Riot.Element.constructor","Riot.Element.update","Riot.Element.unmount","Riot.Element.on","Riot.Element.one","Riot.Element.off","Riot.Element.trigger","Riot.Element.mixin","Riot.Element.register","Riot.Element.createElement","Riot.extend","Riot.registerAll","Riot.registerClass","Riot.registerClass.registerTag","Riot.registerClass.loadTemplateFromHTTP","template"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"riot-ts.js","sourceRoot":"","sources":["riot-ts.ts"],"names":["Riot","Riot.Observable","Riot.Observable.constructor","Riot.Observable.on","Riot.Observable.one","Riot.Observable.off","Riot.Observable.trigger","Riot.Element","Riot.Element.constructor","Riot.Element.update","Riot.Element.unmount","Riot.Element.on","Riot.Element.one","Riot.Element.off","Riot.Element.trigger","Riot.Element.mixin","Riot.Element.register","Riot.Element.createElement","Riot.extend","Riot.registerAll","Riot.registerClass","Riot.registerClass.registerTag","Riot.registerClass.loadTemplateFromHTTP","template"],"mappings":"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"} \ No newline at end of file diff --git a/riot-ts.ts b/riot-ts.ts index 8569154..611440d 100644 --- a/riot-ts.ts +++ b/riot-ts.ts @@ -25,6 +25,15 @@ parser(parser: Function); } + export interface CompilerResult + { + tagName: string; + html: string; + css: string; + attribs: string; + js: string; + } + export interface Base { version: string; @@ -32,9 +41,9 @@ mount(customTagSelector: string, opts?: any): Array; mount(selector: string, tagName: string, opts?: any): Array; mount(domNode: Node, tagName: string, opts?: any): Array; - render(tagName: string, opts?: any): string; - tag(tagName: string, html: string, css?: string, attrs?: string,constructor?: Function); - tag(tagName: string, html: string, constructor?: Function); + render(tagName: string, opts?: any): string; + tag(tagName: string, html: string, css: string, attrs: string, constructor: Function); + tag2(tagName: string, html: string, css: string, attrs: string, constructor: Function, bpair: string); class(element: Function): void; observable(object: any): void; @@ -44,6 +53,8 @@ compile(url: string, callback: Function): void; compile(tag: string): string; compile(tag: string, dontExecute: boolean): string; + compile(tag: string, options: any): string; + compile(tag: string, dontExecute: boolean, options: any): CompilerResult[]; // TODO server-only methods @@ -121,33 +132,23 @@ function registerTag(template: string) { - var transformFunction = function (opts) { - // copies prototype into "this" - extend(this,element); - // calls class constructor applying it on "this" - element.apply(this, [opts]); + var transformFunction = function (opts) { + extend(this,element); // copies prototype into "this" + element.apply(this, [opts]); // calls class constructor applying it on "this" + if(element.prototype.mounted !== undefined) this.on("mount" , this.mounted); if(element.prototype.unmounted !== undefined) this.on("unmount" , this.unmounted); if(element.prototype.updating !== undefined) this.on("update" , this.updating); if(element.prototype.updated !== undefined) this.on("updated" , this.updated); + + // TODO support for init(opts) ? }; - var compiled = riot.compile(template,true); - var r = compiled.indexOf("riot.tag("); - var stripped = compiled.substr(r+9); - var x = stripped.lastIndexOf(", function(opts) {"); - stripped = stripped.substr(0,x); - - var compiledTemplate = eval("["+stripped+"]"); - - var tagName = compiledTemplate.length>0 ? compiledTemplate[0] : ""; - var html = compiledTemplate.length>1 ? compiledTemplate[1] : ""; - var css = compiledTemplate.length>2 ? compiledTemplate[2] : ""; - var attr = compiledTemplate.length>3 ? compiledTemplate[3] : undefined; + var compiledTag = riot.compile(template, true, {entities: true})[0]; - riot.tag(tagName, html, css, attr, transformFunction); + riot.tag2(compiledTag.tagName, compiledTag.html, compiledTag.css, compiledTag.attribs, transformFunction, riot.settings.brackets); - return tagName; + return compiledTag.tagName; } function loadTemplateFromHTTP(template) { diff --git a/web.config b/web.config index 741d797..9c14277 100644 --- a/web.config +++ b/web.config @@ -5,5 +5,10 @@ + + + + +