diff --git a/Rakefile b/Rakefile index 44a3e114..6a7454ba 100644 --- a/Rakefile +++ b/Rakefile @@ -4,12 +4,12 @@ require('yaml') desc "generate js from jsx" task :js do - system "../bin/jsx _js js" + system "../bin/jsx --harmony _js js" end desc "watch js" task :watch do - Process.spawn "../bin/jsx --watch _js js" + Process.spawn "../bin/jsx --watch --harmony _js js" Process.waitall end diff --git a/_config.yml b/_config.yml index 75ca27e2..ae5ffcad 100644 --- a/_config.yml +++ b/_config.yml @@ -34,4 +34,4 @@ sass: sass_dir: _css gems: - jekyll-redirect-from -react_version: 0.11.1 +react_version: 0.11.2 diff --git a/_data/acknowledgements.yml b/_data/acknowledgements.yml index 89f112ef..bb47de4a 100644 --- a/_data/acknowledgements.yml +++ b/_data/acknowledgements.yml @@ -1,22 +1,30 @@ --- - - Adam Krebs + - Adam Mark - Adam Solove - Alan deLevie - Alex Zelenskiy - Alexander Solovyov + - Alexey Raspopov + - Andre Z Sanchez - Andreas Svensson + - Andres Suarez - Andrew Davey + - Andrew Rasmussen - Andrew Zich - Andrey Popp - Anthony van der Hoorn + - Areeb Malik - Ayman Osman - Ben Alpert + - Ben Foxall - Ben Newman - Ben Ripkens - Bill Fisher - Bob Eagan - Bojan Mihelac - Brandon Bloom + - Brandon Tilley - Brian Cooke - Brian Kim - Brian Reavis @@ -24,12 +32,17 @@ - Cam Spiers - Cassus Adam Banko - Cat Chen + - Charles Marsh - Cheng Lou + - Chris Sciolla + - Christian Alfoni - Christian Roman - Christoph Pojer - Christopher Monsanto - Clay Allsopp - Connor McSheffrey + - Cotton Hou + - Dan Abramov - Dan Schafer - Daniel Gasienica - Daniel Lo Nigro @@ -40,6 +53,7 @@ - David Hellsing - David Hu - Devon Blandin + - Dmitrii Abramov - Dmitry Mazuro - Dustin Getz - Enguerran @@ -49,21 +63,24 @@ - Evan Coonrod - Fabio M. Costa - Felipe Oliveira Carvalho + - Felix Gnass - Felix Kling - Fernando Correia - François-Xavier Bois - Fred Zhao - G Scott Olson + - Garren Smith - Geert Pasteels - Geert-Jan Brits - George A Sisco III - Gilbert + - Glen Mailer - Greg Hurrell -- - Greg Roodt + - Greg Roodt - Guangqiang Dong - Guido Bouman - Harry Hull - - Harshad Sabne +- - Harshad Sabne - Hendrik Swanepoel - Hugo Jobling - Ian Obermiller @@ -71,25 +88,36 @@ - Irae Carvalho - Isaac Salier-Hellendag - Ivan Kozik + - Ivan Vergiliev + - Jacob Gable + - Jacob Greenleaf - Jaime Mingo - Jakub Malinowski - James Brantly - James Ide + - James Seppi - Jamie Wong - Jamison Dance + - Jan Hancic - Jan Kassens - Jared Forsyth - Jason Bonta - Jason Trill - Jean Lauliac + - Jed Watson - Jeff Barczewski - Jeff Carpenter + - Jeff Chan - Jeff Morrison - Jeff Welch - Jeffrey Lin + - Jesse Skinner - Jignesh Kakadiya + - Jim OBrien + - Jimmy Jea - Jing Chen - Johannes Baiter + - Johannes Emerich - John Watson - Jon Beebe - Jonas Enlund @@ -101,15 +129,18 @@ - Josh Yudaken - Joshua Ma - Julen Ruiz Aizpuru + - Julien Bordellier - Jun Wu - Juraj Dudak - Justin Jaffray - Karl Mikkelsen + - Karpich Dmitry - Keito Uchiyama - Kit Randel - Kunal Mehta - Kyle Mathews - Laurence Rowe + - Lee Byron - Levi McCallum - Lily - Logan Allen @@ -117,23 +148,40 @@ - Marcin Kwiatkowski - Marcin Szczepanski - Mariano Desanze + - Mark Anderson + - Mark Hintz + - Mark IJbema - Mark Richardson - Marshall Roch -- - Martin Andert + - Martin Andert - Martin Konicek - Mathieu M-Gosselin - Matt Harrison - Matthew Dapena-Tretter - Matti Nelimarkka + - Max F. Albrecht + - Michael Chan +- - Michael Randers-Pehrson - Michal Srb + - Mike D Pilsbury + - Miorel Palii - Mouad Debbar - Nadeesha Cabral + - Naman Goel - Nate Hunzaker + - Nathan White - Nicholas Bergson-Shilcock + - Nick Fitzgerald - Nick Gavalas + - Nick Merwin - Nick Thompson + - Nick Williams - Niklas Boström + - Oleg + - Oleksii Markhovskyi + - Oliver Zeigermann - Owen Coutts + - Pablo Lacerda de Miranda - Pascal Hartig - Paul O’Shannessy - Paul Seiffert @@ -148,32 +196,49 @@ - Richard D. Worth - Richard Feldman - Richard Livesey + - Rick Beerendonk + - Rob Arnold - Ryan Seddon - Sahat Yalkabov + - Sam Selikoff - Sander Spies - Sean Kinsey - Sebastian Markbåge + - Sergey Generalov + - Shane O'Sullivan - Shaun Trennery + - Sheraz + - Shripad K - Simon Højberg + - Simon Welsh - Stefan Dombrowski - Stephen Murphy - Stoyan Stefanov - Sundeep Malladi + - Sunny Juneja - Sven Helmberger + - Sébastien Lorber - Thomas Aylott - Thomas Boyt - Thomas Shaddox - Thomas Shafer + - ThomasCrvsr - Timothy Yung - Tom Haggie + - Tom Hauburger + - Tom MacWright - Tom Occhino - Ville Immonen - Vjeux - Volkan Unsal - Wayne Larsen + - WickyNilliams - Wincent Colaiuta + - XuefengWu - Yuriy Dybskiy - Yuval Dekel - Zach Bruggeman + - cutbko - davidxi - imagentleman + - jon madison diff --git a/_data/nav_docs.yml b/_data/nav_docs.yml index e7c71b68..8b4acece 100644 --- a/_data/nav_docs.yml +++ b/_data/nav_docs.yml @@ -23,6 +23,8 @@ subitems: - id: jsx-in-depth title: JSX in Depth + - id: jsx-spread + title: JSX Spread Attributes - id: jsx-gotchas title: JSX Gotchas - id: interactivity-and-dynamic-uis @@ -31,6 +33,8 @@ title: Multiple Components - id: reusable-components title: Reusable Components + - id: transferring-props + title: Transferring Props - id: forms title: Forms - id: working-with-the-browser @@ -77,6 +81,8 @@ title: Special Non-DOM Attributes - id: reconciliation title: Reconciliation + - id: glossary + title: React (Virtual) DOM Terminology - title: Flux items: - id: flux-overview diff --git a/_js/examples/hello.js b/_js/examples/hello.js index 040a04ac..61a5e732 100644 --- a/_js/examples/hello.js +++ b/_js/examples/hello.js @@ -1,19 +1,14 @@ -/** - * @jsx React.DOM - */ +var HELLO_COMPONENT = ` +var HelloMessage = React.createClass({ + render: function() { + return
Hello {this.props.name}
; + } +}); -var HELLO_COMPONENT = "\ -/** @jsx React.DOM */\n\ -var HelloMessage = React.createClass({\n\ - render: function() {\n\ - return
Hello {this.props.name}
;\n\ - }\n\ -});\n\ -\n\ -React.renderComponent(, mountNode);\ -"; +React.render(, mountNode); +`; -React.renderComponent( +React.render( , document.getElementById('helloExample') ); diff --git a/_js/examples/markdown.js b/_js/examples/markdown.js index 7ea69a61..cc43db49 100644 --- a/_js/examples/markdown.js +++ b/_js/examples/markdown.js @@ -1,43 +1,37 @@ -/** - * @jsx React.DOM - */ +var MARKDOWN_COMPONENT = ` +var converter = new Showdown.converter(); -var MARKDOWN_COMPONENT = "\ -/** @jsx React.DOM */\n\ -\n\ -var converter = new Showdown.converter();\n\ -\n\ -var MarkdownEditor = React.createClass({\n\ - getInitialState: function() {\n\ - return {value: 'Type some *markdown* here!'};\n\ - },\n\ - handleChange: function() {\n\ - this.setState({value: this.refs.textarea.getDOMNode().value});\n\ - },\n\ - render: function() {\n\ - return (\n\ -
\n\ -

Input

\n\ - \n\ -

Output

\n\ - \n\ -
\n\ - );\n\ - }\n\ -});\n\ -\n\ -React.renderComponent(, mountNode);\ -"; +var MarkdownEditor = React.createClass({ + getInitialState: function() { + return {value: 'Type some *markdown* here!'}; + }, + handleChange: function() { + this.setState({value: this.refs.textarea.getDOMNode().value}); + }, + render: function() { + return ( +
+

Input

+