Merge pull request #447 from svsool/bug

jhnns · jhnns · commit 4ecbae6c12e3 · 2016-05-15T21:05:42.000+02:00
fix bug when src attribute not defined on last script element Merging this in favor of #394
diff --git a/client/index.js b/client/index.js
@@ -8,7 +8,8 @@ if (typeof __resourceQuery === "string" && __resourceQuery) {
 } else {
 	// Else, get the url from the <script> this file was called with.
 	var scriptElements = document.getElementsByTagName("script");
-	var scriptHost = scriptElements[scriptElements.length-1].getAttribute("src").replace(/\/[^\/]+$/, "");
+	var scriptHost = scriptElements[scriptElements.length-1].getAttribute("src");
+	scriptHost = scriptHost && scriptHost.replace(/\/[^\/]+$/, "");
 	urlParts = url.parse((scriptHost ? scriptHost : "/"), false, true);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@ if (typeof __resourceQuery === "string" && __resourceQuery) {`
`8`	`8`	`} else {`
`9`	`9`	`// Else, get the url from the <script> this file was called with.`
`10`	`10`	`var scriptElements = document.getElementsByTagName("script");`
`11`		`- var scriptHost = scriptElements[scriptElements.length-1].getAttribute("src").replace(/\/[^\/]+$/, "");`
	`11`	`+ var scriptHost = scriptElements[scriptElements.length-1].getAttribute("src");`
	`12`	`+ scriptHost = scriptHost && scriptHost.replace(/\/[^\/]+$/, "");`
`12`	`13`	`urlParts = url.parse((scriptHost ? scriptHost : "/"), false, true);`
`13`	`14`	`}`
`14`	`15`