Skip to content

Commit 2663cc7

Browse files
authored
Updates for Observables 0.3 and misc updates to compat bounds (#154)
* Update internal Observables._val calls to documented and supported Observables.to_value (requires Observables v0.3), fixes #153. * Fix [compat] entries to have upper bounds on deps. * Set version to 0.10.4.
1 parent d8d981f commit 2663cc7

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

Project.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "InteractBase"
22
uuid = "d3863d7c-f0c8-5437-a7b4-3ae773c01009"
3-
version = "0.10.3"
3+
version = "0.10.4"
44

55
[deps]
66
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -18,11 +18,11 @@ Widgets = "cc8bc4a8-27d6-5769-a93b-9d913e69aa62"
1818

1919
[compat]
2020
julia = "0.7, 1"
21-
JSExpr = "0.3.0"
22-
Knockout = "0.2.1"
23-
Observables = "≥ 0.2.2"
24-
WebIO = "0.3.0"
25-
Widgets = "0.6.1"
21+
JSExpr = "0.3,0.4,0.5"
22+
Knockout = "0.2.1"
23+
Observables = "0.3"
24+
WebIO = "0.3,0.4,0.5,0.6,0.7,0.8"
25+
Widgets = "0.6.1"
2626

2727
[extras]
2828
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

src/InteractBase.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ import Widgets:
6060
triggeredby,
6161
onchange
6262

63-
import Observables: throttle, _val
63+
import Observables: throttle
6464

6565
export observe, Widget, widget
6666

src/optioninput.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ function initvalueindex(value, index, vals2idxs;
5656
multiple = false, default = multiple ? eltype(vals2idxs[])[] : first(vals2idxs[]), rev = false)
5757

5858
if value === automatic
59-
value = (index === nothing) ? default : vals2idxs[][Observables._val(index)]
59+
value = (index === nothing) ? default : vals2idxs[][Observables.to_value(index)]
6060
end
6161
(value isa AbstractObservable) || (value = Observable{Any}(value))
6262
if index === nothing

src/slider.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ for func in [:rangeslider, :slider]
1717
@eval begin
1818
function $func(WT::WidgetTheme, vals::AbstractArray, formatted_vals = format.(vec(vals)); value = medianelement(vals), kwargs...)
1919

20-
T = Observables._val(value) isa Vector ? Vector{eltype(vals)} : eltype(vals)
20+
T = Observables.to_value(value) isa Vector ? Vector{eltype(vals)} : eltype(vals)
2121
value isa AbstractObservable || (value = Observable{T}(value))
2222

2323
vals = vec(vals)
@@ -84,7 +84,7 @@ function rangeslider(theme::WidgetTheme, vals::AbstractUnitRange{<:Integer}, for
8484
style = Dict(), label = nothing, value = medianelement(vals), orientation = "horizontal", readout = true,
8585
className = "is-primary")
8686

87-
T = Observables._val(value) isa Vector ? Vector{eltype(vals)} : eltype(vals)
87+
T = Observables.to_value(value) isa Vector ? Vector{eltype(vals)} : eltype(vals)
8888
value isa AbstractObservable || (value = Observable{T}(value))
8989

9090
index = value
@@ -181,7 +181,7 @@ function rangepicker(vals::AbstractArray;
181181
A multihandle slider with a set of spinboxes, one per handle.
182182
"""
183183
function rangepicker(::WidgetTheme, vals::AbstractRange{S}; value = [extrema(vals)...], readout = false, className = "is-primary") where {S}
184-
T = Observables._val(value) isa Vector ? Vector{eltype(vals)} : eltype(vals)
184+
T = Observables.to_value(value) isa Vector ? Vector{eltype(vals)} : eltype(vals)
185185
value isa AbstractObservable || (value = Observable{T}(value))
186186
wdg = Widget{:rangepicker}(output = value)
187187
if !(T<:Vector)

0 commit comments

Comments
 (0)