Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Additional fixes to Observables #1

Merged
merged 4 commits into from
Nov 5, 2022
Merged

Additional fixes to Observables #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb56f67
Update scope.jl
MasonProtter Nov 4, 2022
0ecf658
Update Project.toml
MasonProtter Nov 4, 2022
3465791
fix whitespace
MasonProtter Nov 4, 2022
b81c58a
bump version
MasonProtter Nov 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "WebIO"
uuid = "0f1e0344-ec1d-5b48-a673-e5cf874b6c29"
license = "MIT"
version = "0.8.18"
version = "0.8.19"

[deps]
AssetRegistry = "bf4720bc-e11a-5d0c-854e-bdca1663c893"
Expand All @@ -24,7 +24,7 @@ AssetRegistry = "0.1.0"
FunctionalCollections = "0.5.0"
JSExpr = "0.5"
JSON = "0.18, 0.19, 0.20, 0.21"
Observables = "0.4, 0.5"
Observables = "0.5"
Requires = "0.4.4, 0.5, 1.0.0"
WebSockets = "1.5.0"
Widgets = "0.6.2"
Expand Down
4 changes: 2 additions & 2 deletions src/scope.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ function JSON.lower(scope::Scope)
if sync === nothing
# by default, we sync if there are any listeners
# other than the JS back edge
sync = any(f-> !isa(f, SyncCallback), listeners(ob))
sync = any(((_, f),) -> !isa(f, SyncCallback), listeners(ob))
end
obs_dict[k] = Dict(
"sync" => sync,
Expand Down Expand Up @@ -378,7 +378,7 @@ end
function ensure_sync(ctx, key)
ob = ctx.observs[key][1]
# have at most one synchronizing handler per observable
if !any(x->isa(x, SyncCallback) && x.ctx==ctx, listeners(ob))
if !any(((_, x),) ->isa(x, SyncCallback) && x.ctx==ctx, listeners(ob))
f = SyncCallback(ctx, (msg) -> send_update_observable(ctx, key, msg))
on(SyncCallback(ctx, f), ob)
end
Expand Down