From 62c42313895ee3ea5e775cd0d6fbd95eb4e6743e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Wed, 13 Aug 2014 13:10:08 -0700 Subject: [PATCH] Sync latest changes Use `bundle exec rake release` to make sure the right gem versions are used, which reverts some of the trivial markdown related changes from last time. --- blog/2013/08/05/community-roundup-6.html | 2 +- blog/2014/04/04/reactnet.html | 16 +++++++--------- blog/page2/index.html | 16 +++++++--------- blog/page7/index.html | 2 +- docs/addons.html | 2 +- docs/animation.html | 2 +- docs/class-name-manipulation.html | 2 +- docs/clone-with-props.html | 2 +- docs/complementary-tools.html | 2 +- docs/component-api.html | 2 +- docs/component-specs.html | 2 +- docs/displaying-data.html | 2 +- docs/dom-differences.html | 2 +- docs/events.html | 2 +- docs/examples.html | 2 +- docs/flux-overview.html | 2 +- docs/flux-todo-list.html | 2 +- docs/forms.html | 2 +- docs/getting-started.html | 2 +- docs/getting-started.zh-CN.html | 2 +- docs/interactivity-and-dynamic-uis.html | 2 +- docs/jsx-gotchas.html | 2 +- docs/jsx-in-depth.html | 2 +- docs/more-about-refs.html | 16 +++++++--------- docs/multiple-components.html | 2 +- docs/perf.html | 2 +- docs/pure-render-mixin.html | 2 +- docs/reconciliation.html | 2 +- docs/reusable-components.html | 2 +- docs/special-non-dom-attributes.html | 2 +- docs/tags-and-attributes.html | 2 +- docs/test-utils.html | 2 +- docs/thinking-in-react.html | 2 +- docs/tooling-integration.html | 2 +- docs/top-level-api.html | 2 +- docs/tutorial.html | 2 +- docs/two-way-binding-helpers.html | 2 +- docs/update.html | 2 +- docs/videos.html | 2 +- docs/why-react-zh-CN.html | 2 +- docs/why-react.html | 2 +- docs/working-with-the-browser.html | 2 +- feed.xml | 16 +++++++--------- tips/children-props-type.html | 2 +- tips/children-undefined.html | 2 +- tips/communicate-between-components.html | 2 +- ...eceiveProps-not-triggered-after-mounting.html | 2 +- tips/controlled-input-null-value.html | 2 +- tips/dom-event-listeners.html | 2 +- tips/expose-component-functions.html | 2 +- tips/false-in-jsx.html | 2 +- tips/if-else-in-JSX.html | 2 +- tips/initial-ajax.html | 2 +- tips/inline-styles.html | 2 +- tips/introduction.html | 2 +- tips/maximum-number-of-jsx-root-nodes.html | 2 +- ...props-in-getInitialState-as-anti-pattern.html | 2 +- tips/references-to-components.html | 2 +- tips/self-closing-tag.html | 2 +- tips/style-props-value-px.html | 2 +- 60 files changed, 84 insertions(+), 92 deletions(-) diff --git a/blog/2013/08/05/community-roundup-6.html b/blog/2013/08/05/community-roundup-6.html index 69349b6862..2cad633d5a 100644 --- a/blog/2013/08/05/community-roundup-6.html +++ b/blog/2013/08/05/community-roundup-6.html @@ -124,7 +124,7 @@ 'value': @state['text'] 'autoFocus': true 'ref': 'textInput' - @button "Add ##{@state['items'].length + 1}" + @button "Add ##{@state['items'].length + 1}" ] ] diff --git a/blog/2014/04/04/reactnet.html b/blog/2014/04/04/reactnet.html index ff746f3a5e..61b89c80f5 100644 --- a/blog/2014/04/04/reactnet.html +++ b/blog/2014/04/04/reactnet.html @@ -101,16 +101,14 @@ in .NET applications, focusing specifically on ASP.NET MVC web applications. It has several purposes:

-
   <script src="@Url.Content("/Scripts/HelloWorld.jsx")"></script>
-
-

Even though we are focusing on ASP.NET MVC, ReactJS.NET can also be used in diff --git a/blog/page2/index.html b/blog/page2/index.html index 46ca91341a..79ed01aac3 100644 --- a/blog/page2/index.html +++ b/blog/page2/index.html @@ -325,16 +325,14 @@ in .NET applications, focusing specifically on ASP.NET MVC web applications. It has several purposes:

-
   <script src="@Url.Content("/Scripts/HelloWorld.jsx")"></script>
-
-

Even though we are focusing on ASP.NET MVC, ReactJS.NET can also be used in diff --git a/blog/page7/index.html b/blog/page7/index.html index 220db652e7..a043649df9 100644 --- a/blog/page7/index.html +++ b/blog/page7/index.html @@ -396,7 +396,7 @@ 'value': @state['text'] 'autoFocus': true 'ref': 'textInput' - @button "Add ##{@state['items'].length + 1}" + @button "Add ##{@state['items'].length + 1}" ] ] diff --git a/docs/addons.html b/docs/addons.html index 91d49b170f..c03bfbc835 100644 --- a/docs/addons.html +++ b/docs/addons.html @@ -341,7 +341,7 @@

  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/animation.html b/docs/animation.html index 36e194a597..20f397c794 100644 --- a/docs/animation.html +++ b/docs/animation.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/class-name-manipulation.html b/docs/class-name-manipulation.html index 015f511a37..363abf1ab8 100644 --- a/docs/class-name-manipulation.html +++ b/docs/class-name-manipulation.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/clone-with-props.html b/docs/clone-with-props.html index b21d78f3c6..e99435f2ab 100644 --- a/docs/clone-with-props.html +++ b/docs/clone-with-props.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/complementary-tools.html b/docs/complementary-tools.html index 2096be3bb2..c9f9eac426 100644 --- a/docs/complementary-tools.html +++ b/docs/complementary-tools.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/component-api.html b/docs/component-api.html index 34787d452f..cfea354d36 100644 --- a/docs/component-api.html +++ b/docs/component-api.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/component-specs.html b/docs/component-specs.html index af0cdcb2bc..6d3f48fbc2 100644 --- a/docs/component-specs.html +++ b/docs/component-specs.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/displaying-data.html b/docs/displaying-data.html index 0b0402fd47..cc7b33ec8c 100644 --- a/docs/displaying-data.html +++ b/docs/displaying-data.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/dom-differences.html b/docs/dom-differences.html index 5b392b475e..16e43fc212 100644 --- a/docs/dom-differences.html +++ b/docs/dom-differences.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/events.html b/docs/events.html index 9fef74e2c4..45e0e8ece1 100644 --- a/docs/events.html +++ b/docs/events.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/examples.html b/docs/examples.html index b7911d98cf..11d4cf7272 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/flux-overview.html b/docs/flux-overview.html index 04666b854b..ee0310080e 100644 --- a/docs/flux-overview.html +++ b/docs/flux-overview.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/flux-todo-list.html b/docs/flux-todo-list.html index 83da0e4b20..95d5ecd472 100644 --- a/docs/flux-todo-list.html +++ b/docs/flux-todo-list.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/forms.html b/docs/forms.html index d16364765d..9934b64601 100644 --- a/docs/forms.html +++ b/docs/forms.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/getting-started.html b/docs/getting-started.html index 47ab625aa8..afc1f61e96 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/getting-started.zh-CN.html b/docs/getting-started.zh-CN.html index eddcbc7b81..668675ae9d 100644 --- a/docs/getting-started.zh-CN.html +++ b/docs/getting-started.zh-CN.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/interactivity-and-dynamic-uis.html b/docs/interactivity-and-dynamic-uis.html index 39d751ff9b..2922b3e977 100644 --- a/docs/interactivity-and-dynamic-uis.html +++ b/docs/interactivity-and-dynamic-uis.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/jsx-gotchas.html b/docs/jsx-gotchas.html index d45a02a894..40b260a38b 100644 --- a/docs/jsx-gotchas.html +++ b/docs/jsx-gotchas.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/jsx-in-depth.html b/docs/jsx-in-depth.html index 4e71477f84..a2ab961c46 100644 --- a/docs/jsx-in-depth.html +++ b/docs/jsx-in-depth.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/more-about-refs.html b/docs/more-about-refs.html index 742ae43093..597590abb8 100644 --- a/docs/more-about-refs.html +++ b/docs/more-about-refs.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • @@ -496,16 +496,14 @@

    It's as simple as:

      -
    1. Assign a ref attribute to anything returned from render such as:
    2. -
    -
      <input ref="myInput" />
    +
  • Assign a ref attribute to anything returned from render such as:

    +
    <input ref="myInput" />
    +
  • +
  • In some other code (typically event handler code), access the backing instance via this.refs as in:

    +
    this.refs.myInput
     
    -
      -
    1. In some other code (typically event handler code), access the backing instance via this.refs as in:
    2. +

      You can access the component's DOM node directly by calling this.refs.myInput.getDOMNode().

    -
      this.refs.myInput
    -
    -

    You can access the component's DOM node directly by calling this.refs.myInput.getDOMNode().

    Completing the Example #

      var App = React.createClass({
         getInitialState: function() {
           return {userInput: ''};
    diff --git a/docs/multiple-components.html b/docs/multiple-components.html
    index 8489e9f0c3..396644525c 100644
    --- a/docs/multiple-components.html
    +++ b/docs/multiple-components.html
    @@ -341,7 +341,7 @@
             
               
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/perf.html b/docs/perf.html index 298ed81d1b..bf867b086f 100644 --- a/docs/perf.html +++ b/docs/perf.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/pure-render-mixin.html b/docs/pure-render-mixin.html index 3916be6d49..0da1bfb322 100644 --- a/docs/pure-render-mixin.html +++ b/docs/pure-render-mixin.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/reconciliation.html b/docs/reconciliation.html index 8c8bdb6cf4..ba098a113c 100644 --- a/docs/reconciliation.html +++ b/docs/reconciliation.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/reusable-components.html b/docs/reusable-components.html index 1ed4baf9e2..6ba1cced4a 100644 --- a/docs/reusable-components.html +++ b/docs/reusable-components.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/special-non-dom-attributes.html b/docs/special-non-dom-attributes.html index 7cf477ea00..0c65b95d71 100644 --- a/docs/special-non-dom-attributes.html +++ b/docs/special-non-dom-attributes.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/tags-and-attributes.html b/docs/tags-and-attributes.html index a4dd07d52e..576bbd7121 100644 --- a/docs/tags-and-attributes.html +++ b/docs/tags-and-attributes.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/test-utils.html b/docs/test-utils.html index 13256702f1..0d956783df 100644 --- a/docs/test-utils.html +++ b/docs/test-utils.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/thinking-in-react.html b/docs/thinking-in-react.html index 0eae74f3c2..5fd936bda0 100644 --- a/docs/thinking-in-react.html +++ b/docs/thinking-in-react.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/tooling-integration.html b/docs/tooling-integration.html index 2a9787997d..7bb58190b7 100644 --- a/docs/tooling-integration.html +++ b/docs/tooling-integration.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/top-level-api.html b/docs/top-level-api.html index 542a203003..17800ab010 100644 --- a/docs/top-level-api.html +++ b/docs/top-level-api.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/tutorial.html b/docs/tutorial.html index 353c1da188..347f2ea5c4 100644 --- a/docs/tutorial.html +++ b/docs/tutorial.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/two-way-binding-helpers.html b/docs/two-way-binding-helpers.html index f826c4f08a..a5ae179eac 100644 --- a/docs/two-way-binding-helpers.html +++ b/docs/two-way-binding-helpers.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/update.html b/docs/update.html index 259bc416f1..6be038a165 100644 --- a/docs/update.html +++ b/docs/update.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/videos.html b/docs/videos.html index 8e077e06e7..f3a9d9734a 100644 --- a/docs/videos.html +++ b/docs/videos.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/why-react-zh-CN.html b/docs/why-react-zh-CN.html index 327a01ea33..29661dc444 100644 --- a/docs/why-react-zh-CN.html +++ b/docs/why-react-zh-CN.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/why-react.html b/docs/why-react.html index 7c8bc305ce..b1e2cd3109 100644 --- a/docs/why-react.html +++ b/docs/why-react.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/docs/working-with-the-browser.html b/docs/working-with-the-browser.html index 3bbf16dfc3..1db3228544 100644 --- a/docs/working-with-the-browser.html +++ b/docs/working-with-the-browser.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/feed.xml b/feed.xml index e3d1c8e4eb..60e8a83955 100644 --- a/feed.xml +++ b/feed.xml @@ -632,16 +632,14 @@ in .NET applications, focusing specifically on ASP.NET MVC web applications. It has several purposes:</p> <ul> -<li>On-the-fly JSX to JavaScript compilation. Simply reference JSX files and they -will be compiled and cached server-side.</li> -</ul> -<div class="highlight"><pre><code class="html language-html" data-lang="html"> <span class="nt">&lt;script </span><span class="na">src=</span><span class="s">&quot;@Url.Content(&quot;</span><span class="err">/</span><span class="na">Scripts</span><span class="err">/</span><span class="na">HelloWorld</span><span class="err">.</span><span class="na">jsx</span><span class="err">&quot;)&quot;</span><span class="nt">&gt;&lt;/script&gt;</span> -</code></pre></div> -<ul> -<li>JSX to JavaScript compilation via popular minification/combination libraries +<li><p>On-the-fly JSX to JavaScript compilation. Simply reference JSX files and they +will be compiled and cached server-side.</p> +<div class="highlight"><pre><code class="html language-html" data-lang="html"><span class="nt">&lt;script </span><span class="na">src=</span><span class="s">&quot;@Url.Content(&quot;</span><span class="err">/</span><span class="na">Scripts</span><span class="err">/</span><span class="na">HelloWorld</span><span class="err">.</span><span class="na">jsx</span><span class="err">&quot;)&quot;</span><span class="nt">&gt;&lt;/script&gt;</span> +</code></pre></div></li> +<li><p>JSX to JavaScript compilation via popular minification/combination libraries (Cassette and ASP.NET Bundling and Minification). This is suggested for -production websites.</li> -<li>Server-side component rendering to make your initial render super fast.</li> +production websites.</p></li> +<li><p>Server-side component rendering to make your initial render super fast.</p></li> </ul> <p>Even though we are focusing on ASP.NET MVC, ReactJS.NET can also be used in diff --git a/tips/children-props-type.html b/tips/children-props-type.html index 6d57dfd1be..eb70c5e348 100644 --- a/tips/children-props-type.html +++ b/tips/children-props-type.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/tips/children-undefined.html b/tips/children-undefined.html index ea46c655cf..9d73223368 100644 --- a/tips/children-undefined.html +++ b/tips/children-undefined.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/tips/communicate-between-components.html b/tips/communicate-between-components.html index 4ac8e66bbe..6a17414897 100644 --- a/tips/communicate-between-components.html +++ b/tips/communicate-between-components.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/tips/componentWillReceiveProps-not-triggered-after-mounting.html b/tips/componentWillReceiveProps-not-triggered-after-mounting.html index 228b9d22b3..8bdb98c077 100644 --- a/tips/componentWillReceiveProps-not-triggered-after-mounting.html +++ b/tips/componentWillReceiveProps-not-triggered-after-mounting.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/tips/controlled-input-null-value.html b/tips/controlled-input-null-value.html index afea893d17..934410def9 100644 --- a/tips/controlled-input-null-value.html +++ b/tips/controlled-input-null-value.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/tips/dom-event-listeners.html b/tips/dom-event-listeners.html index 498598ccb0..a49cc32078 100644 --- a/tips/dom-event-listeners.html +++ b/tips/dom-event-listeners.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/tips/expose-component-functions.html b/tips/expose-component-functions.html index 574791ffbd..31498cda7b 100644 --- a/tips/expose-component-functions.html +++ b/tips/expose-component-functions.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/tips/false-in-jsx.html b/tips/false-in-jsx.html index 9709fc8c60..64e7c4fb96 100644 --- a/tips/false-in-jsx.html +++ b/tips/false-in-jsx.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/tips/if-else-in-JSX.html b/tips/if-else-in-JSX.html index 4b8c3478f8..b77a5948c8 100644 --- a/tips/if-else-in-JSX.html +++ b/tips/if-else-in-JSX.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/tips/initial-ajax.html b/tips/initial-ajax.html index 84fa711d96..c3b2a4c7d8 100644 --- a/tips/initial-ajax.html +++ b/tips/initial-ajax.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/tips/inline-styles.html b/tips/inline-styles.html index 13273779e6..a125549ca9 100644 --- a/tips/inline-styles.html +++ b/tips/inline-styles.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/tips/introduction.html b/tips/introduction.html index 35e234d093..b96ed32cca 100644 --- a/tips/introduction.html +++ b/tips/introduction.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/tips/maximum-number-of-jsx-root-nodes.html b/tips/maximum-number-of-jsx-root-nodes.html index 8abd88e5b8..cee5f12382 100644 --- a/tips/maximum-number-of-jsx-root-nodes.html +++ b/tips/maximum-number-of-jsx-root-nodes.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/tips/props-in-getInitialState-as-anti-pattern.html b/tips/props-in-getInitialState-as-anti-pattern.html index ca7d71f8f5..fed573f8e9 100644 --- a/tips/props-in-getInitialState-as-anti-pattern.html +++ b/tips/props-in-getInitialState-as-anti-pattern.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/tips/references-to-components.html b/tips/references-to-components.html index 08f3a2bbcd..6136f9cd69 100644 --- a/tips/references-to-components.html +++ b/tips/references-to-components.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/tips/self-closing-tag.html b/tips/self-closing-tag.html index 4105d589d5..6415b61e1b 100644 --- a/tips/self-closing-tag.html +++ b/tips/self-closing-tag.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial
  • diff --git a/tips/style-props-value-px.html b/tips/style-props-value-px.html index 22841b4e5a..0cfb94345e 100644 --- a/tips/style-props-value-px.html +++ b/tips/style-props-value-px.html @@ -341,7 +341,7 @@
  • - Flux Todo List + Flux TodoMVC Tutorial