Merge pull request #107 from durunvo/master

Upgrade react-router to v2

Author: drew-gross

package.json

@@ -28,7 +28,7 @@
     "react-dnd": "~2.0.2",
     "react-dnd-html5-backend": "~2.0.0",
     "react-dom": "^0.14.0",
-    "react-router": "1.0.0-rc1"
+    "react-router": "2.0.0"
   },
   "devDependencies": {
     "babel-core": "~5.8.12",

src/components/CategoryList/CategoryList.react.js

@@ -61,7 +61,7 @@ export default class CategoryList extends React.Component {
             (this.props.linkPrefix || '') + (c.link || id)
           );
           return (
-            <Link title={c.name} to={link} className={className} key={id} >
+            <Link title={c.name} to={{ pathname: link }} className={className} key={id} >
               <span>{count}</span>
               <span>{c.name}</span>
             </Link>

src/components/FileTree/FileTree.react.js

@@ -74,7 +74,7 @@ export default class FileTree extends React.Component {
               <Link
                 key={'f_' + f}
                 className={[styles.file, isCurrent ? styles.current : ''].join(' ')}
-                to={this.props.linkPrefix + path}>
+                to={{ pathname: this.props.linkPrefix + path }}>
                 {f}
               </Link>
             );

src/components/Popover/Popover.react.js

@@ -22,7 +22,8 @@ class ContextProxy extends React.Component {
 }
 
 ContextProxy.childContextTypes = {
-  history: React.PropTypes.object
+  history: React.PropTypes.object,
+  router: React.PropTypes.object
 };
 
 export default class Popover extends React.Component {
@@ -93,5 +94,6 @@ export default class Popover extends React.Component {
 }
 
 Popover.contextTypes = {
-  history: React.PropTypes.object
+  history: React.PropTypes.object,
+  router: React.PropTypes.object
 };

src/components/Sidebar/AppsSelector.react.js

@@ -59,7 +59,7 @@ export default class AppsSelector extends React.Component {
         if (sections[0] === '') {
           sections.shift();
         }
-        history.pushState(null, `/apps/${value}/${sections[2]}`);
+        history.push(null, `/apps/${value}/${sections[2]}`);
       }
     });
   }

src/components/Sidebar/SidebarHeader.react.js

@@ -13,7 +13,7 @@ import styles         from 'components/Sidebar/Sidebar.scss';
 
 let SidebarHeader = ({}) =>
 <div className={styles.header}>
-  <Link className={styles.logo} to='/apps'>
+  <Link className={styles.logo} to={{ pathname: '/apps' }}>
     <Icon width={28} height={28} name='infinity' fill={'#ffffff'} />
   </Link>
   <Link to='/apps'>

src/components/Sidebar/SidebarSection.react.js

@@ -23,7 +23,7 @@ let SidebarSection = ({ active, children, name, link, icon, style }) => {
     <div className={classes.join(' ')}>
       {active ?
         <div style={style} className={styles.section_header}>{iconContent}{name}</div> :
-        <Link style={style} className={styles.section_header} to={link || ''}>{iconContent}{name}</Link>}
+        <Link style={style} className={styles.section_header} to={{ pathname: link || '' }}>{iconContent}{name}</Link>}
 
       {children ? <div className={styles.section_contents}>{children}</div> : null}
     </div>

src/components/Sidebar/SidebarSubItem.react.js

@@ -28,7 +28,7 @@ let SidebarSubItem = ({ active, name, action, link, children }) => {
     <div>
       <Link
         className={styles.subitem}
-        to={link}>
+        to={{ pathname: link }}>
         {name}
       </Link>
     </div>

src/dashboard/AppData.react.js

@@ -38,7 +38,7 @@ let AppData = React.createClass({
     if (current) {
       current.setParseKeys();
     } else {
-      history.replaceState(null, '/apps');
+      history.replace('/apps');
       return <div />;
     }
     return (

src/dashboard/AppSelector.react.js

@@ -26,11 +26,11 @@ export default class AppSelector extends React.Component {
 
   handleConfirm() {
     let newPath = location.pathname.replace(/\/_(\/|$)/, '/' + this.state.slug + '/');
-    history.pushState(null, newPath);
+    history.push(newPath);
   }
 
   handleCancel() {
-    history.pushState(null, '/apps');
+    history.push('/apps');
   }
 
   render() {