Skip to content

Commit 157220e

Browse files
committed
Run gofmt to add new build constraints
Also remove some 1.13 specific WASM code
1 parent 04ca449 commit 157220e

File tree

78 files changed

+94
-43
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+94
-43
lines changed

api.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

api_js.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build js && wasm
12
// +build js,wasm
23

34
package webrtc

api_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

certificate.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

certificate_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

configuration.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

configuration_js.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build js && wasm
12
// +build js,wasm
23

34
package webrtc

datachannel.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

datachannel_go_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

datachannel_js.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build js && wasm
12
// +build js,wasm
23

34
package webrtc
@@ -162,7 +163,7 @@ func (d *DataChannel) Label() string {
162163
// out-of-order delivery is allowed.
163164
func (d *DataChannel) Ordered() bool {
164165
ordered := d.underlying.Get("ordered")
165-
if jsValueIsUndefined(ordered) {
166+
if ordered.IsUndefined() {
166167
return true // default is true
167168
}
168169
return ordered.Bool()
@@ -171,13 +172,13 @@ func (d *DataChannel) Ordered() bool {
171172
// MaxPacketLifeTime represents the length of the time window (msec) during
172173
// which transmissions and retransmissions may occur in unreliable mode.
173174
func (d *DataChannel) MaxPacketLifeTime() *uint16 {
174-
if !jsValueIsUndefined(d.underlying.Get("maxPacketLifeTime")) {
175+
if !d.underlying.Get("maxPacketLifeTime").IsUndefined() {
175176
return valueToUint16Pointer(d.underlying.Get("maxPacketLifeTime"))
176-
} else {
177-
// See https://bugs.chromium.org/p/chromium/issues/detail?id=696681
178-
// Chrome calls this "maxRetransmitTime"
179-
return valueToUint16Pointer(d.underlying.Get("maxRetransmitTime"))
180177
}
178+
179+
// See https://bugs.chromium.org/p/chromium/issues/detail?id=696681
180+
// Chrome calls this "maxRetransmitTime"
181+
return valueToUint16Pointer(d.underlying.Get("maxRetransmitTime"))
181182
}
182183

183184
// MaxRetransmits represents the maximum number of retransmissions that are

datachannel_js_detach.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build js && wasm
12
// +build js,wasm
23

34
package webrtc

dtlstransport.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

dtlstransport_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

e2e/e2e_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build e2e
12
// +build e2e
23

34
package main

examples/broadcast/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package main

examples/custom-logger/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package main

examples/data-channels-detach/jsfiddle/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build js && wasm
12
// +build js,wasm
23

34
package main

examples/data-channels/jsfiddle/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build js && wasm
12
// +build js,wasm
23

34
package main

examples/ice-single-port/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package main

examples/ice-tcp/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package main

examples/insertable-streams/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package main

examples/ortc/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package main

examples/play-from-disk-renegotation/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package main

examples/play-from-disk/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package main

examples/reflect/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package main

examples/rtcp-processing/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package main

examples/rtp-forwarder/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package main

examples/rtp-to-webrtc/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package main

examples/save-to-disk/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package main

examples/simulcast/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package main

examples/swap-tracks/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package main

examples/vnet/show-network-usage/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package main

ice_go.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

icegatherer.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

icegatherer_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

iceserver.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

iceserver_js.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build js && wasm
12
// +build js,wasm
23

34
package webrtc

iceserver_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

icetransport.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

icetransport_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

interceptor.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

interceptor_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

js_compare.go

Lines changed: 0 additions & 13 deletions
This file was deleted.

js_compare_legacy.go

Lines changed: 0 additions & 13 deletions
This file was deleted.

js_utils.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build js && wasm
12
// +build js,wasm
23

34
package webrtc
@@ -42,15 +43,15 @@ func awaitPromise(promise js.Value) (js.Value, error) {
4243
}
4344

4445
func valueToUint16Pointer(val js.Value) *uint16 {
45-
if jsValueIsNull(val) || jsValueIsUndefined(val) {
46+
if val.IsNull() || val.IsUndefined() {
4647
return nil
4748
}
4849
convertedVal := uint16(val.Int())
4950
return &convertedVal
5051
}
5152

5253
func valueToStringPointer(val js.Value) *string {
53-
if jsValueIsNull(val) || jsValueIsUndefined(val) {
54+
if val.IsNull() || val.IsUndefined() {
5455
return nil
5556
}
5657
stringVal := val.String()
@@ -79,28 +80,28 @@ func interfaceToValueOrUndefined(val interface{}) js.Value {
7980
}
8081

8182
func valueToStringOrZero(val js.Value) string {
82-
if jsValueIsUndefined(val) || jsValueIsNull(val) {
83+
if val.IsUndefined() || val.IsNull() {
8384
return ""
8485
}
8586
return val.String()
8687
}
8788

8889
func valueToUint8OrZero(val js.Value) uint8 {
89-
if jsValueIsUndefined(val) || jsValueIsNull(val) {
90+
if val.IsUndefined() || val.IsNull() {
9091
return 0
9192
}
9293
return uint8(val.Int())
9394
}
9495

9596
func valueToUint16OrZero(val js.Value) uint16 {
96-
if jsValueIsNull(val) || jsValueIsUndefined(val) {
97+
if val.IsNull() || val.IsUndefined() {
9798
return 0
9899
}
99100
return uint16(val.Int())
100101
}
101102

102103
func valueToUint32OrZero(val js.Value) uint32 {
103-
if jsValueIsNull(val) || jsValueIsUndefined(val) {
104+
if val.IsNull() || val.IsUndefined() {
104105
return 0
105106
}
106107
return uint32(val.Int())

mediaengine.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

mediaengine_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

ortc_datachannel_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

ortc_media_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

ortc_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

peerconnection.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

peerconnection_close_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

peerconnection_go_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !js
12
// +build !js
23

34
package webrtc

0 commit comments

Comments
 (0)