{"commit":{"revision":"546bf0ed74a80936500d9f11dd54128d7de53835","authoredAt":"2014-06-28T17:32:57-07:00","authorName":"Cheng Lou","authorEmail":"chenglou92@gmail.com","shortRevision":"546bf0ed74","subject":"Merge pull request #1760 from spicyj\/docs-harmony"},"parents":["bc11793c04236270996f506e7bd4b6bceddc9543","ba67bf1b0dc2dd91cd6a57cdbc811d5adc8d1ef0"],"body":"Add --harmony option to live JSX compiler page","files":[{"path":"docs\/_css\/react.scss","status":"M"},{"path":"docs\/_js\/jsx-compiler.js","status":"M"},{"path":"docs\/_js\/live_editor.js","status":"M"}],"patch":"diff --git a\/docs\/_css\/react.scss b\/docs\/_css\/react.scss\nindex a315ee9ad9..95798311e8 100644\n--- a\/docs\/_css\/react.scss\n+++ b\/docs\/_css\/react.scss\n@@ -455,6 +455,11 @@ section.black content {\n padding-top: 20px;\n width: 1220px;\n \n+ label.compiler-option {\n+ display: block;\n+ margin-top: 5px;\n+ }\n+\n #jsxCompiler {\n margin-top: 20px;\n }\ndiff --git a\/docs\/_js\/jsx-compiler.js b\/docs\/_js\/jsx-compiler.js\nindex cbc1a3cf4b..99cf318ce7 100644\n--- a\/docs\/_js\/jsx-compiler.js\n+++ b\/docs\/_js\/jsx-compiler.js\n@@ -13,15 +13,38 @@ var HelloMessage = React.createClass({\\n\\\n React.renderComponent(, mountNode);\\\n \";\n \n-var transformer = function(code) {\n- return JSXTransformer.transform(code).code;\n+function transformer(harmony, code) {\n+ return JSXTransformer.transform(code, {harmony: harmony}).code;\n }\n+\n+var CompilerPlayground = React.createClass({\n+ getInitialState: function() {\n+ return {harmony: false};\n+ },\n+ handleHarmonyChange: function(e) {\n+ this.setState({harmony: e.target.checked});\n+ },\n+ render: function() {\n+ return (\n+

\n+ \n+ \n+ {' '}\n+ Enable ES6 transforms (

--harmony<\/code>)\n+        <\/label>\n+      <\/div>\n+    );\n+  },\n+});\n React.renderComponent(\n-  ,\n+  ,\n   document.getElementById('jsxCompiler')\n );\ndiff --git a\/docs\/_js\/live_editor.js b\/docs\/_js\/live_editor.js\nindex 1af8fa2294..477db9c856 100644\n--- a\/docs\/_js\/live_editor.js\n+++ b\/docs\/_js\/live_editor.js\n@@ -173,10 +173,11 @@ var ReactPlayground = React.createClass({\n     this.executeCode();\n   },\n \n-  componentWillUpdate: function(nextProps, nextState) {\n+  componentDidUpdate: function(prevProps, prevState) {\n     \/\/ execute code only when the state's not being updated by switching tab\n     \/\/ this avoids re-displaying the error, which comes after a certain delay\n-    if (this.state.code !== nextState.code) {\n+    if (this.props.transformer !== prevProps.transformer ||\n+        this.state.code !== prevState.code) {\n       this.executeCode();\n     }\n   },\n"}

dillon1000/react

Files changed