Added query selector functionality to gather collection of links to be registered

route.go

@@ -51,7 +51,7 @@ func NewRoute(path string, handler HandlerFunc) *Route {
 	for _, routePart := range routeParts {
 		if strings.HasPrefix(routePart, `{`) && strings.HasSuffix(routePart, `}`) {
 			routePattern += RouteWithParamsPattern
-			routePart = strings.TrimPrefix(path, `}`)
+			routePart = strings.TrimPrefix(path, `{`)
 			routePart = strings.TrimSuffix(path, `}`)
 			r.varNames = append(r.varNames, routePart)
 		} else {

router.go

@@ -35,21 +35,24 @@ func (r *Router) HandleFunc(path string, handler HandlerFunc) *Route {
 }
 
 func (r *Router) Listen() {
-	r.RegisterLinks()
+	r.RegisterLinks("body a")
 }
 
-func (r *Router) RegisterLinks() {
+func (r *Router) RegisterLinks(querySelector string) {
 	document := dom.GetWindow().Document().(dom.HTMLDocument)
-	for _, link := range document.Links() {
+	links := document.QuerySelectorAll(querySelector)
+
+	for _, link := range links {
 		href := link.GetAttribute("href")
 		switch {
 
 		case strings.HasPrefix(href, "/") && !strings.HasPrefix(href, "//"):
 
 			if r.listener != nil {
-				link.RemoveEventListener("click", true, r.listener)
+				link.RemoveEventListener("click", false, r.listener)
 			}
-			r.listener = link.AddEventListener("click", true, r.linkHandler)
+
+			r.listener = link.AddEventListener("click", false, r.linkHandler)
 		}
 	}
 }
@@ -83,7 +86,7 @@ func (r *Router) linkHandler(event dom.Event) {
 		routeVars := make(map[string]string)
 
 		for i, part := range parts {
-			routeVars[matchedRoute.varNames[i]] = part
+			routeVars[matchedRoute.varNames[i]+`}`] = part
 		}
 
 		var ctx context.Context

templatebundle.go

@@ -6,8 +6,8 @@
 package isokit
 
 import (
-	"fmt"
 	"io/ioutil"
+	"log"
 	"os"
 	"path/filepath"
 	"strings"
@@ -41,7 +41,7 @@ func (t *TemplateBundle) importTemplateFileContents(templatesPath string) error
 			t.items[name] = string(contents)
 
 			if err != nil {
-				fmt.Println("error encountered while walking directory: ", err)
+				log.Println("error encountered while walking directory: ", err)
 				return err
 			}
 
@@ -68,7 +68,7 @@ func (t *TemplateBundle) importTemplateFileContentsForCog(templatesPath string,
 			t.items[name] = string(contents)
 
 			if err != nil {
-				fmt.Println("error encountered while walking directory: ", err)
+				log.Println("error encountered while walking directory: ", err)
 				return err
 			}