Skip to content

Commit

Permalink
Update website for 0.14.2
Browse files Browse the repository at this point in the history
(cherry picked from commit fdf6f6b)
  • Loading branch information
zpao committed Nov 5, 2015
1 parent 76bbd9e commit 578312e
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 9 deletions.
2 changes: 1 addition & 1 deletion docs/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ sass:
sass_dir: _css
gems:
- jekyll-redirect-from
react_version: 0.14.1
react_version: 0.14.2
Binary file added docs/downloads/react-0.14.2.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/js/react-dom.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* ReactDOM v0.14.1
* ReactDOM v0.14.2
*
* Copyright 2013-2015, Facebook, Inc.
* All rights reserved.
Expand Down
22 changes: 15 additions & 7 deletions docs/js/react.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* React v0.14.1
* React v0.14.2
*/
(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){
/**
Expand Down Expand Up @@ -3256,6 +3256,7 @@ var HTMLDOMPropertyConfig = {
icon: null,
id: MUST_USE_PROPERTY,
inputMode: MUST_USE_ATTRIBUTE,
integrity: null,
is: MUST_USE_ATTRIBUTE,
keyParams: MUST_USE_ATTRIBUTE,
keyType: MUST_USE_ATTRIBUTE,
Expand Down Expand Up @@ -6272,6 +6273,7 @@ var registrationNameModules = ReactBrowserEventEmitter.registrationNameModules;
// For quickly matching children type, to test if can be treated as content.
var CONTENT_TYPES = { 'string': true, 'number': true };

var CHILDREN = keyOf({ children: null });
var STYLE = keyOf({ style: null });
var HTML = keyOf({ __html: null });

Expand Down Expand Up @@ -6762,7 +6764,9 @@ ReactDOMComponent.Mixin = {
}
var markup = null;
if (this._tag != null && isCustomComponent(this._tag, props)) {
markup = DOMPropertyOperations.createMarkupForCustomAttribute(propKey, propValue);
if (propKey !== CHILDREN) {
markup = DOMPropertyOperations.createMarkupForCustomAttribute(propKey, propValue);
}
} else {
markup = DOMPropertyOperations.createMarkupForProperty(propKey, propValue);
}
Expand Down Expand Up @@ -7022,6 +7026,9 @@ ReactDOMComponent.Mixin = {
if (!node) {
node = ReactMount.getNode(this._rootNodeID);
}
if (propKey === CHILDREN) {
nextProp = null;
}
DOMPropertyOperations.setValueForAttribute(node, propKey, nextProp);
} else if (DOMProperty.properties[propKey] || DOMProperty.isCustomAttribute(propKey)) {
if (!node) {
Expand Down Expand Up @@ -9682,11 +9689,12 @@ if ("development" !== 'production') {
var fakeNode = document.createElement('react');
ReactErrorUtils.invokeGuardedCallback = function (name, func, a, b) {
var boundFunc = func.bind(null, a, b);
fakeNode.addEventListener(name, boundFunc, false);
var evtType = 'react-' + name;
fakeNode.addEventListener(evtType, boundFunc, false);
var evt = document.createEvent('Event');
evt.initEvent(name, false, false);
evt.initEvent(evtType, false, false);
fakeNode.dispatchEvent(evt);
fakeNode.removeEventListener(name, boundFunc, false);
fakeNode.removeEventListener(evtType, boundFunc, false);
};
}
}
Expand Down Expand Up @@ -13829,7 +13837,7 @@ module.exports = ReactUpdates;

'use strict';

module.exports = '0.14.1';
module.exports = '0.14.2';
},{}],85:[function(_dereq_,module,exports){
/**
* Copyright 2013-2015, Facebook, Inc.
Expand Down Expand Up @@ -15853,7 +15861,7 @@ module.exports = adler32;
var canDefineProperty = false;
if ("development" !== 'production') {
try {
Object.defineProperty({}, 'x', {});
Object.defineProperty({}, 'x', { get: function () {} });
canDefineProperty = true;
} catch (x) {
// IE will fail on defineProperty
Expand Down

0 comments on commit 578312e

Please sign in to comment.