Add tests for AbstractTemplateParser and DirectiveParser

This commit is contained in:
Kim Biesbjerg
2016-12-08 13:53:13 +01:00
parent 2c3b5e580d
commit 23d2a5eb9d
5 changed files with 156 additions and 4 deletions

View File

@@ -12,9 +12,9 @@ export abstract class AbstractTemplateParser {
* Extracts inline template from components
*/
protected _extractInlineTemplate(contents: string): string {
const match = new RegExp('template\\s?:\\s?(("|\'|`)(.|[\\r\\n])+?[^\\\\]\\2)').exec(contents);
const match = new RegExp('template\\s?:\\s?("|\'|`)((.|[\\r\\n])+?[^\\\\])\\1').exec(contents);
if (match !== null) {
return match[1];
return match[2];
}
return '';

View File

@@ -18,7 +18,8 @@ export class DirectiveParser extends AbstractTemplateParser implements ParserInt
template = this._normalizeTemplateAttributes(template);
$(template)
.find('[translate]')
.find('[translate],[ng2-translate]')
.addBack()
.each((i: number, element: CheerioElement) => {
const $element = $(element);
const attr = $element.attr('translate');