Skip to content

Commit 830d5b2

Browse files
author
Pietro Vertechi
authored
Update to new WebIO (#23)
* Update how observable values are updated/fetched to match new WebIO. * fixed deps * fix tests
1 parent de68f57 commit 830d5b2

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

REQUIRE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
julia 0.7
22
JSON
33
MacroTools
4-
WebIO 0.3.0
4+
WebIO 0.6.0
55
Observables 0.2.2

src/JSExpr.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ end
4747

4848
function obs_get_expr(x)
4949
# empty [], special case to get value from an Observable
50-
F(["WebIO.getval(", jsexpr(x), ")"])
50+
F(["_webIOScope.getObservableValue(", jsexpr(x), ")"])
5151
end
5252

5353
function obs_set_expr(x, val)
5454
# empty [], special case to get value from an Observable
55-
F(["WebIO.setval(", jsexpr_joined([x, val]), ")"])
55+
F(["_webIOScope.setObservableValue(", jsexpr_joined([x, val]), ")"])
5656
end
5757

5858
function jsexpr(o::AbstractObservable)

test/runtests.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ end
7777
ob = Observable{Any}(w, "test", nothing)
7878
@test @js($ob) == js"{\"name\":\"test\",\"scope\":\"testwidget2\",\"id\":\"ob_02\",\"type\":\"observable\"}"
7979

80-
@test @js($ob[]) == js"WebIO.getval({\"name\":\"test\",\"scope\":\"testwidget2\",\"id\":\"ob_02\",\"type\":\"observable\"})"
81-
@test @js($ob[] = 1) == js"WebIO.setval({\"name\":\"test\",\"scope\":\"testwidget2\",\"id\":\"ob_02\",\"type\":\"observable\"},1)"
80+
@test @js($ob[]) == js"_webIOScope.getObservableValue({\"name\":\"test\",\"scope\":\"testwidget2\",\"id\":\"ob_02\",\"type\":\"observable\"})"
81+
@test @js($ob[] = 1) == js"_webIOScope.setObservableValue({\"name\":\"test\",\"scope\":\"testwidget2\",\"id\":\"ob_02\",\"type\":\"observable\"},1)"
8282
end
8383
end

0 commit comments

Comments
 (0)