From e659aade164c144f731bae072de840dace46e052 Mon Sep 17 00:00:00 2001 From: Antonino Porcino Date: Sun, 29 Nov 2015 17:36:41 +0100 Subject: [PATCH] aligned router api with 2.3 --- riot-ts.d.ts | 12 ++++++++---- riot-ts.js.map | 2 +- riot-ts.ts | 15 ++++++++++----- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/riot-ts.d.ts b/riot-ts.d.ts index 0ec6487..557ced9 100644 --- a/riot-ts.d.ts +++ b/riot-ts.d.ts @@ -10,12 +10,16 @@ declare module Riot { constructor(); } interface Router { - (callback: Function): any; - (to: string): any; - start(): any; + (callback: Function): void; + (filter: string, callback: Function): void; + (to: string, title?: string): any; + create(): Router; + start(autoExec?: boolean): any; stop(): any; exec(callback: Function): any; - parser(parser: Function): any; + query(): any; + base(base: string): any; + parser(parser: (path: string) => string, secondParser?: Function): any; } interface CompilerResult { tagName: string; diff --git a/riot-ts.js.map b/riot-ts.js.map index 5a4444d..27cf02c 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":"AAAA,IAAO,IAAI,CAiMV;AAjMD,WAAO,IAAI,EACX,CAAC;IAKEA;QAMGC;YACGC,IAAIA,CAACA,UAAUA,CAACA,IAAIA,CAACA,CAACA;QACzBA,CAACA;QAPDD,uBAAEA,GAAFA,UAAGA,MAAcA,EAAEA,QAAkBA,IAAGE,CAACA;QACzCF,wBAAGA,GAAHA,UAAIA,MAAcA,EAAEA,QAAkBA,IAAGG,CAACA;QAC1CH,wBAAGA,GAAHA,UAAIA,MAAcA,IAAGI,CAACA;QACtBJ,4BAAOA,GAAPA,UAAQA,SAAiBA;YAAEK,cAAOA;iBAAPA,WAAOA,CAAPA,sBAAOA,CAAPA,IAAOA;gBAAPA,6BAAOA;;QAAGA,CAACA;QAKzCL,iBAACA;IAADA,CAACA,AATDD,IASCA;IATYA,eAAUA,aAStBA,CAAAA;IAkEDA;QAAAO;QA2BAC,CAACA;QAlBED,wBAAMA,GAANA,UAAOA,IAAUA,IAAIE,CAACA;QACtBF,yBAAOA,GAAPA,UAAQA,aAAuBA,IAAIG,CAACA;QACpCH,oBAAEA,GAAFA,UAAGA,SAAiBA,EAACA,GAAaA,IAAII,CAACA;QACvCJ,qBAAGA,GAAHA,UAAIA,SAAiBA,EAACA,GAAaA,IAAIK,CAACA;QACxCL,qBAAGA,GAAHA,UAAIA,MAAcA,IAAGM,CAACA;QACtBN,yBAAOA,GAAPA,UAAQA,SAAiBA;YAACO,cAAOA;iBAAPA,WAAOA,CAAPA,sBAAOA,CAAPA,IAAOA;gBAAPA,6BAAOA;;QAAGA,CAACA;QACrCP,uBAAKA,GAALA,UAAMA,WAAmCA,EAAEA,QAAcA,IAAGQ,CAACA;QAEtDR,gBAAQA,GAAfA;YACGS,aAAaA,CAACA,IAAIA,CAACA,CAACA;QACvBA,CAACA;QAEMT,qBAAaA,GAApBA,UAAqBA,OAAYA;YAC9BU,IAAIA,OAAOA,GAAIA,IAAIA,CAACA,SAAiBA,CAACA,OAAOA,CAACA;YAC9CA,IAAIA,EAAEA,GAAGA,QAAQA,CAACA,aAAaA,CAACA,OAAOA,CAACA,CAACA;YACzCA,IAAIA,CAACA,KAAKA,CAACA,EAAEA,EAAEA,OAAOA,EAAEA,OAAOA,CAACA,CAACA;YACjCA,MAAMA,CAACA,EAA4BA,CAACA;QACvCA,CAACA;QACJV,cAACA;IAADA,CAACA,AA3BDP,IA2BCA;IA3BYA,YAAOA,UA2BnBA,CAAAA;IAEDA,6CAA6CA;IAC7CA,gBAAgBA,CAACA,EAAEA,OAAOA;QACvBkB,IAAIA,GAAGA,GAAGA,MAAMA,CAACA,IAAIA,CAACA,OAAOA,CAACA,SAASA,CAACA,CAACA,MAAMA,CAACA,UAACA,WAAWA,EAAEA,GAAGA;YAC9DA,WAAWA,CAACA,GAAGA,CAACA,GAAGA,MAAMA,CAACA,wBAAwBA,CAACA,OAAOA,CAACA,SAASA,EAAEA,GAAGA,CAACA,CAACA;YAC3EA,MAAMA,CAACA,WAAWA,CAACA;QACtBA,CAACA,EAACA,EAAEA,CAA0BA,CAACA;QAC/BA,MAAMA,CAACA,gBAAgBA,CAACA,CAACA,EAAEA,GAAGA,CAACA,CAACA;IACnCA,CAACA;IAEDlB;;;;MAIEA;IAEFA;QAEGmB,0BAAqBA,CAACA,GAAGA,CAACA,UAACA,EAAOA,IAAGA,OAAAA,EAAEA,CAACA,QAAQA,EAAEA,EAAbA,CAAaA,CAACA,CAACA;QACpDA,0BAAqBA,GAAGA,EAAEA,CAACA;IAC9BA,CAACA;IAJenB,gBAAWA,cAI1BA,CAAAA;IAEUA,0BAAqBA,GAAoBA,EAAEA,CAACA;IAE5CA,oBAAeA,GAA2CA,EAAEA,CAACA;IAExEA,uBAA8BA,OAAiBA;QAE5CoB,qBAAqBA,WAA2BA;YAE7CC,IAAIA,iBAAiBA,GAAGA,UAAUA,IAAIA;gBACnC,MAAM,CAAC,IAAI,EAAC,OAAO,CAAC,CAAC,CAAS,uDAAuD;gBACrF,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAE,gDAAgD;gBAE9E,EAAE,CAAA,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,KAAO,SAAS,CAAC;oBAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAK,IAAI,CAAC,OAAO,CAAC,CAAC;gBAChF,EAAE,CAAA,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,KAAK,SAAS,CAAC;oBAAC,IAAI,CAAC,EAAE,CAAC,SAAS,EAAG,IAAI,CAAC,SAAS,CAAC,CAAC;gBAClF,EAAE,CAAA,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,KAAM,SAAS,CAAC;oBAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAI,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACjF,EAAE,CAAA,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,KAAO,SAAS,CAAC;oBAAC,IAAI,CAAC,EAAE,CAAC,SAAS,EAAG,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEhF,gCAAgC;YACnC,CAAC,CAACA;YAEFA,IAAIA,CAACA,IAAIA,CAACA,WAAWA,CAACA,OAAOA,EAAEA,WAAWA,CAACA,IAAIA,EAAEA,WAAWA,CAACA,GAAGA,EAAEA,WAAWA,CAACA,OAAOA,EAAEA,iBAAiBA,EAAEA,IAAIA,CAACA,QAAQA,CAACA,QAAQA,CAACA,CAACA;YAElIA,MAAMA,CAACA,WAAWA,CAACA,OAAOA,CAACA;QAC9BA,CAACA;QAEDD,8BAA8BA,QAAQA;YACnCE,IAAIA,GAAGA,GAAGA,IAAIA,cAAcA,EAAEA,CAACA;YAC/BA,GAAGA,CAACA,IAAIA,CAACA,KAAKA,EAAEA,QAAQA,EAAEA,KAAKA,CAACA,CAACA;YACjCA,GAAGA,CAACA,IAAIA,EAAEA,CAACA;YACXA,EAAEA,CAACA,CAACA,GAAGA,CAACA,MAAMA,IAAIA,GAAGA,CAACA;gBAACA,MAAMA,CAACA,GAAGA,CAACA,YAAYA,CAACA;YAC/CA,IAAIA;gBAACA,MAAMA,GAAGA,CAACA,YAAYA,CAACA;QAC/BA,CAACA;QAAAF,CAACA;QAEFA,IAAIA,QAAwBA,CAACA;QAE7BA,2EAA2EA;QAC3EA,EAAEA,CAAAA,CAACA,OAAOA,CAACA,SAASA,CAACA,QAAQA,KAAKA,SAASA,CAACA,CAACA,CAACA;YAC3CA,IAAIA,WAAWA,GAAGA,OAAOA,CAACA,SAASA,CAACA,QAAQA,CAACA;YAC7CA,EAAEA,CAAAA,CAACA,WAAWA,CAACA,OAAOA,CAACA,GAAGA,CAACA,GAACA,CAACA,CAACA,CAACA,CAACA;gBAC7BA,gBAAgBA;gBAChBA,EAAEA,CAAAA,CAACA,oBAAeA,CAACA,WAAWA,CAACA,KAAGA,SAASA,CAACA,CAC5CA,CAACA;oBACEA,kDAAkDA;oBAClDA,QAAQA,GAAGA,oBAAeA,CAACA,WAAWA,CAACA,CAACA;gBAC3CA,CAACA;gBACDA,IAAIA,CACJA,CAACA;oBACEA,yCAAyCA;oBACzCA,WAAWA,GAAGA,oBAAoBA,CAACA,WAAWA,CAACA,CAACA;oBAChDA,QAAQA,GAAGA,IAAIA,CAACA,OAAOA,CAACA,WAAWA,EAAEA,IAAIA,EAAEA,EAACA,QAAQA,EAAEA,IAAIA,EAACA,CAACA,CAACA,CAACA,CAACA,CAACA;gBACnEA,CAACA;YACJA,CAACA;YACDA,IAAIA,CACJA,CAACA;gBACEA,qCAAqCA;gBACrCA,QAAQA,GAAGA,IAAIA,CAACA,OAAOA,CAACA,WAAWA,EAAEA,IAAIA,EAAEA,EAACA,QAAQA,EAAEA,IAAIA,EAACA,CAACA,CAACA,CAACA,CAACA,CAACA;YACnEA,CAACA;YAEDA,OAAOA,CAACA,SAASA,CAACA,OAAOA,GAAGA,WAAWA,CAACA,QAAQA,CAACA,CAACA;QACrDA,CAACA;QACDA,IAAIA;YAACA,MAAMA,iCAAiCA,CAACA;IAChDA,CAACA;IAzDepB,kBAAaA,gBAyD5BA,CAAAA;AACJA,CAACA,EAjMM,IAAI,KAAJ,IAAI,QAiMV;AAID,sBAAsB;AACtB,kBAAkB,QAAgB;IACjCuB,MAAMA,CAACA,UAASA,MAAgBA;QAC3B,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;QACxC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC,CAAAA;AACJA,CAACA"} \ No newline at end of file diff --git a/riot-ts.ts b/riot-ts.ts index 2f77946..8e1361e 100644 --- a/riot-ts.ts +++ b/riot-ts.ts @@ -13,16 +13,21 @@ constructor() { riot.observable(this); } - } + } export interface Router { - (callback: Function); - (to: string); + (callback: Function): void; + (filter: string, callback: Function): void; + (to: string, title?: string); - start(); + create(): Router; + start(autoExec?: boolean); stop(); exec(callback: Function); - parser(parser: Function); + query(): any; + + base(base: string); + parser(parser: (path: string)=>string, secondParser?: Function ); } export interface CompilerResult