diff --git a/plume-front/src/editor.rs b/plume-front/src/editor.rs index 06e45cc4..155cf60b 100644 --- a/plume-front/src/editor.rs +++ b/plume-front/src/editor.rs @@ -1,12 +1,12 @@ -use crate::CATALOG; +use crate::{document, CATALOG}; use js_sys::{encode_uri_component, Date, RegExp}; use serde_derive::{Deserialize, Serialize}; use std::{convert::TryInto, sync::Mutex}; use wasm_bindgen::{prelude::*, JsCast, JsValue}; use web_sys::{ - console, window, ClipboardEvent, Document, Element, Event, FocusEvent, HtmlAnchorElement, - HtmlDocument, HtmlElement, HtmlFormElement, HtmlInputElement, HtmlSelectElement, - HtmlTextAreaElement, KeyboardEvent, MouseEvent, Node, + console, window, ClipboardEvent, Element, Event, FocusEvent, HtmlAnchorElement, HtmlDocument, + HtmlElement, HtmlFormElement, HtmlInputElement, HtmlSelectElement, HtmlTextAreaElement, + KeyboardEvent, MouseEvent, Node, }; macro_rules! mv { @@ -18,10 +18,6 @@ macro_rules! mv { } } -fn document() -> Document { - window().unwrap().document().unwrap() -} - fn get_elt_value(id: &'static str) -> String { let elt = document().get_element_by_id(id).unwrap(); let inp: Option<&HtmlInputElement> = elt.dyn_ref(); diff --git a/plume-front/src/lib.rs b/plume-front/src/lib.rs index 94bf5d26..7b48806a 100755 --- a/plume-front/src/lib.rs +++ b/plume-front/src/lib.rs @@ -7,7 +7,7 @@ extern crate gettext_macros; extern crate lazy_static; use wasm_bindgen::{prelude::*, JsCast}; -use web_sys::{console, window, Element, Event, HtmlInputElement, TouchEvent}; +use web_sys::{console, window, Document, Element, Event, HtmlInputElement, TouchEvent}; init_i18n!( "plume-front", @@ -163,3 +163,7 @@ fn search() { normalize_query.forget(); } } + +fn document() -> Document { + window().unwrap().document().unwrap() +}