Skip to content

Stop appending canvas to document in web platform #1089

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

Merged
goddessfreya merged 3 commits into from
Aug 8, 2019
Merged

Stop appending canvas to document in web platform #1089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b83c00
Stop appending canvas to document in web platform
hecrj Aug 2, 2019
9910297
Remove `tabindex` TODO in web backend
hecrj Aug 2, 2019
88e2d87
Return `OsError` instead of panicking on web canvas creation
hecrj Aug 2, 2019
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
13 changes: 6 additions & 7 deletions src/platform_impl/web/stdweb/canvas.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,14 @@ impl Canvas {
.try_into()
.map_err(|_| os_error!(OsError("Failed to create canvas element".to_owned())))?;

document()
.body()
.ok_or_else(|| os_error!(OsError("Failed to find body node".to_owned())))?
.append_child(&canvas);

// TODO: Set up unique ids
// A tabindex is needed in order to capture local keyboard events.
// A "0" value means that the element should be focusable in
// sequential keyboard navigation, but its order is defined by the
// document's source order.
// https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/tabindex
canvas
.set_attribute("tabindex", "0")
.expect("Failed to set a tabindex");
.map_err(|_| os_error!(OsError("Failed to set a tabindex".to_owned())))?;

Ok(Canvas {
raw: canvas,
Expand Down
22 changes: 12 additions & 10 deletions src/platform_impl/web/web_sys/canvas.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,26 @@ impl Canvas {
where
F: 'static + Fn(),
{
let window = web_sys::window().expect("Failed to obtain window");
let document = window.document().expect("Failed to obtain document");
let window =
web_sys::window().ok_or(os_error!(OsError("Failed to obtain window".to_owned())))?;

let document = window
.document()
.ok_or(os_error!(OsError("Failed to obtain document".to_owned())))?;

let canvas: HtmlCanvasElement = document
.create_element("canvas")
.map_err(|_| os_error!(OsError("Failed to create canvas element".to_owned())))?
.unchecked_into();

document
.body()
.ok_or_else(|| os_error!(OsError("Failed to find body node".to_owned())))?
.append_child(&canvas)
.map_err(|_| os_error!(OsError("Failed to append canvas".to_owned())))?;

// TODO: Set up unique ids
// A tabindex is needed in order to capture local keyboard events.
// A "0" value means that the element should be focusable in
// sequential keyboard navigation, but its order is defined by the
// document's source order.
// https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/tabindex
canvas
.set_attribute("tabindex", "0")
.expect("Failed to set a tabindex");
.map_err(|_| os_error!(OsError("Failed to set a tabindex".to_owned())))?;

Ok(Canvas {
raw: canvas,
Expand Down