fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-03-28 07:51:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #924 from alexcrichton/no-closure-new

Browse Source 
Switch `Closure::new` to `wrap` in paint example
This commit is contained in:
Alex Crichton 2018-10-03 10:38:39 -07:00 committed by GitHub
commit b7f1f9c086
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/paint/Cargo.toml
View File

@ -8,7 +8,7 @@ crate-type = ["cdylib"]
[dependencies] [dependencies]
js-sys = { path = "../../crates/js-sys" } js-sys = { path = "../../crates/js-sys" }
wasm-bindgen = { path = "../..", features = ["nightly"] } wasm-bindgen = { path = "../.." }
[dependencies.web-sys] [dependencies.web-sys]
path = "../../crates/web-sys" path = "../../crates/web-sys"

12
examples/paint/src/lib.rs
View File

@ -36,11 +36,11 @@ pub fn main() {
{ {
let context = context.clone(); let context = context.clone();
let pressed = pressed.clone(); let pressed = pressed.clone();
let closure: Closure<FnMut(_)> = Closure::new(move |event: web_sys::MouseEvent| { let closure = Closure::wrap(Box::new(move |event: web_sys::MouseEvent| {
context.begin_path(); context.begin_path();
context.move_to(event.offset_x() as f64, event.offset_y() as f64); context.move_to(event.offset_x() as f64, event.offset_y() as f64);
pressed.set(true); pressed.set(true);
}); }) as Box<FnMut(_)>);
(canvas.as_ref() as &web_sys::EventTarget) (canvas.as_ref() as &web_sys::EventTarget)
.add_event_listener_with_callback("mousedown", closure.as_ref().unchecked_ref()) .add_event_listener_with_callback("mousedown", closure.as_ref().unchecked_ref())
.unwrap(); .unwrap();
@ -49,14 +49,14 @@ pub fn main() {
{ {
let context = context.clone(); let context = context.clone();
let pressed = pressed.clone(); let pressed = pressed.clone();
let closure: Closure<FnMut(_)> = Closure::new(move |event: web_sys::MouseEvent| { let closure = Closure::wrap(Box::new(move |event: web_sys::MouseEvent| {
if pressed.get() { if pressed.get() {
context.line_to(event.offset_x() as f64, event.offset_y() as f64); context.line_to(event.offset_x() as f64, event.offset_y() as f64);
context.stroke(); context.stroke();
context.begin_path(); context.begin_path();
context.move_to(event.offset_x() as f64, event.offset_y() as f64); context.move_to(event.offset_x() as f64, event.offset_y() as f64);
} }
}); }) as Box<FnMut(_)>);
(canvas.as_ref() as &web_sys::EventTarget) (canvas.as_ref() as &web_sys::EventTarget)
.add_event_listener_with_callback("mousemove", closure.as_ref().unchecked_ref()) .add_event_listener_with_callback("mousemove", closure.as_ref().unchecked_ref())
.unwrap(); .unwrap();
@ -65,11 +65,11 @@ pub fn main() {
{ {
let context = context.clone(); let context = context.clone();
let pressed = pressed.clone(); let pressed = pressed.clone();
let closure: Closure<FnMut(_)> = Closure::new(move |event: web_sys::MouseEvent| { let closure = Closure::wrap(Box::new(move |event: web_sys::MouseEvent| {
pressed.set(false); pressed.set(false);
context.line_to(event.offset_x() as f64, event.offset_y() as f64); context.line_to(event.offset_x() as f64, event.offset_y() as f64);
context.stroke(); context.stroke();
}); }) as Box<FnMut(_)>);
(canvas.as_ref() as &web_sys::EventTarget) (canvas.as_ref() as &web_sys::EventTarget)
.add_event_listener_with_callback("mouseup", closure.as_ref().unchecked_ref()) .add_event_listener_with_callback("mouseup", closure.as_ref().unchecked_ref())
.unwrap(); .unwrap();