Make sure our baseDirectory ends in a forward slash
This commit is contained in:
1 parent
f583af0f20
commit
2cbeb26eb4
6 files changed
+9
-16
No files matched your search
@@ -1,7 +1,7 @@
|
||||
import React from 'react'
|
||||
import './OHIFLogo.css'
|
||||
|
||||
const Icons = `${window.config.routerBasename}icons.svg`
|
||||
const Icons = `${window.config.routerBasename}/icons.svg`
|
||||
|
||||
function OHIFLogo() {
|
||||
return (
|
||||
|
||||
@@ -36,7 +36,7 @@ const mergeProps = (propsFromState, propsFromDispatch, ownProps) => {
|
||||
|
||||
// TODO: Do not display certain options if the current display set
|
||||
// cannot be displayed using these view types
|
||||
const Icons = `${window.config.routerBasename}icons.svg`
|
||||
const Icons = `${window.config.routerBasename}/icons.svg`
|
||||
const buttons = [
|
||||
{
|
||||
text: 'Acquired',
|
||||
|
||||
@@ -6,7 +6,7 @@ import ConnectedLayoutButton from './ConnectedLayoutButton'
|
||||
import ConnectedPluginSwitch from './ConnectedPluginSwitch.js'
|
||||
import './ToolbarRow.css'
|
||||
|
||||
const Icons = `${window.config.routerBasename}icons.svg`
|
||||
const Icons = `${window.config.routerBasename}/icons.svg`
|
||||
|
||||
class ToolbarRow extends Component {
|
||||
static propTypes = {
|
||||
|
||||
@@ -4,7 +4,11 @@
|
||||
*/
|
||||
export default function(baseDirectory = '/') {
|
||||
const iconsFileName = 'icons.svg'
|
||||
const relativePathToIcons = `${baseDirectory}${iconsFileName}`
|
||||
const sanitizedBaseDirectory =
|
||||
baseDirectory[baseDirectory.length - 1] === '/'
|
||||
? baseDirectory
|
||||
: `${baseDirectory}/`
|
||||
const relativePathToIcons = `${sanitizedBaseDirectory}${iconsFileName}`
|
||||
|
||||
return [
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user