Skip to content

Commit 91f59bb

Browse files
Daniel15Daniel15
committed
Upgrade to React 0.14. Closes reactjs#164
Ignore "React.renderToString is deprecated" warning for now (facebook/react#5134)
1 parent 55a84ab commit 91f59bb

File tree

19 files changed

+7709
-8552
lines changed

19 files changed

+7709
-8552
lines changed

‎site/jekyll/getting-started/tutorial.md

+11-7
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ Replace the contents of the new view file with the following:
6666
</head>
6767
<body>
6868
<div id="content"></div>
69-
<script src="http://fb.me/react-0.13.1.js"></script>
69+
<script src="https://fb.me/react-0.14.0.min.js"></script>
70+
<script src="https://fb.me/react-dom-0.14.0.min.js"></script>
7071
<script src="@Url.Content("~/Scripts/Tutorial.jsx")"></script>
7172
</body>
7273
</html>
@@ -234,8 +235,9 @@ Markdown is a simple way to format your text inline. For example, surrounding te
234235

235236
First, add the third-party **Showdown** library to your application. This is a JavaScript library which takes Markdown text and converts it to raw HTML. We will add it via NuGet (search for "Showdown" and install it, similar to how you installed ReactJS.NET earlier) and reference the script tag in your view:
236237

237-
```html{2}
238-
<script src="http://fb.me/react-0.13.1.js"></script>
238+
```html{3}
239+
<script src="https://fb.me/react-0.14.0.min.js"></script>
240+
<script src="https://fb.me/react-dom-0.14.0.min.js"></script>
239241
<script src="@Url.Content("~/Scripts/showdown.min.js")"></script>
240242
<script src="@Url.Content("~/Scripts/Tutorial.jsx")"></script>
241243
```
@@ -840,7 +842,7 @@ namespace ReactDemo
840842

841843
Now that the bundle has been registered, we need to reference it from the view:
842844

843-
```html{12}
845+
```html{13}
844846
@model IEnumerable<ReactDemo.Models.CommentModel>
845847
@{
846848
Layout = null;
@@ -851,7 +853,8 @@ Now that the bundle has been registered, we need to reference it from the view:
851853
</head>
852854
<body>
853855
<div id="content"></div>
854-
<script src="http://fb.me/react-0.13.1.js"></script>
856+
<script src="https://fb.me/react-0.14.0.min.js"></script>
857+
<script src="https://fb.me/react-dom-0.14.0.min.js"></script>
855858
@Scripts.Render("~/bundles/main")
856859
@Html.ReactInitJavaScript()
857860
</body>
@@ -920,7 +923,7 @@ var CommentBox = React.createClass({
920923

921924
In the view, we will accept the list of comments as the model, and use `Html.React` to render the component. This will replace the `React.render` call that currently exists in Tutorial.jsx. All the props from the current `React.render` call should be moved here, and the `React.render` call should be deleted.
922925

923-
```html{1,10-16,20}
926+
```html{1,10-16,21}
924927
@model IEnumerable<ReactDemo.Models.CommentModel>
925928
@{
926929
Layout = null;
@@ -937,7 +940,8 @@ In the view, we will accept the list of comments as the model, and use `Html.Rea
937940
submitUrl = Url.Action("AddComment"),
938941
pollInterval = 2000,
939942
})
940-
<script src="http://fb.me/react-0.13.1.js"></script>
943+
<script src="https://fb.me/react-0.14.0.min.js"></script>
944+
<script src="https://fb.me/react-dom-0.14.0.min.js"></script>
941945
<script src="@Url.Content("~/Scripts/showdown.min.js")"></script>
942946
<script src="@Url.Content("~/Scripts/Tutorial.jsx")"></script>
943947
@Html.ReactInitJavaScript()

‎site/jekyll/guides/cassette.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ render from your view using Cassette:
3636
</head>
3737
<body>
3838
...
39-
<script src="http://fb.me/react-0.13.1.min.js"></script>
39+
<script src="https://fb.me/react-0.14.0.min.js"></script>
40+
<script src="https://fb.me/react-dom-0.14.0.min.js"></script>
4041
@Bundles.RenderScripts()
4142
</body>
4243
```

‎site/jekyll/guides/server-side-rendering.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ code.
4747
```html
4848
<!-- Load all your scripts normally before calling ReactInitJavaScript -->
4949
<!-- Assumes minification/combination is configured as per previous section -->
50-
<script src="http://fb.me/react-0.13.1.min.js"></script>
50+
<script src="https://fb.me/react-0.14.0.min.js"></script>
51+
<script src="https://fb.me/react-dom-0.14.0.min.js"></script>
5152
@Scripts.Render("~/bundles/main")
5253
@Html.ReactInitJavaScript()
5354
```
@@ -62,7 +63,8 @@ code.
6263
</div>
6364
</div>
6465

65-
<script src="http://fb.me/react-0.13.1.min.js"></script>
66+
<script src="https://fb.me/react-0.14.0.min.js"></script>
67+
<script src="https://fb.me/react-dom-0.14.0.min.js"></script>
6668
<script src="/Scripts/HelloWorld.js"></script>
6769
<script>React.render(HelloWorld({"name":"Daniel"}), document.getElementById("react1"));</script>
6870
```

‎site/jekyll/index.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ bundles.Add(new JsxBundle("~/bundles/main").Include(
112112
})
113113

114114
<!-- Initialise the component in JavaScript too -->
115-
<script src="http://fb.me/react-0.13.1.min.js"></script>
115+
<script src="https://fb.me/react-0.14.0.min.js"></script>
116+
<script src="https://fb.me/react-dom-0.14.0.min.js"></script>
116117
@Scripts.Render("~/bundles/main")
117118
@Html.ReactInitJavaScript()
118119
```

0 commit comments

Comments
 (0)