Skip to content

Commit

Permalink
fix: some typos (#4403)
Browse files Browse the repository at this point in the history
Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
  • Loading branch information
yutotnh and lucasfernog committed Jun 19, 2022
1 parent 6d94ce4 commit cbceb7d
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 18 deletions.
5 changes: 5 additions & 0 deletions .changes/fix-allowlist-error-check.md
@@ -0,0 +1,5 @@
---
"tauri": patch
---

Fixes the error message when using the `window.unminimize` API without enabling it in the allowlist.
8 changes: 4 additions & 4 deletions README.md
Expand Up @@ -42,7 +42,7 @@ If you are interested in making a tauri app, please visit the [documentation web

### App Bundles
- [x] App Icons
- [x] Build on MacOS (.app, .dmg)
- [x] Build on macOS (.app, .dmg)
- [x] Build on Linux (.deb, AppImage)
- [x] Build on Windows (.exe, .msi)
- [x] Copy Buffer
Expand Down Expand Up @@ -88,7 +88,7 @@ If you are interested in making a tauri app, please visit the [documentation web
| Auto Updater | Yes | Yes<sup>1</sup> |
| Custom App Icon | Yes | Yes |
| Windows Binary | Yes | Yes |
| MacOS Binary | Yes | Yes |
| macOS Binary | Yes | Yes |
| Linux Binary | Yes | Yes |
| iOS Binary | Soon | No |
| Android Binary | Soon | No |
Expand All @@ -108,15 +108,15 @@ Tauri is a system composed of a number of moving pieces:
- GitHub actions for CI and CD
- Discord for discussions
- Netlify-hosted documentation website
- DigitalOcean meilisearch instance
- DigitalOcean Meilisearch instance

### Major Runtimes
- Node.js for running the CLI (deno and pure rust are on the roadmap)
- Cargo for testing, running the dev service, building binaries and as the runtime harness for the webview

### Major Languages
- Rust for the CLI
- EcmaScript bindings to the Rust API, written in typescript
- ECMAScript bindings to the Rust API, written in typescript
- Rust for bindings, rust side of the API, harnesses
- Rust plugins to Tauri backend

Expand Down
2 changes: 1 addition & 1 deletion core/tauri-build/src/lib.rs
Expand Up @@ -118,7 +118,7 @@ impl WindowsAttributes {
self
}

/// Sets the sdk dir for windows. Currently only used on Windows. This must be a vaild UTF-8
/// Sets the sdk dir for windows. Currently only used on Windows. This must be a valid UTF-8
/// path. Defaults to whatever the `winres` crate determines is best.
#[must_use]
pub fn sdk_dir<P: AsRef<Path>>(mut self, sdk_dir: P) -> Self {
Expand Down
2 changes: 1 addition & 1 deletion core/tauri-runtime-wry/src/lib.rs
Expand Up @@ -1297,7 +1297,7 @@ impl<T: UserEvent> Dispatch<T> for WryDispatcher<T> {
window_getter!(self, WindowMessage::Theme)
}

/// Returns the `ApplicatonWindow` from gtk crate that is used by this window.
/// Returns the `ApplicationWindow` from gtk crate that is used by this window.
#[cfg(any(
target_os = "linux",
target_os = "dragonfly",
Expand Down
6 changes: 3 additions & 3 deletions core/tauri-runtime/src/lib.rs
Expand Up @@ -357,7 +357,7 @@ pub trait Dispatch<T: UserEvent>: Debug + Clone + Send + Sync + Sized + 'static
/// The runtime this [`Dispatch`] runs under.
type Runtime: Runtime<T>;

/// The winoow builder type.
/// The window builder type.
type WindowBuilder: WindowBuilder;

/// Run a task on the main thread.
Expand Down Expand Up @@ -414,7 +414,7 @@ pub trait Dispatch<T: UserEvent>: Debug + Clone + Send + Sync + Sized + 'static
/// Gets the window’s current resizable state.
fn is_resizable(&self) -> Result<bool>;

/// Gets the window's current vibility state.
/// Gets the window's current visibility state.
fn is_visible(&self) -> Result<bool>;

/// Gets the window menu current visibility state.
Expand All @@ -441,7 +441,7 @@ pub trait Dispatch<T: UserEvent>: Debug + Clone + Send + Sync + Sized + 'static
#[cfg(target_os = "macos")]
fn ns_window(&self) -> Result<*mut std::ffi::c_void>;

/// Returns the `ApplicatonWindow` from gtk crate that is used by this window.
/// Returns the `ApplicationWindow` from gtk crate that is used by this window.
#[cfg(any(
target_os = "linux",
target_os = "dragonfly",
Expand Down
2 changes: 1 addition & 1 deletion core/tauri/src/api/ipc.rs
Expand Up @@ -279,7 +279,7 @@ mod test {
assert_eq!(escape_single_quoted_json_test, result);
}

// check abritrary strings in the format callback function
// check arbitrary strings in the format callback function
#[quickcheck]
fn qc_formating(f: CallbackFn, a: String) -> bool {
// call format callback
Expand Down
4 changes: 2 additions & 2 deletions core/tauri/src/async_runtime.rs
Expand Up @@ -7,7 +7,7 @@
//! Tauri uses [`tokio`] Runtime to initialize code, such as
//! [`Plugin::initialize`](../plugin/trait.Plugin.html#method.initialize) and [`crate::Builder::setup`] hooks.
//! This module also re-export some common items most developers need from [`tokio`]. If there's
//! one you need isn't here, you could use types in [`tokio`] dierectly.
//! one you need isn't here, you could use types in [`tokio`] directly.
//! For custom command handlers, it's recommended to use a plain `async fn` command.

use futures_lite::future::FutureExt;
Expand Down Expand Up @@ -215,7 +215,7 @@ fn default_runtime() -> GlobalRuntime {
}

/// Sets the runtime to use to execute asynchronous tasks.
/// For convinience, this method takes a [`TokioHandle`].
/// For convenience, this method takes a [`TokioHandle`].
/// Note that you cannot drop the underlying [`TokioRuntime`].
///
/// # Examples
Expand Down
2 changes: 1 addition & 1 deletion core/tauri/src/endpoints/window.rs
Expand Up @@ -154,7 +154,7 @@ pub fn into_allowlist_error(variant: &str) -> crate::Error {
crate::Error::ApiNotAllowlisted("window > maximize and window > unmaximize".to_string())
}
"minimize" => crate::Error::ApiNotAllowlisted("window > minimize".to_string()),
"nnminimize" => crate::Error::ApiNotAllowlisted("window > unminimize".to_string()),
"unminimize" => crate::Error::ApiNotAllowlisted("window > unminimize".to_string()),
"show" => crate::Error::ApiNotAllowlisted("window > show".to_string()),
"hide" => crate::Error::ApiNotAllowlisted("window > hide".to_string()),
"close" => crate::Error::ApiNotAllowlisted("window > close".to_string()),
Expand Down
4 changes: 2 additions & 2 deletions core/tauri/src/updater/core.rs
Expand Up @@ -364,10 +364,10 @@ impl<R: Runtime> UpdateBuilder<R> {
// replace {{current_version}}, {{target}} and {{arch}} in the provided URL
// this is usefull if we need to query example
// https://releases.myapp.com/update/{{target}}/{{arch}}/{{current_version}}
// will be transleted into ->
// will be translated into ->
// https://releases.myapp.com/update/darwin/aarch64/1.0.0
// The main objective is if the update URL is defined via the Cargo.toml
// the URL will be generated dynamicly
// the URL will be generated dynamically
let fixed_link = url
.replace("{{current_version}}", &self.current_version.to_string())
.replace("{{target}}", &target)
Expand Down
2 changes: 1 addition & 1 deletion tooling/bundler/src/bundle/common.rs
Expand Up @@ -13,7 +13,7 @@ use std::{
sync::{Arc, Mutex},
};

/// Returns true if the path has a filename indicating that it is a high-desity
/// Returns true if the path has a filename indicating that it is a high-density
/// "retina" icon. Specifically, returns true the the file stem ends with
/// "@2x" (a convention specified by the [Apple developer docs](
/// https://developer.apple.com/library/mac/documentation/GraphicsAnimation/Conceptual/HighResolutionOSX/Optimizing/Optimizing.html)).
Expand Down
2 changes: 1 addition & 1 deletion tooling/bundler/src/bundle/macos/app.rs
Expand Up @@ -9,7 +9,7 @@
// Info.plist # An xml file containing the app's metadata
// MacOS # A directory to hold executable binary files
// foobar # The main binary executable of the app
// foobar_helper # A helper application, possibly provitidng a CLI
// foobar_helper # A helper application, possibly providing a CLI
// Resources # Data files such as images, sounds, translations and nib files
// en.lproj # Folder containing english translation strings/data
// Frameworks # A directory containing private frameworks (shared libraries)
Expand Down
2 changes: 1 addition & 1 deletion tooling/bundler/src/bundle/windows/msi/wix.rs
Expand Up @@ -30,7 +30,7 @@ pub const WIX_URL: &str =
"https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip";
pub const WIX_SHA256: &str = "2c1888d5d1dba377fc7fa14444cf556963747ff9a0a289a3599cf09da03b9e2e";

// For Cross Platform Complilation.
// For Cross Platform Compilation.

// const VC_REDIST_X86_URL: &str =
// "https://download.visualstudio.microsoft.com/download/pr/c8edbb87-c7ec-4500-a461-71e8912d25e9/99ba493d660597490cbb8b3211d2cae4/vc_redist.x86.exe";
Expand Down

0 comments on commit cbceb7d

Please sign in to comment.