fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-29 23:38:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make tool settings JSON errors safer

Browse Source
This commit is contained in:
Henry Sloan
2021-07-20 18:34:35 -04:00
parent 5edfa418d2
commit 607ac60483
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/web/wasm/src/document.rs
+7 -5
View File
@@ -27,11 +27,13 @@ pub fn select_tool(tool: String) -> Result<(), JsValue> {
/// Update the settings for a given tool /// Update the settings for a given tool
#[wasm_bindgen] #[wasm_bindgen]
pub fn set_tool_settings(tool: String, settings: &JsValue) -> Result<(), JsValue> { pub fn set_tool_settings(tool: String, settings: &JsValue) -> Result<(), JsValue> {
let settings: ToolSettings = settings.into_serde().expect("Invalid JSON for ToolSettings"); match settings.into_serde::<ToolSettings>() {
EDITOR_STATE.with(|editor| match translate_tool(&tool) { Ok(settings) => EDITOR_STATE.with(|editor| match translate_tool(&tool) {
Some(tool) => editor.borrow_mut().handle_message(ToolMessage::SetToolSettings(tool, settings)).map_err(convert_error), Some(tool) => editor.borrow_mut().handle_message(ToolMessage::SetToolSettings(tool, settings)).map_err(convert_error),
None => Err(Error::new(&format!("Couldn't select {} because it was not recognized as a valid tool", tool)).into()), None => Err(Error::new(&format!("Couldn't select {} because it was not recognized as a valid tool", tool)).into()),
}) }),
Err(err) => Err(Error::new(&format!("Invalud JSON for ToolSettings: {}", err)).into()),
}
} }
#[wasm_bindgen] #[wasm_bindgen]