TrizTech/ohif-viewer
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix // issue with icon path resolution

Browse Source
This commit is contained in:
dannyrb 2019-05-17 16:00:37 -04:00
parent ab929c2827
commit 4cd1763ab7
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/ohif-vtk-extension/src/ConnectedToolbarSection.js
View File

@ -3,7 +3,7 @@ import { ToolbarSection } from 'react-viewerbase';
import OHIF from 'ohif-core'; import OHIF from 'ohif-core';
const { setToolActive } = OHIF.redux.actions; const { setToolActive } = OHIF.redux.actions;
const Icons = `${window.config.routerBasename}/icons.svg`; const Icons = `${window.config.routerBasename}/icons.svg`.replace('//', '/');
const mapStateToProps = state => { const mapStateToProps = state => {
const activeButton = state.tools.buttons.find(tool => tool.active === true); const activeButton = state.tools.buttons.find(tool => tool.active === true);

2
src/components/OHIFLogo/OHIFLogo.js
View File

@ -1,7 +1,7 @@
import React from 'react' import React from 'react'
import './OHIFLogo.css' import './OHIFLogo.css'
const Icons = `${window.config.routerBasename}/icons.svg` const Icons = `${window.config.routerBasename}/icons.svg`.replace('//', '/')
function OHIFLogo() { function OHIFLogo() {
return ( return (

2
src/connectedComponents/ConnectedPluginSwitch.js
View File

@ -36,7 +36,7 @@ const mergeProps = (propsFromState, propsFromDispatch, ownProps) => {
// TODO: Do not display certain options if the current display set // TODO: Do not display certain options if the current display set
// cannot be displayed using these view types // cannot be displayed using these view types
const Icons = `${window.config.routerBasename}/icons.svg` const Icons = `${window.config.routerBasename}/icons.svg`.replace('//', '/')
const buttons = [ const buttons = [
{ {
text: 'Acquired', text: 'Acquired',

2
src/connectedComponents/ToolbarRow.js
View File

@ -6,7 +6,7 @@ import ConnectedLayoutButton from './ConnectedLayoutButton'
import ConnectedPluginSwitch from './ConnectedPluginSwitch.js' import ConnectedPluginSwitch from './ConnectedPluginSwitch.js'
import './ToolbarRow.css' import './ToolbarRow.css'
const Icons = `${window.config.routerBasename}/icons.svg` const Icons = `${window.config.routerBasename}/icons.svg`.replace('//', '/')
class ToolbarRow extends Component { class ToolbarRow extends Component {
static propTypes = { static propTypes = {

5
src/utils/getDefaultToolbarButtons.js
View File

@ -8,7 +8,10 @@ export default function(baseDirectory = '/') {
baseDirectory[baseDirectory.length - 1] === '/' baseDirectory[baseDirectory.length - 1] === '/'
? baseDirectory ? baseDirectory
: `${baseDirectory}/` : `${baseDirectory}/`
const relativePathToIcons = `${sanitizedBaseDirectory}${iconsFileName}` const relativePathToIcons = `${sanitizedBaseDirectory}${iconsFileName}`.replace(
'//',
'/'
)
return [ return [
{ {