Skip to content

Commit

Permalink
Upgrade React
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel15 committed Nov 23, 2015
1 parent 33d2131 commit 8c93ccb
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 20 deletions.
9 changes: 7 additions & 2 deletions Daniel15.Web/Views/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,15 @@
</div>
<!-- Now for the JS -->
<script
src="http://fb.me/react-0.12.1.min.js"
asp-fallback-src="~/Content/js/lib/react-0.12.1.min.js"
src="https://fb.me/react-0.14.3.min.js"
asp-fallback-src="~/Content/js/lib/react-0.14.3.min.js"
asp-fallback-test="window.React">
</script>
<script
src="https://fb.me/react-dom-0.14.3.min.js"
asp-fallback-src="~/Content/js/lib/react-dom-0.14.3.min.js"
asp-fallback-test="window.ReactDOM">
</script>
<environment names="Development">
<script src="~/cache/main.js"></script>
<script>Events.initPage();</script>
Expand Down
16 changes: 0 additions & 16 deletions Daniel15.Web/wwwroot/Content/js/lib/react-0.12.1.min.js

This file was deleted.

16 changes: 16 additions & 0 deletions Daniel15.Web/wwwroot/Content/js/lib/react-0.14.3.min.js

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions Daniel15.Web/wwwroot/Content/js/lib/react-dom-0.14.3.min.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/**
* ReactDOM v0.14.3
*
* Copyright 2013-2015, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*
*/
!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e(require("react"));else if("function"==typeof define&&define.amd)define(["react"],e);else{var f;f="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,f.ReactDOM=e(f.React)}}(function(e){return e.__SECRET_DOM_DO_NOT_USE_OR_YOU_WILL_BE_FIRED});
4 changes: 2 additions & 2 deletions Daniel15.Web/wwwroot/Content/js/socialfeed.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
/**
* Load the data for the lifestream
*/
_loadNextPage: function() {
_loadNextPage: function(evt) {
this.setState({ loading: true });
var data =
{
Expand All @@ -89,7 +89,7 @@
data: data
}).send();

return false;
evt.preventDefault();
},
/**
* Called when the AJAX request is successful
Expand Down

0 comments on commit 8c93ccb

Please sign in to comment.