fix issue #6 - JS not always running on page load

joedf · joedf · commit 5602e5970096 · 2019-12-11T22:12:02.000-05:00
diff --git a/src/Lib/Webapp.ahk b/src/Lib/Webapp.ahk
@@ -141,13 +141,13 @@ class __Webapp_wb_events
 	 ;blocked all navigation, we want our own stuff happening
 	NavigateComplete2(wb, NewURL) {
 		; wb.Stop() ;not needed in this one.
-		global __Webapp_NavComplete_call
-		__Webapp_NavComplete_call.call(NewURL)
 	}
 	DownloadComplete(wb, NewURL) {
 		wb.Stop()
 	}
 	DocumentComplete(wb, NewURL) {
+		global __Webapp_NavComplete_call
+		__Webapp_NavComplete_call.call(NewURL)
 		wb.Stop()
 	}
 	NavigateError(wb, NewURL) {

Original file line number	Diff line number	Diff line change
`@@ -141,13 +141,13 @@ class __Webapp_wb_events`
`141`	`141`	`;blocked all navigation, we want our own stuff happening`
`142`	`142`	`NavigateComplete2(wb, NewURL) {`
`143`	`143`	`; wb.Stop() ;not needed in this one.`
`144`		`- global __Webapp_NavComplete_call`
`145`		`- __Webapp_NavComplete_call.call(NewURL)`
`146`	`144`	`}`
`147`	`145`	`DownloadComplete(wb, NewURL) {`
`148`	`146`	`wb.Stop()`
`149`	`147`	`}`
`150`	`148`	`DocumentComplete(wb, NewURL) {`
	`149`	`+ global __Webapp_NavComplete_call`
	`150`	`+ __Webapp_NavComplete_call.call(NewURL)`
`151`	`151`	`wb.Stop()`
`152`	`152`	`}`
`153`	`153`	`NavigateError(wb, NewURL) {`