Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
69dcbc7
upgrade to 0.13. Grid now rendering
conor-j-malone Apr 3, 2015
766c8ea
simpleTextEditor now extends EditorBase
conor-j-malone Apr 4, 2015
3f85810
dropdown editor now extends editorBase
conor-j-malone Apr 4, 2015
b5b9081
up/down arrow keys working on dropDowneditor
conor-j-malone Apr 4, 2015
b96ad8e
use react-select in autocomplete editor
conor-j-malone Apr 7, 2015
b74d370
catchup with master
conor-j-malone Jul 14, 2015
d4e5988
fix script errors after catchup with master
conor-j-malone Jul 21, 2015
90ac601
replace this.getDOMNode() with React.findDOMNode()
conor-j-malone Jul 21, 2015
4279d5c
fix more failing tests
conor-j-malone Jul 21, 2015
af977ac
replace autocomplete async
conor-j-malone Jul 21, 2015
738a143
catchup with master
conor-j-malone Jul 21, 2015
6c36496
replace react autocomplete with react select
conor-j-malone Jul 21, 2015
c2c46b9
have a shared webpack config between examples and main build
conor-j-malone Jul 22, 2015
59b09bd
add react/addons to externals
conor-j-malone Jul 22, 2015
9c75b14
add build/react-data-grid to examples page
conor-j-malone Jul 22, 2015
9febb56
catchup with master
Sep 1, 2015
2a31a54
autocomplete editor working
Sep 1, 2015
b03c821
fix failing tests
Sep 1, 2015
19c48a8
alpha version prerelease
Sep 1, 2015
7ba750c
fix missing require
bor3ham Sep 15, 2015
f2ea3b4
Merge pull request #61 from bor3ham/patch-1
conor-j-malone Sep 16, 2015
40f9987
add eslint-react package
Sep 16, 2015
bdcc176
remove duplicate Editor container property
Sep 16, 2015
6b0c43b
Merge branch 'cm-react013-upgrade' of https://github.com/adazzle/reac…
Sep 16, 2015
1f40af0
example tidy up
Sep 16, 2015
58a882b
version bump 0.13.0-alpha2
Sep 16, 2015
fee8b36
use latest io.js version
conor-j-malone Sep 16, 2015
0472ebc
downgrade browser sync till bug is fixed
conor-j-malone Sep 16, 2015
f115bd1
upgrade npm
conor-j-malone Sep 16, 2015
81e71bf
npm 2.14.1
conor-j-malone Sep 16, 2015
fe10470
revert cahnges
conor-j-malone Sep 16, 2015
94f3c17
fix one integration test
conor-j-malone Sep 16, 2015
d87e193
fix headercell render test
conor-j-malone Sep 16, 2015
e624288
Merge branch 'master' into cm-react013-upgrade
conor-j-malone Sep 16, 2015
e051af6
fix last failing test
conor-j-malone Sep 16, 2015
82e40ea
remove isMounted from render method of canvas
conor-j-malone Sep 16, 2015
7127556
catchup with master
conor-j-malone Sep 17, 2015
c1d41f3
catchup with master
conor-j-malone Sep 17, 2015
7c6798f
upgrde react-data-grid
conor-j-malone Sep 17, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions config/webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ var path = require("path");
var webpack = require('webpack');
var release = false;
var path = require("path");
var argv = require('minimist')(process.argv.slice(2));
var RELEASE = argv.release;

module.exports = {

var config = {
entry: {
'react-data-grid' : './src/index',
'react-data-grid-with-addons' : './src/addons/index'
Expand All @@ -22,11 +25,11 @@ module.exports = {
amd : 'react'
},
"react/addons": {
root : 'React',
commonjs : 'react',
commonjs2 : 'react',
amd : 'react'
},
root : 'React',
commonjs : 'react',
commonjs2 : 'react',
amd : 'react'
},
"moment" : "moment"
},
module: {
Expand All @@ -35,18 +38,16 @@ module.exports = {
test: /\.js$/,
exclude: /node_modules/,
loader: 'babel-loader?optional[]=runtime'
}
}
]
},
plugins: [
new webpack.optimize.DedupePlugin(),
new webpack.optimize.OccurenceOrderPlugin(),
new webpack.optimize.AggressiveMergingPlugin()
],
postLoaders: [
{
test: /\.js$/,
exclude: /node_modules|testData/,
loader: 'jshint'
}]
}


module.exports = config;
2 changes: 1 addition & 1 deletion examples/assets/js/highlight.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var Highlight = React.createClass({
this.highlightCode();
},
highlightCode: function () {
var domNode = this.getDOMNode();
var domNode = React.findDOMNode(this);
var nodes = domNode.querySelectorAll('pre code');
if (nodes.length > 0) {
for (var i = 0; i < nodes.length; i=i+1) {
Expand Down
Loading