From e096e10bc06be3ef140db76bae0aaf2d4fb3823b Mon Sep 17 00:00:00 2001 From: Huakun Shen Date: Thu, 9 Jan 2025 14:43:22 -0500 Subject: [PATCH] feat: enable devtools in release mode, disable right click contextmenu in release mode (#52) --- apps/desktop/src/routes/+layout.svelte | 11 +++++ .../tauri-plugins/jarvis/src/commands/dev.rs | 47 +++++++------------ 2 files changed, 27 insertions(+), 31 deletions(-) diff --git a/apps/desktop/src/routes/+layout.svelte b/apps/desktop/src/routes/+layout.svelte index dbb64de..0251e36 100644 --- a/apps/desktop/src/routes/+layout.svelte +++ b/apps/desktop/src/routes/+layout.svelte @@ -1,6 +1,17 @@ diff --git a/packages/tauri-plugins/jarvis/src/commands/dev.rs b/packages/tauri-plugins/jarvis/src/commands/dev.rs index fbdb80d..7760f64 100644 --- a/packages/tauri-plugins/jarvis/src/commands/dev.rs +++ b/packages/tauri-plugins/jarvis/src/commands/dev.rs @@ -2,54 +2,39 @@ use tauri::{Manager, Runtime}; #[tauri::command] pub fn open_devtools(window: tauri::Window) -> Result<(), String> { - #[cfg(debug_assertions)] - { - let win = window.get_webview_window(window.label()); - if let Some(win) = win { - win.open_devtools(); - } + let win = window.get_webview_window(window.label()); + if let Some(win) = win { + win.open_devtools(); } Ok(()) } #[tauri::command] pub fn close_devtools(window: tauri::Window) -> Result<(), String> { - #[cfg(debug_assertions)] - { - let win = window.get_webview_window(window.label()); - if let Some(win) = win { - win.close_devtools(); - } + let win = window.get_webview_window(window.label()); + if let Some(win) = win { + win.close_devtools(); } Ok(()) } #[tauri::command] pub fn is_devtools_open(window: tauri::Window) -> Result { - #[cfg(debug_assertions)] - { - let win = window.get_webview_window(window.label()); - if let Some(win) = win { - Ok(win.is_devtools_open()) - } else { - Err("Window not found".to_string()) - } + let win = window.get_webview_window(window.label()); + if let Some(win) = win { + Ok(win.is_devtools_open()) + } else { + Err("Window not found".to_string()) } - #[cfg(not(debug_assertions))] - Err("Devtools is not available in release mode".to_string()) } #[tauri::command] pub fn toggle_devtools(window: tauri::Window) -> Result<(), String> { - #[cfg(debug_assertions)] - { - let is_open = - is_devtools_open(window.clone()).expect("failed to check if devtools is open"); - if is_open { - close_devtools(window).expect("failed to close devtools"); - } else { - open_devtools(window).expect("failed to open devtools"); - } + let is_open = is_devtools_open(window.clone()).expect("failed to check if devtools is open"); + if is_open { + close_devtools(window).expect("failed to close devtools"); + } else { + open_devtools(window).expect("failed to open devtools"); } Ok(()) }