Commit13734ff

committed

remove image on windows due to image path issue

1 parent37a37c2 commit13734ffCopy full SHA for 13734ff

File tree

+16

-10

lines changed

+16

-10

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,8 @@`
`2`	`2`	`varReact=require('react');`
`3`	`3`	`varpath_1=require('path');`
`4`	`4`	`varindex_1=require('../../index');`
`5`		`-varimagePath=path_1.join(__dirname,'../../../../','img','coderoad.jpg');`
`6`	`5`	`varstyles={`
`7`	`6`	`header:{`
`8`		`-backgroundImage:"url(\""+imagePath+"\")",`
`9`	`7`	`backgroundRepeat:'no-repeat',`
`10`	`8`	`backgroundColor:'inherit',`
`11`	`9`	`height:'350px',`
`@@ -27,6 +25,10 @@ var styles = {`
`27`	`25`	`textShadow:'1px 1px 0px #000',`
`28`	`26`	`},`
`29`	`27`	`};`
	`28`	`+if(!navigator.platform.match(/Win/)){`
	`29`	`+varimagePath=path_1.resolve(__dirname,'..','..','..','..','img','coderoad.jpg');`
	`30`	`+styles.header.backgroundImage="url("+imagePath+")";`
	`31`	`+}`
`30`	`32`	`varWelcome=function(_a){`
`31`	`33`	`vartitle=_a.title,tagline=_a.tagline,firstRoute=_a.firstRoute;`
`32`	`34`	`return(React.createElement("div",{style:styles.header,className:'cr-bg'},`

Lines changed: 12 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,9 @@`
`1`	`1`	`import*asReactfrom'react';`
`2`		`-import{join}from'path';`
	`2`	`+import{resolve}from'path';`
`3`	`3`	`import{RouteButton}from'../../index';`
`4`	`4`
`5`		`-// TODO: fix path`
`6`		`-constimagePath=join(`
`7`		`-__dirname,'../../../../','img','coderoad.jpg'`
`8`		`-);`
`9`		`-`
`10`		`-conststyles={`
	`5`	`+letstyles={`
`11`	`6`	`header:{`
`12`		-backgroundImage:`url("${imagePath}")`,
`13`	`7`	`backgroundRepeat:'no-repeat',`
`14`	`8`	`backgroundColor:'inherit',`
`15`	`9`	`height:'350px',`
`@@ -32,6 +26,16 @@ const styles = {`
`32`	`26`	`},`
`33`	`27`	`};`
`34`	`28`
	`29`	`+// issue: image not loading on Windows`
	`30`	`+// due to url parse/replacing providing`
	`31`	`+// invalid path`
	`32`	`+if(!navigator.platform.match(/Win/)){`
	`33`	`+constimagePath=resolve(`
	`34`	`+__dirname,'..','..','..','..','img','coderoad.jpg'`
	`35`	`+);`
	`36`	+styles.header.backgroundImage=`url(${imagePath})`;
	`37`	`+}`
	`38`	`+`
`35`	`39`	`constWelcome:React.StatelessComponent<{`
`36`	`40`	`title:string,tagline:string,firstRoute:string`
`37`	`41`	`}>=({title, tagline, firstRoute})=>(`

Comments

(0)