Merge remote-tracking branch 'origin/gh-pages' into gh-pages

README.md

@@ -25,6 +25,8 @@ https://github.com/wix/generator-react-templates
 Here's a sample Hello project:<br/>
 https://github.com/wix/hello-react-templates
 
+## IntelliJ / WebStorm plugin
+http://plugins.jetbrains.com/plugin/7648
 
 
 ###### Basic concepts for React templates

src/reactTemplates.js

@@ -349,7 +349,7 @@ function convertHtmlToReact(node, context) {
  * @return {string}
  */
 function convertTemplateToReact(html, options) {
-    var rootNode = cheerio.load(html, {lowerCaseTags: false, lowerCaseAttributeNames: false, xmlMode: true, withStartIndices: true});
+    var rootNode = cheerio.load(html, {lowerCaseTags: false, lowerCaseAttributeNames: false, xmlMode: false, withStartIndices: true});
     options = _.defaults({}, options, defaultOptions);
     var defines = {'react/addons': 'React', lodash: '_'};
     var context = defaultContext(html, options);

test/data/inputs.rt

@@ -0,0 +1,5 @@
+<!doctype rt>
+<div>
+    <input type="text" name="first">
+    <input type="text" name="second">
+</div>

test/data/inputs.rt.js

@@ -0,0 +1,15 @@
+define([
+    'react/addons',
+    'lodash'
+], function (React, _) {
+    'use strict';
+    return function () {
+        return React.createElement('div', {}, React.createElement('input', {
+            'type': 'text',
+            'name': 'first'
+        }), React.createElement('input', {
+            'type': 'text',
+            'name': 'second'
+        }));
+    };
+});

test/src/test.js

@@ -43,7 +43,7 @@ function errorEqual(err) {
 }
 
 test('conversion test', function (t) {
-    var files = ['div.rt', 'test.rt', 'repeat.rt'];
+    var files = ['div.rt', 'test.rt', 'repeat.rt','inputs.rt'];
     t.plan(files.length);
 
     files.forEach(check);