ref: ba65f8f37fb20c47857bdabab61916255e12ed26
parent: bcce6fc26675a60c9fc0a4cf41f76f6258c789bc
author: Philip Silva <[email protected]>
date: Sun Jan 31 14:55:18 EST 2021
Support IDs with dots
--- a/domino/domino.go
+++ b/domino/domino.go
@@ -19,7 +19,7 @@
var DebugDumpJS *bool
var log *logger.Logger
-var timeout = 20*time.Second
+var timeout = 60*time.Second
func SetLogger(l *logger.Logger) {log = l
@@ -339,7 +339,20 @@
}
func blocked(src string) bool {- for _, s := range []string{"adsense", "adsystem", "adservice", "googletagservice", "googletagmanager", "script.ioam.de","googlesyndication","adserver", "nativeads", "prebid", ".ads."} {+ for _, s := range []string{+ "adsense",
+ "adsystem",
+ "adservice",
+ "googletagservice",
+ "googletagmanager",
+ "script.ioam.de",
+ "googlesyndication",
+ "adserver",
+ "nativeads",
+ "prebid",
+ ".ads.",
+ "google-analytics.com",
+ } { if strings.Contains(src, s) {return true
}
--- a/go.mod
+++ b/go.mod
@@ -12,8 +12,10 @@
9fans.net/go v0.0.0-00010101000000-000000000000
github.com/andybalholm/cascadia v1.1.0
github.com/chris-ramon/douceur v0.2.1-0.20160603235419-f3463056cd52
- github.com/dop251/goja v0.0.0-20201107160812-7545ac6de48a
+ github.com/dlclark/regexp2 v1.4.0 // indirect
+ github.com/dop251/goja v0.0.0-20210126164150-f5884268f0c0
github.com/dop251/goja_nodejs v0.0.0-20200811150831-9bc458b4bbeb
+ github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
github.com/gorilla/css v1.0.0 // indirect
github.com/jvatic/goja-babel v0.0.0-20200102152603-63c66b7c796a
github.com/mjl-/duit v0.0.0-20200330125617-580cb0b2843f
@@ -22,6 +24,6 @@
github.com/srwiley/rasterx v0.0.0-20200120212402-85cb7272f5e9
golang.org/x/image v0.0.0-20200927104501-e162460cd6b5
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
- golang.org/x/text v0.3.4
+ golang.org/x/text v0.3.5
gopkg.in/yaml.v2 v2.3.0 // indirect
)
--- a/go.sum
+++ b/go.sum
@@ -4,13 +4,17 @@
github.com/chris-ramon/douceur v0.2.1-0.20160603235419-f3463056cd52/go.mod h1:wDW5xjJdeoMm1mRt4sD4c/LbF/mWdEpRXQKjTR8nIBE=
github.com/dlclark/regexp2 v1.2.0 h1:8sAhBGEM0dRWogWqWyQeIJnxjWO6oIjl8FKqREDsGfk=
github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
+github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E=
+github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
github.com/dop251/goja v0.0.0-20191203121440-007eef3bc40f/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA=
-github.com/dop251/goja v0.0.0-20201107160812-7545ac6de48a h1:RYcWAh8DBgQQ7Fi3YhoyMhtGiF8JHKBDSeym7wd9o10=
-github.com/dop251/goja v0.0.0-20201107160812-7545ac6de48a/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA=
+github.com/dop251/goja v0.0.0-20210126164150-f5884268f0c0 h1:6zmaq2NhOm//MNgxDPXoLiWS1c/WTPxqqeUAQFrZRbQ=
+github.com/dop251/goja v0.0.0-20210126164150-f5884268f0c0/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA=
github.com/dop251/goja_nodejs v0.0.0-20200811150831-9bc458b4bbeb h1:UGtCiVzBK40WGYBmNui17MHCkAqdo1j3BbhtU3mB1fI=
github.com/dop251/goja_nodejs v0.0.0-20200811150831-9bc458b4bbeb/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y=
github.com/go-sourcemap/sourcemap v2.1.2+incompatible h1:0b/xya7BKGhXuqFESKM4oIiRo9WOt2ebz7KxfreD6ug=
github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
+github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
+github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
github.com/jvatic/goja-babel v0.0.0-20200102152603-63c66b7c796a h1:WuwcEKWfDriJzlronFYhSDz9me9Xl7UbanAxTHpCLXA=
@@ -46,8 +50,8 @@
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
--- a/nodes/nodes.go
+++ b/nodes/nodes.go
@@ -177,6 +177,9 @@
}
if id := n.Attr("id"); id != "" {+ // https://stackoverflow.com/questions/605630/how-to-select-html-nodes-by-id-with-jquery-when-the-id-contains-a-dot
+ id = strings.ReplaceAll(id, `.`, `\\.`)
+
return "#" + id, true
}