Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support xjst #49

Merged
merged 14 commits into from
Jun 23, 2015
Merged

Support xjst #49

merged 14 commits into from
Jun 23, 2015

Conversation

tormozz48
Copy link
Contributor

Resolved #47

@blond
Please review it


return this._xjstProcess(code, sourceMap).then(function (res) {
res = template + res;
return res;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Можно просто return template + res;

@blond
Copy link
Member

blond commented Jun 19, 2015

Нужно добавить обработку случая, когда приходит новое ядро и кидать ошибку.

@blond
Copy link
Member

blond commented Jun 19, 2015

Тесты упали из-за таймаута, можно в опциях mocha немного его поднять.

@blond blond added ready and removed in progress labels Jun 21, 2015
…mpatibility. Add corresponded tests for this case
].join(EOL);

if (parsed.version === 2) {
throw new Error('XJST templates can not be used with bem-core v3 i18n system');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

v3 нужно убрать, т.к. i18n потом будет портировано в v2

@@ -35,6 +35,7 @@
"dependencies": {
"bemhtml-compat": "0.1.2",
"enb-bemxjst": "1.3.4",
"enb-xjst": "enb-bem/enb-xjst#issue-63",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR влит, теперь можно зависеть от master

@tormozz48
Copy link
Contributor Author

Исправил поломанные тесты. @blond

@blond blond changed the title Issue 47 Support bemhtml-i18n for xjst core of templates Support xjst Jun 23, 2015
blond added a commit that referenced this pull request Jun 23, 2015
@blond blond merged commit 13431e2 into 1.x Jun 23, 2015
@blond blond deleted the issue-47 branch June 23, 2015 08:04
@blond blond removed the ready label Jun 23, 2015
@blond blond mentioned this pull request Jun 23, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants