Skip to content

Commit

Permalink
Merge branch 'react-update'
Browse files Browse the repository at this point in the history
  • Loading branch information
PaulLeCam committed Sep 12, 2015
2 parents 97bc645 + 9a8e11e commit 829cffe
Show file tree
Hide file tree
Showing 18 changed files with 11,758 additions and 14,793 deletions.
3 changes: 2 additions & 1 deletion example/app.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import { render } from 'react-dom';

import SimpleExample from './simple';
import EventsExample from './events';
Expand All @@ -17,4 +18,4 @@ const examples = (
</div>
);

React.render(examples, document.getElementById('app'));
render(examples, document.getElementById('app'));
6 changes: 4 additions & 2 deletions example/build/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ var _react = require('react');

var _react2 = _interopRequireDefault(_react);

var _reactDom = require('react-dom');

var _simple = require('./simple');

var _simple2 = _interopRequireDefault(_simple);
Expand Down Expand Up @@ -52,9 +54,9 @@ var examples = _react2['default'].createElement(
_react2['default'].createElement(_vectorLayers2['default'], null)
);

_react2['default'].render(examples, document.getElementById('app'));
(0, _reactDom.render)(examples, document.getElementById('app'));

},{"./events":2,"./simple":3,"./vector-layers":4,"react":"react"}],2:[function(require,module,exports){
},{"./events":2,"./simple":3,"./vector-layers":4,"react":"react","react-dom":"react-dom"}],2:[function(require,module,exports){
'use strict';

Object.defineProperty(exports, '__esModule', {
Expand Down
Loading

0 comments on commit 829cffe

Please sign in to comment.