aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Run cargo fmt on plume-front (#515)

Browse Source 
When `editor-improvements` was merged it was not run, because Travis was still used, but now it makes Circle CI fail on master.
This commit is contained in:
Baptiste Gelez 2019-04-06 18:57:25 +01:00 committed by GitHub
parent 12c2078c89
commit 1bc2684af1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 66 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
plume-front/src/editor.rs
View File

@ -106,12 +106,14 @@ pub fn init() -> Result<(), EditorError> {
if let Some(editor) = document().get_element_by_id("plume-fallback-editor") { if let Some(editor) = document().get_element_by_id("plume-fallback-editor") {
if let Ok(Some(title_label)) = document().query_selector("label[for=title]") { if let Ok(Some(title_label)) = document().query_selector("label[for=title]") {
let editor_button = document().create_element("a")?; let editor_button = document().create_element("a")?;
js!{ @{&editor_button}.href = "#"; } js! { @{&editor_button}.href = "#"; }
editor_button.add_event_listener(|_: ClickEvent| { editor_button.add_event_listener(|_: ClickEvent| {
window().local_storage().remove("basic-editor"); window().local_storage().remove("basic-editor");
window().history().go(0).ok(); // refresh window().history().go(0).ok(); // refresh
}); });
editor_button.append_child(&document().create_text_node(&i18n!(CATALOG, "Open the rich text editor"))); editor_button.append_child(
&document().create_text_node(&i18n!(CATALOG, "Open the rich text editor")),
);
editor.insert_before(&editor_button, &title_label).ok(); editor.insert_before(&editor_button, &title_label).ok();
return Ok(()); return Ok(());
} }
@ -170,7 +172,8 @@ fn init_editor() -> Result<(), EditorError> {
}), 0); }), 0);
})); }));
document().get_element_by_id("publish")?.add_event_listener(mv!(title, subtitle, content, old_ed => move |_: ClickEvent| { document().get_element_by_id("publish")?.add_event_listener(
mv!(title, subtitle, content, old_ed => move |_: ClickEvent| {
let popup = document().get_element_by_id("publish-popup").or_else(|| let popup = document().get_element_by_id("publish-popup").or_else(||
init_popup(&title, &subtitle, &content, &old_ed).ok() init_popup(&title, &subtitle, &content, &old_ed).ok()
).unwrap(); ).unwrap();
@ -180,7 +183,8 @@ fn init_editor() -> Result<(), EditorError> {
popup.class_list().add("show").unwrap(); popup.class_list().add("show").unwrap();
bg.class_list().add("show").unwrap(); bg.class_list().add("show").unwrap();
})); }),
);
show_errors(); show_errors();
setup_close_button(); setup_close_button();
@ -191,7 +195,10 @@ fn init_editor() -> Result<(), EditorError> {
fn setup_close_button() { fn setup_close_button() {
if let Some(button) = document().get_element_by_id("close-editor") { if let Some(button) = document().get_element_by_id("close-editor") {
button.add_event_listener(|_: ClickEvent| { button.add_event_listener(|_: ClickEvent| {
window().local_storage().insert("basic-editor", "true").unwrap(); window()
.local_storage()
.insert("basic-editor", "true")
.unwrap();
window().history().go(0).unwrap(); // Refresh the page window().history().go(0).unwrap(); // Refresh the page
}); });
} }
@ -202,10 +209,18 @@ fn show_errors() {
let list = document().create_element("header").unwrap(); let list = document().create_element("header").unwrap();
list.class_list().add("messages").unwrap(); list.class_list().add("messages").unwrap();
for error in document().query_selector_all("p.error").unwrap() { for error in document().query_selector_all("p.error").unwrap() {
error.parent_element().unwrap().remove_child(&error).unwrap(); error
.parent_element()
.unwrap()
.remove_child(&error)
.unwrap();
list.append_child(&error); list.append_child(&error);
} }
header.parent_element().unwrap().insert_before(&list, &header.next_sibling().unwrap()).unwrap(); header
.parent_element()
.unwrap()
.insert_before(&list, &header.next_sibling().unwrap())
.unwrap();
} }
} }
@ -241,7 +256,7 @@ fn init_popup(
draft_label.set_attribute("for", "popup-draft")?; draft_label.set_attribute("for", "popup-draft")?;
let draft = document().create_element("input").unwrap(); let draft = document().create_element("input").unwrap();
js!{ js! {
@{&draft}.id = "popup-draft"; @{&draft}.id = "popup-draft";
@{&draft}.name = "popup-draft"; @{&draft}.name = "popup-draft";
@{&draft}.type = "checkbox"; @{&draft}.type = "checkbox";
@ -259,7 +274,8 @@ fn init_popup(
@{&button}.value = @{i18n!(CATALOG, "Publish")}; @{&button}.value = @{i18n!(CATALOG, "Publish")};
}; };
button.append_child(&document().create_text_node(&i18n!(CATALOG, "Publish"))); button.append_child(&document().create_text_node(&i18n!(CATALOG, "Publish")));
button.add_event_listener(mv!(title, subtitle, content, old_ed => move |_: ClickEvent| { button.add_event_listener(
mv!(title, subtitle, content, old_ed => move |_: ClickEvent| {
title.focus(); // Remove the placeholder before publishing title.focus(); // Remove the placeholder before publishing
set_value("title", title.inner_text()); set_value("title", title.inner_text());
subtitle.focus(); subtitle.focus();
@ -292,7 +308,8 @@ fn init_popup(
js! { js! {
@{&old_ed}.submit(); @{&old_ed}.submit();
}; };
})); }),
);
popup.append_child(&button); popup.append_child(&button);
document().body()?.append_child(&popup); document().body()?.append_child(&popup);