Skip to content

Commit 7157491

Browse files
committed
basename needs a default
master detail throws an error on line 18
1 parent e61958a commit 7157491

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

examples/master-detail/app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ import createHistory from 'history/lib/createHashHistory';
33
import { Router, Navigation, Route, Link } from 'react-router';
44
import ContactStore from './ContactStore';
55

6-
var history = createHistory();
7-
86
var App = React.createClass({
97
getInitialState() {
108
return {
@@ -151,6 +149,8 @@ var NotFound = React.createClass({
151149
}
152150
});
153151

152+
var history = createHistory();
153+
154154
React.render((
155155
<Router history={history}>
156156
<Route component={App}>

examples/webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module.exports = {
1313
entry: fs.readdirSync(__dirname).reduce(function (entries, dir) {
1414
var isDraft = dir.charAt(0) === '_';
1515

16-
if (!isDraft && isDirectory(path.join(__dirname, dir)) && dir === 'transitions')
16+
if (!isDraft && isDirectory(path.join(__dirname, dir)))
1717
entries[dir] = path.join(__dirname, dir, 'app.js');
1818

1919
return entries;

modules/ActiveMixin.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ function pathnameIsActive(pathname, activePathname, activeRoutes, activeParams)
88
if (pathname === activePathname || activePathname.indexOf(pathname + '/') === 0)
99
return true;
1010

11-
var route, pattern, basename;
11+
var route, pattern;
12+
var basename = '';
1213
for (var i = 0, len = activeRoutes.length; i < len; ++i) {
1314
route = activeRoutes[i];
1415
pattern = route.path || '';

0 commit comments

Comments
 (0)