Skip to content

Commit

Permalink
Merged master
Browse files Browse the repository at this point in the history
  • Loading branch information
bvaughn committed Sep 20, 2017
2 parents 8e01b69 + dd00b47 commit be0f147
Show file tree
Hide file tree
Showing 87 changed files with 1,062 additions and 829 deletions.
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ Bartosz Kaszubowski <gosimek@gmail.com>
Basarat Ali Syed <basaratali@gmail.com>
Battaile Fauber <battaile@gmail.com>
Beau Smith <beau@beausmith.com>
Ben Alpert <ben@benalpert.com>
Ben Anderson <banderson@constantcontact.com>
Ben Brooks <ben@benbrooks.net>
Ben Foxall <benfoxall@gmail.com>
Expand Down Expand Up @@ -583,6 +582,7 @@ Simon Welsh <simon@simon.geek.nz>
Simone Vittori <hello@simonewebdesign.it>
Soichiro Kawamura <mail@w-st.com>
Sophia Westwood <sophia@quip.com>
Sophie Alpert <git@sophiebits.com>
Sota Ohara <ohrst.18@gmail.com>
Spencer Handley <spencerhandley@gmail.com>
Stefan Dombrowski <sdo451@gmail.com>
Expand Down
34 changes: 17 additions & 17 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/_data/acknowledgements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
- Basarat Ali Syed
- Battaile Fauber
- Beau Smith
- Ben Alpert
- Ben Anderson
- Ben Brooks
- Ben Foxall
Expand Down Expand Up @@ -584,6 +583,7 @@
- Simone Vittori
- Soichiro Kawamura
- Sophia Westwood
- Sophie Alpert
- Sota Ohara
- Spencer Handley
- Stefan Dombrowski
Expand Down
6 changes: 3 additions & 3 deletions docs/_data/authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ schrockn:
sebmarkbage:
name: Sebastian Markbåge
url: https://twitter.com/sebmarkbage
spicyj:
name: Ben Alpert
url: http://benalpert.com
sophiebits:
name: Sophie Alpert
url: https://sophiealpert.com
steveluscher:
name: Steven Luscher
url: https://twitter.com/steveluscher
Expand Down
16 changes: 8 additions & 8 deletions docs/_js/live_editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ var IS_MOBILE = (

var CodeMirrorEditor = React.createClass({
propTypes: {
lineNumbers: React.PropTypes.bool,
onChange: React.PropTypes.func,
lineNumbers: PropTypes.bool,
onChange: PropTypes.func,
},
getDefaultProps: function() {
return {
Expand Down Expand Up @@ -80,12 +80,12 @@ var ReactPlayground = React.createClass({
MODES: {JSX: 'JSX', JS: 'JS'}, //keyMirror({JSX: true, JS: true}),

propTypes: {
codeText: React.PropTypes.string.isRequired,
transformer: React.PropTypes.func,
renderCode: React.PropTypes.bool,
showCompiledJSTab: React.PropTypes.bool,
showLineNumbers: React.PropTypes.bool,
editorTabTitle: React.PropTypes.string,
codeText: PropTypes.string.isRequired,
transformer: PropTypes.func,
renderCode: PropTypes.bool,
showCompiledJSTab: PropTypes.bool,
showLineNumbers: PropTypes.bool,
editorTabTitle: PropTypes.string,
},

getDefaultProps: function() {
Expand Down
1 change: 1 addition & 0 deletions docs/_layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
<script src="https://unpkg.com/codemirror@5.15.2/mode/javascript/javascript.js"></script>
<script src="https://unpkg.com/codemirror@5.15.2/mode/xml/xml.js"></script>
<script src="https://unpkg.com/codemirror@5.15.2/mode/jsx/jsx.js"></script>
<script src="https://unpkg.com/prop-types/prop-types.min.js"></script>
<script src="https://unpkg.com/react/dist/react.min.js"></script>
<script src="https://unpkg.com/react-dom/dist/react-dom.min.js"></script>
<script src="https://unpkg.com/babel-standalone@6.15.0/babel.min.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions docs/_posts/2013-06-12-community-roundup.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ React was open sourced two weeks ago and it's time for a little round-up of what

## Khan Academy Question Editor

It looks like [Ben Alpert](http://benalpert.com/) is the first person outside of Facebook and Instagram to push React code to production. We are very grateful for his contributions in form of pull requests, bug reports and presence on IRC ([#reactjs on Freenode](irc://chat.freenode.net/reactjs)). Ben wrote about his experience using React:
It looks like [Sophie Alpert](http://sophiebits.com/) is the first person outside of Facebook and Instagram to push React code to production. We are very grateful for her contributions in form of pull requests, bug reports and presence on IRC ([#reactjs on Freenode](irc://chat.freenode.net/reactjs)). Sophie wrote about her experience using React:

> I just rewrote a 2000-line project in React and have now made a handful of pull requests to React. Everything about React I've seen so far seems really well thought-out and I'm proud to be the first non-FB/IG production user of React.
>
> The project that I rewrote in React (and am continuing to improve) is the Khan Academy question editor which content creators can use to enter questions and hints that will be presented to students:
> <figure>[![](/react/img/blog/khan-academy-editor.png)](http://benalpert.com/2013/06/09/using-react-to-speed-up-khan-academy.html)</figure>
> <figure>[![](/react/img/blog/khan-academy-editor.png)](http://sophiebits.com/2013/06/09/using-react-to-speed-up-khan-academy.html)</figure>
>
> [Read the full post...](http://benalpert.com/2013/06/09/using-react-to-speed-up-khan-academy.html)
> [Read the full post...](http://sophiebits.com/2013/06/09/using-react-to-speed-up-khan-academy.html)
## Pimp my Backbone.View (by replacing it with React)

Expand Down
2 changes: 1 addition & 1 deletion docs/_posts/2013-07-03-community-roundup-4.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ React reconciliation process appears to be very well suited to implement a text

## Khan Academy

[Ben Kamens](http://bjk5.com/) explains how [Ben Alpert](http://benalpert.com/) and [Joel Burget](http://joelburget.com/) are promoting React inside of [Khan Academy](https://www.khanacademy.org/). They now have three projects in the works using React.
[Ben Kamens](http://bjk5.com/) explains how [Sophie Alpert](http://sophiebits.com/) and [Joel Burget](http://joelburget.com/) are promoting React inside of [Khan Academy](https://www.khanacademy.org/). They now have three projects in the works using React.

> Recently two Khan Academy devs dropped into our team chat and said they were gonna use React to write a new feature. They even hinted that we may want to adopt it product-wide.
>
Expand Down
4 changes: 2 additions & 2 deletions docs/_posts/2013-07-23-community-roundup-5.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ We launched the [React Facebook Page](https://www.facebook.com/react) along with

## Cross-browser onChange

[Ben Alpert](http://benalpert.com/) from [Khan Academy](https://www.khanacademy.org/) worked on a cross-browser implementation of `onChange` event that landed in v0.4. He wrote a blog post explaining the various browser quirks he had to deal with.
[Sophie Alpert](http://sophiebits.com/) from [Khan Academy](https://www.khanacademy.org/) worked on a cross-browser implementation of `onChange` event that landed in v0.4. She wrote a blog post explaining the various browser quirks she had to deal with.

> First off, what is the input event? If you have an `<input>` element and want to receive events whenever the value changes, the most obvious thing to do is to listen to the change event. Unfortunately, change fires only after the text field is defocused, rather than on each keystroke. The next obvious choice is the keyup event, which is triggered whenever a key is released. Unfortunately, keyup doesn't catch input that doesn't involve the keyboard (e.g., pasting from the clipboard using the mouse) and only fires once if a key is held down, rather than once per inserted character.
>
> Both keydown and keypress do fire repeatedly when a key is held down, but both fire immediately before the value changes, so to read the new value you have to defer the handler to the next event loop using `setTimeout(fn, 0)` or similar, which slows down your app. Of course, like keyup, neither keydown nor keypress fires for non-keyboard input events, and all three can fire in cases where the value doesn't change at all (such as when pressing the arrow keys).
>
> [Read the full post...](http://benalpert.com/2013/06/18/a-near-perfect-oninput-shim-for-ie-8-and-9.html)
> [Read the full post...](http://sophiebits.com/2013/06/18/a-near-perfect-oninput-shim-for-ie-8-and-9.html)

## React Samples
Expand Down
2 changes: 1 addition & 1 deletion docs/_posts/2013-08-26-community-roundup-7.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ It's been three months since we open sourced React and it is going well. Some st
* [76 GitHub projects using React](https://gist.github.com/vjeux/6335762)
* [30 contributors](https://github.com/facebook/react/graphs/contributors)
* [15 blog posts](/react/blog/)
* 2 early adopters: [Khan Academy](http://benalpert.com/2013/06/09/using-react-to-speed-up-khan-academy.html) and [Propeller](http://usepropeller.com/blog/posts/from-backbone-to-react/)
* 2 early adopters: [Khan Academy](http://sophiebits.com/2013/06/09/using-react-to-speed-up-khan-academy.html) and [Propeller](http://usepropeller.com/blog/posts/from-backbone-to-react/)


## Wolfenstein Rendering Engine Ported to React
Expand Down
6 changes: 3 additions & 3 deletions docs/_posts/2013-09-24-community-roundup-8.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ We've also reached a point where there are too many questions for us to handle d
>
> **PETE:** Exactly, exactly. In order to implement that, we communicate it as a fake DOM. What we'll do is rather than throw out the actual browser html and event handlers, we have an internal representation of what the page looks like and then we generate a brand new representation of what we want the page to look like. Then we perform this really, really fast diffing algorithm between those two page representations, DOM representations. Then React will compute the minimum set of DOM mutations it needs to make to bring the page up to date.
>
> Then to finally get to answer your question, that set of DOM mutations then goes into a queue and we can plug in arbitrary flushing strategies for that. For example, when we originally launched React in open source, every setState would immediately trigger a flush to the DOM. That wasn't part of the contract of setState, but that was just our strategy and it worked pretty well. Then this totally awesome open source contributor Ben Alpert at Khan Academy built a new batching strategy which would basically queue up every single DOM update and state change that happened within an event tick and would execute them in bulk at the end of the event tick.
> Then to finally get to answer your question, that set of DOM mutations then goes into a queue and we can plug in arbitrary flushing strategies for that. For example, when we originally launched React in open source, every setState would immediately trigger a flush to the DOM. That wasn't part of the contract of setState, but that was just our strategy and it worked pretty well. Then this totally awesome open source contributor Sophie Alpert at Khan Academy built a new batching strategy which would basically queue up every single DOM update and state change that happened within an event tick and would execute them in bulk at the end of the event tick.
>
> [Read the full conversation ...](http://javascriptjabber.com/073-jsj-react-with-pete-hunt-and-jordan-walke/)
Expand Down Expand Up @@ -53,8 +53,8 @@ While this is not going to work for all the attributes since they are camelCased

## Markdown in React

[Ben Alpert](http://benalpert.com/) converted [marked](https://github.com/chjj/marked), a Markdown JavaScript implementation, in React: [marked-react](https://github.com/spicyj/marked-react). Even without using JSX, the HTML generation is now a lot cleaner. It is also safer as forgetting a call to `escape` will not introduce an XSS vulnerability.
<figure>[![](/react/img/blog/markdown_refactor.png)](https://github.com/spicyj/marked-react/commit/cb70c9df6542c7c34ede9efe16f9b6580692a457)</figure>
[Sophie Alpert](http://sophiebits.com/) converted [marked](https://github.com/chjj/marked), a Markdown JavaScript implementation, in React: [marked-react](https://github.com/sophiebits/marked-react). Even without using JSX, the HTML generation is now a lot cleaner. It is also safer as forgetting a call to `escape` will not introduce an XSS vulnerability.
<figure>[![](/react/img/blog/markdown_refactor.png)](https://github.com/sophiebits/marked-react/commit/cb70c9df6542c7c34ede9efe16f9b6580692a457)</figure>


## Unite from BugBusters
Expand Down
4 changes: 2 additions & 2 deletions docs/_posts/2013-10-29-react-v0-5-1.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: "React v0.5.1"
author: [zpao]
---

This release focuses on fixing some small bugs that have been uncovered over the past two weeks. I would like to thank everybody involved, specifically members of the community who fixed half of the issues found. Thanks to [Ben Alpert][1], [Andrey Popp][2], and [Laurence Rowe][3] for their contributions!
This release focuses on fixing some small bugs that have been uncovered over the past two weeks. I would like to thank everybody involved, specifically members of the community who fixed half of the issues found. Thanks to [Sophie Alpert][1], [Andrey Popp][2], and [Laurence Rowe][3] for their contributions!

## Changelog

Expand All @@ -18,7 +18,7 @@ This release focuses on fixing some small bugs that have been uncovered over the

* Fixed bug with transition and animation event detection.

[1]: https://github.com/spicyj
[1]: https://github.com/sophiebits
[2]: https://github.com/andreypopp
[3]: https://github.com/lrowe

2 changes: 1 addition & 1 deletion docs/_posts/2014-02-16-react-v0.9-rc1.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: React v0.9 RC
author: [spicyj]
author: [sophiebits]
---

We're almost ready to release React v0.9! We're posting a release candidate so that you can test your apps on it; we'd much prefer to find show-stopping bugs now rather than after we release.
Expand Down
2 changes: 1 addition & 1 deletion docs/_posts/2014-02-20-react-v0.9.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: React v0.9
author: [spicyj]
author: [sophiebits]
---

I'm excited to announce that today we're releasing React v0.9, which incorporates many bug fixes and several new features since the last release. This release contains almost four months of work, including over 800 commits from over 70 committers!
Expand Down
2 changes: 1 addition & 1 deletion docs/_posts/2015-02-18-react-conf-roundup-2015.md
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ It was a privilege to welcome the React community to Facebook HQ on January 28
<div class="skinny-col">
<h3 style="margin-top:0"><a class="anchor" name="talk-qa"></a>Core Team Q&amp;A <a class="hash-link" href="#talk-qa">#</a></h3>
<p>
<strong>Tom Occhino</strong>, <strong>Ben Alpert</strong>, <strong>Lee Byron</strong>, <strong>Christopher Chedeau</strong>, <strong>Sebastian Markbåge</strong>, <strong>Jing Chen</strong>, and <strong>Dan Schafer</strong> closed the conference with a Q&amp;A session.
<strong>Tom Occhino</strong>, <strong>Sophie Alpert</strong>, <strong>Lee Byron</strong>, <strong>Christopher Chedeau</strong>, <strong>Sebastian Markbåge</strong>, <strong>Jing Chen</strong>, and <strong>Dan Schafer</strong> closed the conference with a Q&amp;A session.
</div>
<div class="skinny-col">
<iframe width="100%" height="171" src="https://www.youtube-nocookie.com/embed/EPpkboSKvPI" frameborder="0" allowfullscreen></iframe>
Expand Down
2 changes: 1 addition & 1 deletion docs/_posts/2015-03-10-react-v0.13.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "React v0.13"
author: [spicyj]
author: [sophiebits]
---

Today, we're happy to release React v0.13!
Expand Down
2 changes: 1 addition & 1 deletion docs/_posts/2015-03-26-introducing-react-native.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "Introducing React Native"
author: [spicyj]
author: [sophiebits]
---

In January at React.js Conf, we announced React Native, a new framework for building native apps using React. We're happy to announce that we're open-sourcing React Native and you can start building your apps with it today.
Expand Down
2 changes: 1 addition & 1 deletion docs/_posts/2015-07-03-react-v0.14-beta-1.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: React v0.14 Beta 1
author: [spicyj]
author: [sophiebits]
---

This week, many people in the React community are at [ReactEurope](https://www.react-europe.org/) in the beautiful (and very warm) city of Paris, the second React conference that's been held to date. At our last conference, we released the first beta of React 0.13, and we figured we'd do the same today with our first beta of React 0.14, giving you something to play with if you're not at the conference or you're looking for something to do on the way home.
Expand Down
2 changes: 1 addition & 1 deletion docs/_posts/2015-09-02-new-react-developer-tools.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "New React Developer Tools"
layout: post
author: [spicyj]
author: [sophiebits]
---

A month ago, we [posted a beta](/react/blog/2015/08/03/new-react-devtools-beta.html) of the new React developer tools. Today, we're releasing the first stable version of the new devtools. We're calling it version 0.14, but it's a full rewrite so we think of it more like a 2.0 release.
Expand Down
2 changes: 1 addition & 1 deletion docs/_posts/2015-09-10-react-v0.14-rc1.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "React v0.14 Release Candidate"
author: [spicyj]
author: [sophiebits]
---

We’re happy to announce our first release candidate for React 0.14! We gave you a [sneak peek in July](/react/blog/2015/07/03/react-v0.14-beta-1.html) at the upcoming changes but we’ve now stabilized the release more and we’d love for you to try it out before we release the final version.
Expand Down
2 changes: 1 addition & 1 deletion docs/_posts/2015-10-07-react-v0.14.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "React v0.14"
author: [spicyj]
author: [sophiebits]
---

We’re happy to announce the release of React 0.14 today! This release has a few major changes, primarily designed to simplify the code you write every day and to better support environments like React Native.
Expand Down
2 changes: 1 addition & 1 deletion docs/_posts/2015-12-29-react-v0.14.4.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "React v0.14.4"
author: [spicyj]
author: [sophiebits]
---

Happy December! We have a minor point release today. It has just a few small bug fixes.
Expand Down
2 changes: 1 addition & 1 deletion docs/_posts/2016-01-12-discontinuing-ie8-support.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "Discontinuing IE 8 Support in React DOM"
author: [spicyj]
author: [sophiebits]
---

Since its 2013 release, React has supported all popular browsers, including Internet Explorer 8 and above. We handle normalizing many quirks present in old browser versions, including event system differences, so that your app code doesn't have to worry about most browser bugs.
Expand Down
Loading

0 comments on commit be0f147

Please sign in to comment.