Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Commit 933400a

Browse files
committed
Bump React to 0.14.7, immutable to 3.7.6
1 parent 9b40b0e commit 933400a

2 files changed

Lines changed: 28 additions & 12 deletions

File tree

src/thirdparty/react-dom.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* ReactDOM v0.14.5
2+
* ReactDOM v0.14.7
33
*
44
* Copyright 2013-2015, Facebook, Inc.
55
* All rights reserved.
@@ -21,7 +21,7 @@
2121

2222
// <script>
2323
} else {
24-
var g
24+
var g;
2525
if (typeof window !== "undefined") {
2626
g = window;
2727
} else if (typeof global !== "undefined") {

src/thirdparty/react.js

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* React (with addons) v0.14.5
2+
* React (with addons) v0.14.7
33
*/
44
(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.React = f()}})(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
/**
@@ -8105,7 +8105,10 @@ var ReactDOMOption = {
81058105
}
81068106
});
81078107

8108-
nativeProps.children = content;
8108+
if (content) {
8109+
nativeProps.children = content;
8110+
}
8111+
81098112
return nativeProps;
81108113
}
81118114

@@ -14431,10 +14434,14 @@ ReactShallowRenderer.prototype.render = function (element, context) {
1443114434
if (!context) {
1443214435
context = emptyObject;
1443314436
}
14437+
ReactUpdates.batchedUpdates(_batchedRender, this, element, context);
14438+
};
14439+
14440+
function _batchedRender(renderer, element, context) {
1443414441
var transaction = ReactUpdates.ReactReconcileTransaction.getPooled(false);
14435-
this._render(element, transaction, context);
14442+
renderer._render(element, transaction, context);
1443614443
ReactUpdates.ReactReconcileTransaction.release(transaction);
14437-
};
14444+
}
1443814445

1443914446
ReactShallowRenderer.prototype.unmount = function () {
1444014447
if (this._instance) {
@@ -15473,7 +15480,7 @@ module.exports = ReactUpdates;
1547315480

1547415481
'use strict';
1547515482

15476-
module.exports = '0.14.5';
15483+
module.exports = '0.14.7';
1547715484
},{}],98:[function(_dereq_,module,exports){
1547815485
/**
1547915486
* Copyright 2013-2015, Facebook, Inc.
@@ -16565,6 +16572,7 @@ var warning = _dereq_(173);
1656516572
*/
1656616573
var EventInterface = {
1656716574
type: null,
16575+
target: null,
1656816576
// currentTarget is set when dispatching; no use in copying it here
1656916577
currentTarget: emptyFunction.thatReturnsNull,
1657016578
eventPhase: null,
@@ -16598,8 +16606,6 @@ function SyntheticEvent(dispatchConfig, dispatchMarker, nativeEvent, nativeEvent
1659816606
this.dispatchConfig = dispatchConfig;
1659916607
this.dispatchMarker = dispatchMarker;
1660016608
this.nativeEvent = nativeEvent;
16601-
this.target = nativeEventTarget;
16602-
this.currentTarget = nativeEventTarget;
1660316609

1660416610
var Interface = this.constructor.Interface;
1660516611
for (var propName in Interface) {
@@ -16610,7 +16616,11 @@ function SyntheticEvent(dispatchConfig, dispatchMarker, nativeEvent, nativeEvent
1661016616
if (normalize) {
1661116617
this[propName] = normalize(nativeEvent);
1661216618
} else {
16613-
this[propName] = nativeEvent[propName];
16619+
if (propName === 'target') {
16620+
this.target = nativeEventTarget;
16621+
} else {
16622+
this[propName] = nativeEvent[propName];
16623+
}
1661416624
}
1661516625
}
1661616626

@@ -19989,15 +19999,21 @@ module.exports = focusNode;
1998919999
* @typechecks
1999020000
*/
1999120001

20002+
/* eslint-disable fb-www/typeof-undefined */
20003+
1999220004
/**
1999320005
* Same as document.activeElement but wraps in a try-catch block. In IE it is
1999420006
* not safe to call document.activeElement if there is nothing focused.
1999520007
*
19996-
* The activeElement will be null only if the document body is not yet defined.
20008+
* The activeElement will be null only if the document or document body is not
20009+
* yet defined.
1999720010
*/
19998-
"use strict";
20011+
'use strict';
1999920012

2000020013
function getActiveElement() /*?DOMElement*/{
20014+
if (typeof document === 'undefined') {
20015+
return null;
20016+
}
2000120017
try {
2000220018
return document.activeElement || document.body;
2000320019
} catch (e) {

0 commit comments

Comments
 (0)