Merge branch 'v4.10.1'

This commit is contained in:
糖饼 2017-06-05 22:25:33 +08:00
commit 657a37f26d
5 changed files with 20 additions and 22 deletions

View File

@ -1,5 +1,9 @@
# CHANGELOG
## v4.10.1
1. `rule.use` 函数第一个传入数据类型由“类 `String` ”对象改为真正的 `String` 对象
## v4.10.0
1. 修复标准语法的 BUG [#408](https://github.com/aui/art-template/issues/408),并且不再兼容 v3 的辅助方法调用:`{{helper args}}`

View File

@ -6,15 +6,12 @@ var TYPE_RAW = 'raw';
var TYPE_ESCAPE = 'escape';
function Match(content, line, start, end) {
this.content = content;
this.line = line;
this.start = start;
this.end = end;
};
Match.prototype.toString = function () {
return this.content;
};
var match = new String(content);
match.line = line;
match.start = start;
match.end = end;
return match;
}
/**
* 将模板转换为 Tokens

File diff suppressed because one or more lines are too long

View File

@ -2,7 +2,7 @@
"name": "art-template",
"description": "JavaScript Template Engine",
"homepage": "http://aui.github.com/art-template/",
"version": "4.10.0",
"version": "4.10.1",
"keywords": [
"template"
],

View File

@ -4,15 +4,12 @@ const TYPE_RAW = 'raw';
const TYPE_ESCAPE = 'escape';
function Match(content, line, start, end) {
this.content = content;
this.line = line;
this.start = start;
this.end = end;
};
Match.prototype.toString = function(){
return this.content;
};
const match = new String(content);
match.line = line;
match.start = start;
match.end = end;
return match;
}
/**