Merge pull request Flipboard#159 from pinqy520/master

Upgrade to react v15+

Author: hiirene

.babelrc

@@ -0,0 +1,3 @@
+{
+ "presets": ["react"]
+}

.gitignore

@@ -1,2 +1,4 @@
 build
 node_modules
+yarn.lock
+npm-debug.log

examples/css-layout/app.js

@@ -1,5 +1,3 @@
-/** @jsx React.DOM */
-
 var React = require('react');
 var ReactDOM = require('react-dom');
 var ReactCanvas = require('react-canvas');

examples/gradient/app.js

@@ -1,5 +1,3 @@
-/** @jsx React.DOM */
-
 'use strict';
 
 var React = require('react');

examples/listview/app.js

@@ -1,5 +1,3 @@
-/** @jsx React.DOM */
-
 'use strict';
 
 var React = require('react');

examples/listview/components/Item.js

@@ -1,5 +1,3 @@
-/** @jsx React.DOM */
-
 'use strict';
 
 var React = require('react');

examples/timeline/app.js

@@ -1,5 +1,3 @@
-/** @jsx React.DOM */
-
 'use strict';
 
 var React = require('react');

examples/timeline/components/Page.js

@@ -1,5 +1,3 @@
-/** @jsx React.DOM */
-
 'use strict';
 
 var React = require('react');

gulpfile.js

@@ -1,7 +1,7 @@
 var gulp = require('gulp');
 var del = require('del');
 var connect = require('gulp-connect');
-var webpack = require('gulp-webpack');
+var webpack = require('webpack-stream');
 var webpackConfig = require('./webpack.config.js');
 
 var port = process.env.PORT || 8080;

lib/ContainerMixin.js

@@ -4,7 +4,7 @@
 // https://github.com/reactjs/react-art
 
 var React = require('react');
-var ReactMultiChild = require('react/lib/ReactMultiChild');
+var ReactMultiChild = require('react-dom/lib/ReactMultiChild');
 var emptyObject = require('fbjs/lib/emptyObject');
 
 var ContainerMixin = Object.assign({}, ReactMultiChild.Mixin, {
@@ -16,7 +16,7 @@ var ContainerMixin = Object.assign({}, ReactMultiChild.Mixin, {
  * @param {number} toIndex Destination index of the element.
  * @protected
  */
- moveChild: function(child, toIndex) {
+ moveChild: function(child, afterNode, toIndex, lastIndex) {
  var childNode = child._mountImage;
  var mostRecentlyPlacedChild = this._mostRecentlyPlacedChild;
  if (mostRecentlyPlacedChild == null) {
@@ -48,7 +48,7 @@ var ContainerMixin = Object.assign({}, ReactMultiChild.Mixin, {
  * @param {object} childNode ART node to insert.
  * @protected
  */
- createChild: function(child, childNode) {
+ createChild: function(child, afterNode, childNode) {
  child._mountImage = childNode;
  var mostRecentlyPlacedChild = this._mostRecentlyPlacedChild;
  if (mostRecentlyPlacedChild == null) {
@@ -121,7 +121,9 @@ var ContainerMixin = Object.assign({}, ReactMultiChild.Mixin, {
  i++;
  }
  }
- }
+ },
+ getHostNode: function () { return this.node },
+ getNativeNode: function () { return this.node },
 
 });