fix init script

pull/427/head
amrbashir 2 years ago
parent e2295c7db5
commit ddf982ae05
No known key found for this signature in database
GPG Key ID: BBD7A47A2003FF33

@ -11,8 +11,8 @@
declare global {
interface Window {
__TAURI_INVOKE__: <T>(cmd: string, args?: unknown) => Promise<T>;
__TAURI_OS__: {
EOL: string;
__TAURI__: {
os: { __eol: string };
};
}
}
@ -52,7 +52,7 @@ type Arch =
* @since 2.0.0
* */
function eol() {
return window.__TAURI_OS__.EOL;
return window.__TAURI__.os.__eol;
}
/**

@ -1 +1 @@
if("__TAURI__"in window){var __TAURI_OS__=function(n){"use strict";return n.arch=async function(){return window.__TAURI_INVOKE__("plugin:os|arch")},n.eol=function(){return window.__TAURI_OS__.EOL},n.exeExtension=async function(){return window.__TAURI_INVOKE__("plugin:os|exe_extension")},n.family=async function(){return window.__TAURI_INVOKE__("plugin:os|family")},n.hostname=async function(){return window.__TAURI_INVOKE__("plugin:os|hostname")},n.locale=async function(){return window.__TAURI_INVOKE__("plugin:os|locale")},n.platform=async function(){return window.__TAURI_INVOKE__("plugin:os|platform")},n.type=async function(){return window.__TAURI_INVOKE__("plugin:os|os_type")},n.version=async function(){return window.__TAURI_INVOKE__("plugin:os|version")},n}({});Object.defineProperty(window.__TAURI__,"os",{value:__TAURI_OS__})}
if("__TAURI__"in window){var __TAURI_OS__=function(n){"use strict";return n.arch=async function(){return window.__TAURI_INVOKE__("plugin:os|arch")},n.eol=function(){return window.__TAURI__.os.__eol},n.exeExtension=async function(){return window.__TAURI_INVOKE__("plugin:os|exe_extension")},n.family=async function(){return window.__TAURI_INVOKE__("plugin:os|family")},n.hostname=async function(){return window.__TAURI_INVOKE__("plugin:os|hostname")},n.locale=async function(){return window.__TAURI_INVOKE__("plugin:os|locale")},n.platform=async function(){return window.__TAURI_INVOKE__("plugin:os|platform")},n.type=async function(){return window.__TAURI_INVOKE__("plugin:os|os_type")},n.version=async function(){return window.__TAURI_INVOKE__("plugin:os|version")},n}({});Object.defineProperty(window.__TAURI__,"os",{value:__TAURI_OS__})}

@ -0,0 +1,9 @@
// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
// SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT
if (!("os" in window.__TAURI__)) {
window.__TAURI__.os = {};
}
window.__TAURI__.os.__eol = __TEMPLATE_eol__;

@ -97,7 +97,7 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
let eol = "\r\n";
#[cfg(not(windows))]
let eol = "\n";
init_script.push_str(&format!("window.__TAURI_OS__.EOL = '{eol}';"));
init_script.push_str(&include_str!("init.js").replace("__TEMPLATE_eol__", eol));
Builder::new("os")
.js_init_script(init_script)

Loading…
Cancel
Save