-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #30 from cytoscape/development
v1.2 release.
- Loading branch information
Showing
29 changed files
with
4,911 additions
and
3,639 deletions.
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,45 +1,52 @@ | ||
| import { createAction } from 'redux-actions' | ||
| import { createAction } from 'redux-actions'; | ||
|
|
||
| /** | ||
| * Global state for the application UI | ||
| * | ||
| * @type {string} | ||
| */ | ||
| export const SET_SETTINGS_OPEN = 'SET_SETTINGS_OPEN' | ||
| export const setSettingsOpen = createAction(SET_SETTINGS_OPEN) | ||
| export const SET_SETTINGS_OPEN = 'SET_SETTINGS_OPEN'; | ||
| export const setSettingsOpen = createAction(SET_SETTINGS_OPEN); | ||
|
|
||
| export const SET_CYTOSCAPE_STATUS = 'SET_CYTOSCAPE_STATUS' | ||
| export const setCytoscapeStatus = createAction(SET_CYTOSCAPE_STATUS) | ||
| export const SET_CYTOSCAPE_STATUS = 'SET_CYTOSCAPE_STATUS'; | ||
| export const setCytoscapeStatus = createAction(SET_CYTOSCAPE_STATUS); | ||
|
|
||
| export const SET_SERVICES_LIST_OPEN = 'SET_SERVICES_LIST_OPEN' | ||
| export const setServicesListOpen = createAction(SET_SERVICES_LIST_OPEN) | ||
| export const SET_SERVICES_LIST_OPEN = 'SET_SERVICES_LIST_OPEN'; | ||
| export const setServicesListOpen = createAction(SET_SERVICES_LIST_OPEN); | ||
|
|
||
| export const SET_HIGHLIGHTS = 'SET_HIGHLIGHTS' | ||
| export const setHighlights = createAction(SET_HIGHLIGHTS) | ||
| export const SET_HIGHLIGHTS = 'SET_HIGHLIGHTS'; | ||
| export const setHighlights = createAction(SET_HIGHLIGHTS); | ||
|
|
||
| // Selected tab | ||
| export const SET_SELECTED_SOURCE = 'SET_SELECTED_SOURCE' | ||
| export const setSelectedSource = createAction(SET_SELECTED_SOURCE) | ||
| export const SET_SELECTED_SOURCE = 'SET_SELECTED_SOURCE'; | ||
| export const setSelectedSource = createAction(SET_SELECTED_SOURCE); | ||
|
|
||
| export const SET_PATHWAY_FIGURE = 'SET_PATHWAY_FIGURE'; | ||
| export const setPathwayFigure = createAction(SET_PATHWAY_FIGURE); | ||
| export const SET_PATHWAY_FIGURE_SOURCE = 'SET_PATHWAY_FIGURE_SOURCE'; | ||
| export const setPathwayFigureSource = createAction(SET_PATHWAY_FIGURE_SOURCE); | ||
| export const SET_FIT_PATHWAY_FIGURE = 'SET_FIT_PATHWAY_FIGURE'; | ||
| export const setFitPathwayFigure = createAction(SET_FIT_PATHWAY_FIGURE); | ||
|
|
||
| // Sort settings | ||
| export const SET_SORT_OPTIONS = 'SET_SORT_OPTIONS' | ||
| export const SET_SORT_BY = 'SET_SORT_BY' | ||
| export const setSortOptions = createAction(SET_SORT_OPTIONS) | ||
| export const setSortBy = createAction(SET_SORT_BY) | ||
| export const SET_SORT_OPTIONS = 'SET_SORT_OPTIONS'; | ||
| export const SET_SORT_BY = 'SET_SORT_BY'; | ||
| export const setSortOptions = createAction(SET_SORT_OPTIONS); | ||
| export const setSortBy = createAction(SET_SORT_BY); | ||
|
|
||
| //Layout | ||
| export const SET_LAYOUT = 'SET_LAYOUT' | ||
| export const SET_LAYOUTS = 'SET_LAYOUTS' | ||
| export const setLayout = createAction(SET_LAYOUT) | ||
| export const setLayouts = createAction(SET_LAYOUTS) | ||
| export const SET_LAYOUT = 'SET_LAYOUT'; | ||
| export const SET_LAYOUTS = 'SET_LAYOUTS'; | ||
| export const setLayout = createAction(SET_LAYOUT); | ||
| export const setLayouts = createAction(SET_LAYOUTS); | ||
|
|
||
| //Annotations | ||
| export const SET_ANNOTATIONS = 'SET_ANNOTATIONS' | ||
| export const setAnnotations = createAction(SET_ANNOTATIONS) | ||
| export const SET_ANNOTATIONS = 'SET_ANNOTATIONS'; | ||
| export const setAnnotations = createAction(SET_ANNOTATIONS); | ||
|
|
||
| //Fit | ||
| export const FIT_NETWORK_VIEW = 'FIT_NETWORK_VIEW' | ||
| export const fitNetworkView = createAction(FIT_NETWORK_VIEW) | ||
| export const FIT_NETWORK_VIEW = 'FIT_NETWORK_VIEW'; | ||
| export const fitNetworkView = createAction(FIT_NETWORK_VIEW); | ||
|
|
||
| export const UPDATE = 'UPDATE' | ||
| export const update = createAction(UPDATE) | ||
| export const UPDATE = 'UPDATE'; | ||
| export const update = createAction(UPDATE); |
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
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
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,19 +1,28 @@ | ||
| import React from 'react' | ||
| import Tab from '@material-ui/core/Tab' | ||
| import { withStyles } from '@material-ui/core/styles' | ||
| import React from 'react'; | ||
| import Tab from '@material-ui/core/Tab'; | ||
| import { withStyles } from '@material-ui/core/styles'; | ||
| import { Tooltip } from '@material-ui/core'; | ||
|
|
||
| const HoverTab = props => { | ||
| //const { backgroundColor, ...other } = props | ||
|
|
||
| const Hover = withStyles(theme => ({ | ||
| const HoverTab = (props) => { | ||
| const Hover = withStyles((theme) => ({ | ||
| root: { | ||
| minHeight: props.minheight, | ||
| height: props.height, | ||
| '&:hover': { | ||
| backgroundColor: props.backgroundcolor, | ||
| opacity: 1 | ||
| } | ||
| } | ||
| }))(props => <Tab {...props} />) | ||
| return <Hover {...props} /> | ||
| } | ||
| opacity: 1, | ||
| }, | ||
| }, | ||
| }))((props) => | ||
| props.tooltip ? ( | ||
| <Tooltip title={props.tooltip}> | ||
| <Tab {...props} /> | ||
| </Tooltip> | ||
| ) : ( | ||
| <Tab {...props} /> | ||
| ) | ||
| ); | ||
| return <Hover {...props} />; | ||
| }; | ||
|
|
||
| export default HoverTab | ||
| export default HoverTab; |
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
Oops, something went wrong.