This repository has been archived by the owner on Oct 8, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6
Link story fix #49
Merged
Merged
Link story fix #49
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
c6d1876
Fix for "<Link>s rendered outside of a router context cannot navigate…
60c0a5c
Fix proposition for Link component
bc4f784
merging before pushing
65a0171
removed loading default config in webpack.config.js
46393e3
Merge branch 'master' into LinkStoryFix
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
import React from 'react' | ||
import { List, ListItem } from 'material-ui/List' | ||
import Divider from 'material-ui/Divider' | ||
import { Link } from 'react-router' | ||
import Link from 'components/Link' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. the changes in this file were done mostly to test using link in another component. I can drop the changes in this file if you wish. |
||
import { darkBlack, grey400 } from 'material-ui/styles/colors' | ||
import ActionInfo from 'material-ui/svg-icons/action/info' | ||
import Update from 'material-ui/svg-icons/action/system-update-alt' | ||
|
@@ -52,9 +52,8 @@ function NotificationList() { | |
paddingLeft: '10px', | ||
}} | ||
to="project/undefined/pullrequest/UHVsbFJlcXVlc3Q6Mw==" | ||
> | ||
Fixes for builds count controller, added new charts, fixed minor issues | ||
</Link> | ||
label="Fixes for builds count controller, added new charts, fixed minor issues" | ||
/> | ||
<span | ||
style={{ | ||
color: '#bcbbbb', | ||
|
@@ -101,9 +100,8 @@ function NotificationList() { | |
paddingLeft: '10px', | ||
}} | ||
to="project/undefined/pullrequest/UHVsbFJlcXVlc3Q6Mw==" | ||
> | ||
[5.4] Fix particle random number regression | ||
</Link> | ||
label="[5.4] Fix particle random number regression" | ||
/> | ||
<span | ||
style={{ | ||
color: '#bcbbbb', | ||
|
@@ -143,9 +141,8 @@ function NotificationList() { | |
paddingLeft: '10px', | ||
}} | ||
to="/project/UmVwb3NpdG9yeTox" | ||
> | ||
Option to use low resolution for Game View aspect ratios V4 | ||
</Link> | ||
label="Option to use low resolution for Game View aspect ratios V4" | ||
/> | ||
<span | ||
style={{ | ||
color: '#bcbbbb', | ||
|
@@ -178,9 +175,8 @@ function NotificationList() { | |
paddingLeft: '10px', | ||
}} | ||
to="project/undefined/pullrequest/UHVsbFJlcXVlc3Q6Mw==" | ||
> | ||
Trunk merge of the scriptable renderloop branch | ||
</Link> | ||
label="Trunk merge of the scriptable renderloop branch" | ||
/> | ||
<span | ||
style={{ | ||
color: '#bcbbbb', | ||
|
@@ -224,9 +220,8 @@ function NotificationList() { | |
paddingLeft: '10px', | ||
}} | ||
to="project/undefined/pullrequest/UHVsbFJlcXVlc3Q6Mw==" | ||
> | ||
Option to use low resolution for Game View aspect ratios | ||
</Link> | ||
link="Option to use low resolution for Game View aspect ratios" | ||
/> | ||
<span | ||
style={{ | ||
color: '#bcbbbb', | ||
|
@@ -259,9 +254,8 @@ function NotificationList() { | |
paddingLeft: '10px', | ||
}} | ||
to="project/undefined/pullrequest/UHVsbFJlcXVlc3Q6Mw==" | ||
> | ||
Move render target switching out from jobs | ||
</Link> | ||
label="Move render target switching out from jobs" | ||
/> | ||
<span | ||
style={{ | ||
color: '#bcbbbb', | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
import React from 'react' | ||
import { action } from '@kadira/storybook' | ||
|
||
// Set the custom link component | ||
module.exports.Link = class Link extends React.Component { | ||
handleClick(e) { | ||
e.preventDefault() | ||
const { to } = this.props | ||
action('Link')(to) | ||
} | ||
|
||
render() { | ||
const { children, style } = this.props | ||
|
||
return ( | ||
<a | ||
style={style} | ||
href="#" | ||
onClick={(e) => this.handleClick(e)} | ||
> | ||
{children} | ||
</a> | ||
) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
required by changes in storybook/rr.js and storybook/webpack.config.js