Merge pull request #73 from cdubz/react-15

Updated React to v15.
bovard · May 15, 2016 · ee96eb2 · ee96eb2
2 parents a3cc3d4 + 492c738
commit ee96eb2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/client/main.js b/client/main.js
@@ -19,10 +19,11 @@ var PanelGroup = require('react-bootstrap').PanelGroup;
 var Well = require('react-bootstrap').Well;
 
 // react ace
-var AceEditor = require('react-ace');
+var AceEditor = require('react-ace').default;
 var brace  = require('brace');
 require('brace/mode/javascript');
 require('brace/theme/chrome');
+require('brace/ext/language_tools'); // @see https://github.com/securingsincity/react-ace/issues/95
 
 // game components
 var GameRunner = require('../lib/GameRunner');
@@ -767,19 +768,20 @@ var Raid = React.createClass({
                 <Row>
                     <Col xs={12} md={7} lg={7}>
                         <AceEditor
+                            name="playerText"
+                            mode="javascript"
+                            theme="chrome"
+                            width="100%"
                             fontSize={12}
+                            showPrintMargin={false}
                             highlightActiveLine={true}
-                            label="RaidPlayer.js"
                             maxLines={50}
-                            mode="javascript"
-                            onChange={this.onPlayerCodeUpdate}
-                            ref="playerText"
-                            showPrintMargin={false}
                             tabSize={2}
-                            theme="chrome"
                             value={this.state.playerCode}
-                            width="100%"
+                            onChange={this.onPlayerCodeUpdate}
                             editorProps={{$blockScrolling: Infinity}}
+                            label="RaidPlayer.js"
+                            ref="playerText"
                         />
                     </Col>
                     <Col xs={12} md={5} lg={5}>

diff --git a/package.json b/package.json
@@ -25,15 +25,15 @@
   "homepage": "https://github.com/bovard/raid",
   "dependencies": {
     "babel-preset-react": "^6.5.0",
-    "babelify": "^7.2.0",
-    "brace": "^0.7.0",
+    "babelify": "^7.3.0",
+    "brace": "^0.8.0",
     "clone": "^1.0.2",
     "generate-maze-by-clustering": "0.0.4",
-    "pathfinding": "^0.4.17",
-    "react": "^0.14.7",
-    "react-ace": "^3.1.0",
-    "react-bootstrap": "^0.27.0",
-    "react-dom": "^0.14.7",
-    "react-markdown": "^2.1.0"
+    "pathfinding": "^0.4.18",
+    "react": "^15.0.2",
+    "react-ace": "^3.4.1",
+    "react-bootstrap": "^0.29.4",
+    "react-dom": "^15.0.2",
+    "react-markdown": "^2.2.0"
   }
 }