Skip to content

Commit db608ef

Browse files
Daniel15Daniel15
committed
Update to React 0.12.1
1 parent d1d8266 commit db608ef

File tree

8 files changed

+1871
-530
lines changed

8 files changed

+1871
-530
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ 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.12.0.js"></script>
69+
<script src="http://fb.me/react-0.12.1.js"></script>
7070
<script src="@Url.Content("~/Scripts/Tutorial.jsx")"></script>
7171
</body>
7272
</html>
@@ -235,7 +235,7 @@ Markdown is a simple way to format your text inline. For example, surrounding te
235235
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:
236236

237237
```html{2}
238-
<script src="http://fb.me/react-0.12.0.js"></script>
238+
<script src="http://fb.me/react-0.12.1.js"></script>
239239
<script src="@Url.Content("~/Scripts/showdown.min.js")"></script>
240240
<script src="@Url.Content("~/Scripts/Tutorial.jsx")"></script>
241241
```
@@ -848,7 +848,7 @@ Now that the bundle has been registered, we need to reference it from the view:
848848
</head>
849849
<body>
850850
<div id="content"></div>
851-
<script src="http://fb.me/react-0.12.0.js"></script>
851+
<script src="http://fb.me/react-0.12.1.js"></script>
852852
@Scripts.Render("~/bundles/main")
853853
@Html.ReactInitJavaScript()
854854
</body>
@@ -934,7 +934,7 @@ In the view, we will accept the list of comments as the model, and use `Html.Rea
934934
submitUrl = Url.Action("AddComment"),
935935
pollInterval = 2000,
936936
})
937-
<script src="http://fb.me/react-0.12.0.js"></script>
937+
<script src="http://fb.me/react-0.12.1.js"></script>
938938
<script src="@Url.Content("~/Scripts/showdown.min.js")"></script>
939939
<script src="@Url.Content("~/Scripts/Tutorial.jsx")"></script>
940940
@Html.ReactInitJavaScript()

‎site/jekyll/guides/cassette.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ render from your view using Cassette:
3636
</head>
3737
<body>
3838
...
39-
<script src="http://fb.me/react-0.12.0.min.js"></script>
39+
<script src="http://fb.me/react-0.12.1.min.js"></script>
4040
@Bundles.RenderScripts()
4141
</body>
4242
```

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ 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.12.0.min.js"></script>
50+
<script src="http://fb.me/react-0.12.1.min.js"></script>
5151
@Scripts.Render("~/bundles/main")
5252
@Html.ReactInitJavaScript()
5353
```
@@ -62,7 +62,7 @@ code.
6262
</div>
6363
</div>
6464

65-
<script src="http://fb.me/react-0.12.0.min.js"></script>
65+
<script src="http://fb.me/react-0.12.1.min.js"></script>
6666
<script src="/Scripts/HelloWorld.js"></script>
6767
<script>React.render(HelloWorld({"name":"Daniel"}), document.getElementById("react1"));</script>
6868
```

‎site/jekyll/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ bundles.Add(new JsxBundle("~/bundles/main").Include(
106106
})
107107

108108
<!-- Initialise the component in JavaScript too -->
109-
<script src="http://fb.me/react-0.12.0.min.js"></script>
109+
<script src="http://fb.me/react-0.12.1.min.js"></script>
110110
@Scripts.Render("~/bundles/main")
111111
@Html.ReactInitJavaScript()
112112
```

‎src/React.Sample.Cassette/Views/Home/Index.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
@Html.React("CommentsBox", new { initialComments = Model.Comments })
2121

2222
<!-- Load all required scripts (React + the site's scripts) -->
23-
<script src="http://fb.me/react-0.12.0.min.js"></script>
23+
<script src="http://fb.me/react-0.12.1.min.js"></script>
2424
@Bundles.RenderScripts()
2525
<!-- Render the code to initialise the component -->
2626
@Html.ReactInitJavaScript()

‎src/React.Sample.Mvc4/Views/Home/Index.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
@Html.React("CommentsBox", new { initialComments = Model.Comments })
1818

1919
<!-- Load all required scripts (React + the site's scripts) -->
20-
<script src="http://fb.me/react-0.12.0.js"></script>
20+
<script src="http://fb.me/react-0.12.1.js"></script>
2121
@Scripts.Render("~/bundles/main")
2222
<!-- Render the code to initialise the component -->
2323
@Html.ReactInitJavaScript()

‎src/React/Resources/JSXTransformer.js

Lines changed: 1856 additions & 515 deletions
Large diffs are not rendered by default.

‎src/React/Resources/react-with-addons.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* React (with addons) v0.12.0
2+
* React (with addons) v0.12.1
33
*/
44
!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.React=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(_dereq_,module,exports){
55
/**
@@ -4400,7 +4400,7 @@ if ("production" !== "development") {
44004400

44014401
// Version exists only in the open-source version of React, not in Facebook's
44024402
// internal version.
4403-
React.version = '0.12.0';
4403+
React.version = '0.12.1';
44044404

44054405
module.exports = React;
44064406

@@ -7070,7 +7070,7 @@ var ReactCompositeComponentMixin = {
70707070
boundMethod.__reactBoundArguments = null;
70717071
var componentName = component.constructor.displayName;
70727072
var _bind = boundMethod.bind;
7073-
boundMethod.bind = function(newThis ) {var args=Array.prototype.slice.call(arguments,1);
7073+
boundMethod.bind = function(newThis ) {for (var args=[],$__0=1,$__1=arguments.length;$__0<$__1;$__0++) args.push(arguments[$__0]);
70747074
// User is trying to bind() an autobound method; we effectively will
70757075
// ignore the value of "this" that the user is trying to use, so
70767076
// let's warn.
@@ -9404,7 +9404,7 @@ var ReactDefaultPerf = {
94049404
},
94059405

94069406
measure: function(moduleName, fnName, func) {
9407-
return function() {var args=Array.prototype.slice.call(arguments,0);
9407+
return function() {for (var args=[],$__0=0,$__1=arguments.length;$__0<$__1;$__0++) args.push(arguments[$__0]);
94089408
var totalTime;
94099409
var rv;
94109410
var start;
@@ -19780,7 +19780,7 @@ var emptyFunction = _dereq_("./emptyFunction");
1978019780
var warning = emptyFunction;
1978119781

1978219782
if ("production" !== "development") {
19783-
warning = function(condition, format ) {var args=Array.prototype.slice.call(arguments,2);
19783+
warning = function(condition, format ) {for (var args=[],$__0=2,$__1=arguments.length;$__0<$__1;$__0++) args.push(arguments[$__0]);
1978419784
if (format === undefined) {
1978519785
throw new Error(
1978619786
'`warning(condition, format, ...args)` requires a warning ' +

0 commit comments

Comments
 (0)