bobwen-dev
/
react-templates
mirror of https://github.com/bobwen-dev/react-templates
1
0
Fork 0
Code Issues Releases Wiki Activity

merge #45

This commit is contained in:
ido 2015-07-30 13:41:55 +03:00
parent 3415de3661
commit accef5fb0f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/reactTemplates.js
View File

@ -383,10 +383,10 @@ function convertHtmlToReact(node, context) {
data.body = ifTemplate(data);
}
if (node.attribs[scopeAttr]) {
var scopeVarDeclarations = _.reduce(data.innerScopeMapping, function(acc, rightHandSide, leftHandSide) {
var declaration = "var " + leftHandSide + " = " + rightHandSide + ";"
var scopeVarDeclarations = _.reduce(data.innerScopeMapping, function (acc, rightHandSide, leftHandSide) {
var declaration = 'var ' + leftHandSide + ' = ' + rightHandSide + ';';
return acc + declaration;
}, "");
}, '');
var functionBody = scopeVarDeclarations + 'return ' + data.body;
var generatedFuncName = generateInjectedFunc(context, 'scope' + data.scopeName, functionBody, _.keys(data.outerScopeMapping));
data.body = generatedFuncName + '.apply(this, [' + _.values(data.outerScopeMapping).join(',') + '])';

5
test/src/test.js
View File

@ -184,12 +184,13 @@ test('html tests', function (t) {
files.forEach(check);
function check(testFile) {
var filename = path.join(dataPath, testFile);
var code = '';
try {
var filename = path.join(dataPath, testFile);
var html = fs.readFileSync(filename).toString();
var expected = readFileNormalized(filename + '.html');
// var expected = fs.readFileSync(filename.replace(".html", ".js")).toString();
var code = reactTemplates.convertTemplateToReact(html).replace(/\r/g, '');
code = reactTemplates.convertTemplateToReact(html).replace(/\r/g, '');
var defineMap = {'react/addons': React, lodash: _};
//noinspection JSUnusedLocalSymbols
var define = function (requirementsNames, content) { //eslint-disable-line no-unused-vars,func-style