Pārlūkot izejas kodu

Avoid Javascript minifier to break keyboard shortcuts

Frédéric Guillot 5 gadi atpakaļ
vecāks
revīzija
b015887b02
4 mainītis faili ar 6 papildinājumiem un 4 dzēšanām
  1. 1 1
      go.mod
  2. 4 0
      go.sum
  3. 0 0
      ui/static/js.go
  4. 1 3
      ui/static/js/keyboard_handler.js

+ 1 - 1
go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect
 	github.com/rylans/getlang v0.0.0-20200505200108-4c3188ff8a2d
 	github.com/stretchr/testify v1.6.1 // indirect
-	github.com/tdewolff/minify/v2 v2.9.4 // indirect
+	github.com/tdewolff/minify/v2 v2.9.5 // indirect
 	golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5
 	golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d

+ 4 - 0
go.sum

@@ -42,8 +42,12 @@ github.com/tdewolff/minify v1.1.0 h1:nxHQi1ML+g3ZbZHffiZ6eC7vMqNvSRfX3KB5Y5y/kfw
 github.com/tdewolff/minify v2.3.6+incompatible h1:2hw5/9ZvxhWLvBUnHE06gElGYz+Jv9R4Eys0XUzItYo=
 github.com/tdewolff/minify/v2 v2.9.4 h1:sOqgmowmkZWmHZ0AqIFS300VvCCkgDNTw1eWw1tnNCY=
 github.com/tdewolff/minify/v2 v2.9.4/go.mod h1:4SrPavRSPLpv4U4jqV8jzSjiEuq2BH+BPgxorMkGrhc=
+github.com/tdewolff/minify/v2 v2.9.5 h1:+fHvqLencVdv14B+zgxQGhetF9qXl/nRTN/1mcyQwpM=
+github.com/tdewolff/minify/v2 v2.9.5/go.mod h1:jshtBj/uUJH6JX1fuxTLnnHOA1RVJhF5MM+leJzDKb4=
 github.com/tdewolff/parse/v2 v2.5.2 h1:OIUAejEkj9Oj6N1q18xg7ByYkpQ0xf4nA1aAH5nqxks=
 github.com/tdewolff/parse/v2 v2.5.2/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho=
+github.com/tdewolff/parse/v2 v2.5.3 h1:fnPIstKgEfxd3+wwHnH73sAYydsR0o/jYhcQ6c5PkrA=
+github.com/tdewolff/parse/v2 v2.5.3/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho=
 github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5 h1:Q7tZBpemrlsc2I7IyODzhtallWRSm4Q0d09pL6XbQtU=

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
ui/static/js.go


+ 1 - 3
ui/static/js/keyboard_handler.js

@@ -15,10 +15,9 @@ class KeyboardHandler {
             let key = this.getKey(event);
             if (this.isEventIgnored(event, key) || this.isModifierKeyDown(event)) {
                 return;
-            } else {
-                event.preventDefault();
             }
 
+            event.preventDefault();
             this.queue.push(key);
 
             for (let combination in this.shortcuts) {
@@ -47,7 +46,6 @@ class KeyboardHandler {
         return event.target.tagName === "INPUT" ||
             event.target.tagName === "TEXTAREA" ||
             (this.queue.length < 1 && !this.triggers.includes(key));
-
     }
 
     isModifierKeyDown(event) {

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels