Skip to content

Commit

Permalink
’ -> ' (#9686)
Browse files Browse the repository at this point in the history
  • Loading branch information
Legend-Master committed May 7, 2024
1 parent 5ce0737 commit 5529c5a
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 32 deletions.
4 changes: 2 additions & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
## Reporting a Vulnerability

If you have found a potential security threat, vulnerability or exploit in Tauri
or one of its upstream dependencies, please DONT create a pull-request, DONT
file an issue on GitHub, DONT mention it on Discord and DONT create a forum thread.
or one of its upstream dependencies, please DON'T create a pull-request, DON'T
file an issue on GitHub, DON'T mention it on Discord and DON'T create a forum thread.

Please submit your report via the GitHub Private Vulnerability Disclosure functionality.

Expand Down
10 changes: 5 additions & 5 deletions core/tauri-runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ pub enum RunEvent<T: UserEvent> {
Ready,
/// Sent if the event loop is being resumed.
Resumed,
/// Emitted when all of the event loops input events have been processed and redraw processing is about to begin.
/// Emitted when all of the event loop's input events have been processed and redraw processing is about to begin.
///
/// This event is useful as a place to put your code that should be run after all state-changing events have been handled and you want to do stuff (updating state, performing calculations, etc) that happens as the “main body” of your event loop.
MainEventsCleared,
Expand Down Expand Up @@ -539,10 +539,10 @@ pub trait WindowDispatch<T: UserEvent>: Debug + Clone + Send + Sync + Sized + 's
/// Gets the window's current focus state.
fn is_focused(&self) -> Result<bool>;

/// Gets the windows current decoration state.
/// Gets the window's current decoration state.
fn is_decorated(&self) -> Result<bool>;

/// Gets the windows current resizable state.
/// Gets the window's current resizable state.
fn is_resizable(&self) -> Result<bool>;

/// Gets the window's native maximize button state.
Expand Down Expand Up @@ -710,10 +710,10 @@ pub trait WindowDispatch<T: UserEvent>: Debug + Clone + Send + Sync + Sized + 's
/// Resizes the window.
fn set_size(&self, size: Size) -> Result<()>;

/// Updates the window min size.
/// Updates the window min inner size.
fn set_min_size(&self, size: Option<Size>) -> Result<()>;

/// Updates the window max size.
/// Updates the window max inner size.
fn set_max_size(&self, size: Option<Size>) -> Result<()>;

/// Updates the window position.
Expand Down
2 changes: 1 addition & 1 deletion core/tauri/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ pub enum RunEvent {
Ready,
/// Sent if the event loop is being resumed.
Resumed,
/// Emitted when all of the event loops input events have been processed and redraw processing is about to begin.
/// Emitted when all of the event loop's input events have been processed and redraw processing is about to begin.
///
/// This event is useful as a place to put your code that should be run after all state-changing events have been handled and you want to do stuff (updating state, performing calculations, etc) that happens as the “main body” of your event loop.
MainEventsCleared,
Expand Down
6 changes: 3 additions & 3 deletions core/tauri/src/menu/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -448,13 +448,13 @@ pub enum NativeIcon {
Slideshow,
/// A badge for a `smart` item.
SmartBadge,
/// Small green indicator, similar to iChats available image.
/// Small green indicator, similar to iChat's available image.
StatusAvailable,
/// Small clear indicator.
StatusNone,
/// Small yellow indicator, similar to iChats idle image.
/// Small yellow indicator, similar to iChat's idle image.
StatusPartiallyAvailable,
/// Small red indicator, similar to iChats unavailable image.
/// Small red indicator, similar to iChat's unavailable image.
StatusUnavailable,
/// A stop progress template image.
StopProgressFreestanding,
Expand Down
14 changes: 7 additions & 7 deletions core/tauri/src/webview/webview_window.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1099,17 +1099,17 @@ impl<R: Runtime> WebviewWindow<R> {
self.webview.window().is_focused()
}

/// Gets the windows current decoration state.
/// Gets the window's current decoration state.
pub fn is_decorated(&self) -> crate::Result<bool> {
self.webview.window().is_decorated()
}

/// Gets the windows current resizable state.
/// Gets the window's current resizable state.
pub fn is_resizable(&self) -> crate::Result<bool> {
self.webview.window().is_resizable()
}

/// Gets the windows native maximize button state
/// Gets the window's native maximize button state
///
/// ## Platform-specific
///
Expand All @@ -1118,7 +1118,7 @@ impl<R: Runtime> WebviewWindow<R> {
self.webview.window().is_maximizable()
}

/// Gets the windows native minimize button state
/// Gets the window's native minimize button state
///
/// ## Platform-specific
///
Expand All @@ -1127,7 +1127,7 @@ impl<R: Runtime> WebviewWindow<R> {
self.webview.window().is_minimizable()
}

/// Gets the windows native close button state
/// Gets the window's native close button state
///
/// ## Platform-specific
///
Expand Down Expand Up @@ -1431,12 +1431,12 @@ impl<R: Runtime> WebviewWindow<R> {
self.webview.window().set_size(size.into())
}

/// Sets this window's minimum size.
/// Sets this window's minimum inner size.
pub fn set_min_size<S: Into<Size>>(&self, size: Option<S>) -> crate::Result<()> {
self.webview.window().set_min_size(size.map(|s| s.into()))
}

/// Sets this window's maximum size.
/// Sets this window's maximum inner size.
pub fn set_max_size<S: Into<Size>>(&self, size: Option<S>) -> crate::Result<()> {
self.webview.window().set_max_size(size.map(|s| s.into()))
}
Expand Down
14 changes: 7 additions & 7 deletions core/tauri/src/window/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1378,17 +1378,17 @@ impl<R: Runtime> Window<R> {
self.window.dispatcher.is_focused().map_err(Into::into)
}

/// Gets the windows current decoration state.
/// Gets the window's current decoration state.
pub fn is_decorated(&self) -> crate::Result<bool> {
self.window.dispatcher.is_decorated().map_err(Into::into)
}

/// Gets the windows current resizable state.
/// Gets the window's current resizable state.
pub fn is_resizable(&self) -> crate::Result<bool> {
self.window.dispatcher.is_resizable().map_err(Into::into)
}

/// Gets the windows native maximize button state
/// Gets the window's native maximize button state
///
/// ## Platform-specific
///
Expand All @@ -1397,7 +1397,7 @@ impl<R: Runtime> Window<R> {
self.window.dispatcher.is_maximizable().map_err(Into::into)
}

/// Gets the windows native minimize button state
/// Gets the window's native minimize button state
///
/// ## Platform-specific
///
Expand All @@ -1406,7 +1406,7 @@ impl<R: Runtime> Window<R> {
self.window.dispatcher.is_minimizable().map_err(Into::into)
}

/// Gets the windows native close button state
/// Gets the window's native close button state
///
/// ## Platform-specific
///
Expand Down Expand Up @@ -1821,7 +1821,7 @@ tauri::Builder::default()
.map_err(Into::into)
}

/// Sets this window's minimum size.
/// Sets this window's minimum inner size.
pub fn set_min_size<S: Into<Size>>(&self, size: Option<S>) -> crate::Result<()> {
self
.window
Expand All @@ -1830,7 +1830,7 @@ tauri::Builder::default()
.map_err(Into::into)
}

/// Sets this window's maximum size.
/// Sets this window's maximum inner size.
pub fn set_max_size<S: Into<Size>>(&self, size: Option<S>) -> crate::Result<()> {
self
.window
Expand Down
6 changes: 3 additions & 3 deletions tooling/api/src/menu/iconMenuItem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@ export enum NativeIcon {
Slideshow = 'Slideshow',
/** A badge for a `smart` item. */
SmartBadge = 'SmartBadge',
/** Small green indicator, similar to iChats available image. */
/** Small green indicator, similar to iChat's available image. */
StatusAvailable = 'StatusAvailable',
/** Small clear indicator. */
StatusNone = 'StatusNone',
/** Small yellow indicator, similar to iChats idle image. */
/** Small yellow indicator, similar to iChat's idle image. */
StatusPartiallyAvailable = 'StatusPartiallyAvailable',
/** Small red indicator, similar to iChats unavailable image. */
/** Small red indicator, similar to iChat's unavailable image. */
StatusUnavailable = 'StatusUnavailable',
/** A stop progress template image. */
StopProgressFreestanding = 'StopProgressFreestanding',
Expand Down
6 changes: 3 additions & 3 deletions tooling/api/src/window.ts
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ class Window {
}

/**
* Gets the windows native maximize button state.
* Gets the window's native maximize button state.
*
* #### Platform-specific
*
Expand All @@ -694,7 +694,7 @@ class Window {
}

/**
* Gets the windows native minimize button state.
* Gets the window's native minimize button state.
*
* #### Platform-specific
*
Expand All @@ -715,7 +715,7 @@ class Window {
}

/**
* Gets the windows native close button state.
* Gets the window's native close button state.
*
* #### Platform-specific
*
Expand Down
2 changes: 1 addition & 1 deletion tooling/bundler/src/bundle/macos/templates/dmg/bundle_dmg
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ else
| perl -pe "s/APPLICATION_CLAUSE/$APPLICATION_CLAUSE/g" \
| perl -pe "s/HIDING_CLAUSE/$HIDING_CLAUSE/" \
> "$APPLESCRIPT_FILE"
sleep 2 # pause to workaround occasional "Cant get disk" (-1728) issues
sleep 2 # pause to workaround occasional "Can't get disk" (-1728) issues
echo "Running AppleScript to make Finder stuff pretty: /usr/bin/osascript \"${APPLESCRIPT_FILE}\" \"${VOLUME_NAME}\""
if /usr/bin/osascript "${APPLESCRIPT_FILE}" "${VOLUME_NAME}"; then
# Okay, we're cool
Expand Down

0 comments on commit 5529c5a

Please sign in to comment.