Commit Graph

911 Commits

Author SHA1 Message Date
Paul O’Shannessy
64aca61599 [docs] Use subitem in new nav generation
(cherry picked from commit 995d0e588bf245cb585951f21dfcc3862a48f55a)
2014-09-29 13:48:25 -07:00
Jacob Gable
f19fef92df Spelling fix
- Puting -> Putting
2014-09-26 12:42:58 -05:00
fisherwebdev
08477ab249 Merge pull request #2236 from zpao/rm-flux-docs 2014-09-26 07:03:37 -07:00
Paul O’Shannessy
3a0babddc9 Point to Flux site for Flux docs
This doesn't actually remove the pages, just the main content. Sidebar
items now link offsite. The pages doesn't automatically redirect, but we
could do that if we really wanted.

Fixes #2229
2014-09-25 12:34:22 -07:00
Bill Fisher
e396d0ab10 Merge pull request #2240 from christianalfoni/patch-1
Update flux-todo-list.md
2014-09-25 08:33:02 -07:00
Christian Alfoni
42a2b28a49 Update flux-todo-list.md
You have to instantiate a Dispatcher to use it, not just grab the prototype or it will fail when trying to grab instance properties like: this.$Dispatcher._callbacks.
2014-09-25 11:54:52 +02:00
Oleksii Markhovskyi
cdefbedd37 fix typos 2014-09-25 09:54:35 +02:00
Paul O’Shannessy
cfe020ce45 Merge pull request #2228 from XuefengWu/patch-1
add tip for the important jsx convention
2014-09-24 15:35:36 -07:00
fisherwebdev
3ec429d3cd [blog] testing flux applications 2014-09-24 12:35:39 -07:00
XuefengWu
686961b23d Update getting-started.md
fix grammar
2014-09-24 08:26:10 +08:00
XuefengWu
0695f4158e Update getting-started.md
merge the warn and explain for the @jsx
2014-09-23 15:22:11 +08:00
Paul O’Shannessy
f0cf05a3fd Merge pull request #2225 from jesseskinner/patch-1
Fix inconsistency in mockComponent argument name
2014-09-22 14:42:38 -07:00
Paul O’Shannessy
770af56907 Merge pull request #2180 from zpao/fix-2179
Reword Component API intro
2014-09-22 14:41:18 -07:00
Paul O’Shannessy
f54b7aec3f Reword Component API intro
Fixes #2179
2014-09-22 14:40:22 -07:00
Paul O’Shannessy
47635b67cd Merge pull request #2209 from glenjamin/patch-2
[docs] Clarify wording on sub-tree reconciliation
2014-09-22 14:32:18 -07:00
Paul O’Shannessy
d0acf93c3e Move examples from the website to the wiki. 2014-09-22 14:29:39 -07:00
XuefengWu
b15344de49 add tip for the important jsx convention
I missed the convention and wast hours to figure out what's wrong. 
Add this tip in the document for who would miss the importance comment.
2014-09-22 20:10:34 +08:00
fisherwebdev
ce6fbfa42b Acknowledge ProjectMoon for allowing us to use the flux name on npm 2014-09-21 21:10:39 -07:00
Jesse Skinner
1f1071a8c3 Fix inconsistency in mockComponent argument name
The second argument of mockComponent was listed as tagName, but referred to in the description as mockTagName. I changed the first one to mockTagName to be consistent.
2014-09-21 23:00:25 -04:00
Jacob Greenleaf
c4423dce8d Fix typo in documentation in Flux Todo List 2014-09-18 18:30:57 -07:00
Glen Mailer
f5a4a76780 [docs] Clarify wording on sub-tree reconciliation
The previous wording could be interpreted to mean sub-trees moving from
within one sibling to within another, rather than the shuffling of siblings on
a single level as intended
2014-09-18 22:48:35 +01:00
Christopher Chedeau
892c9c5d50 Update 2014-09-12-community-round-up-22.md 2014-09-12 11:34:29 -07:00
Christopher Chedeau
47740727d1 Merge pull request #2186 from vjeux/roundup_22
Community roundup #22
2014-09-12 11:06:25 -07:00
Christopher Chedeau
5bd5ad6de5 Community roundup #22 2014-09-12 10:35:30 -07:00
Paul O’Shannessy
8fae246bc8 Merge pull request #2097 from fitzgen/explain-where-to-provide-key
Explain where to provide the key for dynamic children.
2014-09-11 14:14:55 -07:00
Ben Foxall
f3fb21afc0 Less -> Fewer
bugs and bytes are countable, so should be fewer
2014-09-11 14:33:16 +01:00
Nick Fitzgerald
8aff7a1630 Explain where to provide the key for dynamic children. 2014-09-10 14:53:41 -07:00
Paul O’Shannessy
c23d051e3f Merge pull request #2170 from undernewmanagement/patch-1
Added extra explanation for require() statements
2014-09-10 13:21:47 -07:00
Sheraz
15d206798c Updated small change with zuggestions from @zpao 2014-09-10 12:29:54 +02:00
Paul O’Shannessy
dabc2c19e8 Merge pull request #2167 from mhintz/patch-1
Update ref-03-component-specs.md
2014-09-09 16:00:39 -07:00
Mark Anderson
a7faaa9312 Added extra explanation for require() statements 2014-09-09 14:39:07 +02:00
Mark Hintz
b61aace624 Update ref-03-component-specs.md
Edit the description of componentDidMount() to make clear that the function is called only once during the lifecycle of the component, after only the initial render() call. The description is now similar to that for componentWillMount(). The existing wording does not make it clear that the function is called only after the initial render. (Granted, it is possible to infer this from descriptions of the component lifecycle found elsewhere in the documentation, but I think explicit is better than implicit in this case).
2014-09-09 11:50:13 +02:00
Oliver Zeigermann
c1abc9b8c5 Update 09.5-clone-with-props.md 2014-09-09 10:52:26 +02:00
Paul O’Shannessy
30688b66bd Merge pull request #2158 from Daniel15/htmltojsx-move
Move htmltojsx.js to React-Magic project.
2014-09-07 18:52:37 -07:00
Daniel Lo Nigro
1d0fc1188b console.warn when html-jsx-lib.js is loaded 2014-09-07 15:20:42 -07:00
Paul O’Shannessy
49cf44adeb Merge pull request #2155 from rickbeerendonk/patch-1
Update video.md with Forward JS 2014 talk
2014-09-07 14:31:03 -07:00
Daniel Lo Nigro
4bfdaa7929 Move htmltojsx.js to React-Magic project.
The HTMLtoJSX file is really a part of the React-Magic project, and should belong there rather than here:
 - It doesn't really follow the release cycle of React at all
 - It is totally standalone with no dependency on React
 - The only usage of this script is in React-Magic and on the HTML to JSX page on the React website (http://facebook.github.io/react/html-jsx.html)

I've hotlinked it from the Github site for that project since this was the easiest way to pull it in.

Due to the fact that Github Pages lacks redirects (among other basic web hosting functionality), I've replaced the `html-jsx-lib.js` file with a comment explaining where the file has moved to, just in case anyone was hotlinking it from the React site.
2014-09-06 22:51:52 -07:00
Simon Welsh
54e88388b1 Correct highlighted block 2014-09-06 20:46:19 +10:00
Rick Beerendonk
affffb40e2 Update video.md with Forward JS 2014 talk
Added "React and Flux: Building Applications with a Unidirectional Data Flow" by Bill Fisher and Jing Chen.
2014-09-06 11:33:36 +02:00
Paul O’Shannessy
98c897e969 Merge pull request #2148 from nordstrom-innovation/docfix
corrected highlighted/updated line in tutorial example
2014-09-05 10:59:24 -07:00
Paul O’Shannessy
22351526ba Merge pull request #2147 from naman34/patch-2
added the missing **
2014-09-04 16:26:35 -07:00
jon madison
2d6231f486 corrected highlighted/updated line in tutorial example 2014-09-04 16:07:34 -07:00
Nick Merwin
275cb60829 Update Like button example verbiage
Changes text "You unlike this" to "You liked this". Makes a bit more grammatical sense.

Closes #2146.
2014-09-04 15:21:27 -07:00
Naman Goel
7476798981 added the missing **
Missed it the last time. Apologies.
2014-09-05 03:21:30 +05:30
Paul O’Shannessy
8e9c217cca JSX spec blog post 2014-09-03 15:37:08 -07:00
Paul O’Shannessy
b0b8edd2e7 Merge pull request #2033 from pekim/master
Add support for <dialog> tag.
2014-09-03 14:47:41 -07:00
Paul O’Shannessy
461174e99f Fix broken link in animation docs
Missed in #2068
2014-09-03 11:59:14 -07:00
Paul O’Shannessy
520081f7ad Merge pull request #2120 from zpao/svg-logo
[docs] SVG logo
2014-09-02 14:05:05 -07:00
Daniel Lo Nigro
5a6eac6ba2 Small tweaks to HTML to JSX page:
- Remove "Compiled JS" tab since it doesn't make sense
 - Relabelled editor to "Live HTML Editor" rather than "Live JSX Editor"
2014-08-31 21:48:10 -07:00
Mike D Pilsbury
4d6c9a06b2 Add support for <dialog> tag's open attribute. 2014-08-31 12:43:32 +01:00