refactor: use Phoenix.isNativeApp instead of Phoenix.browser.isTauri

Author: abose

src/assets/new-project/assets/js/new-project-from-url.js

@@ -165,7 +165,7 @@ function _setupNavigation() {
 
 function initNewProjectFromURL() {
     _setupNavigation();
-    if(window.parent.Phoenix.browser.isTauri){ // desktop builds
+    if(window.parent.Phoenix.isNativeApp){ // desktop builds
         projectLocation = newProjectExtension.getLocalProjectsPath();
         projectName = PARAM_SUGGESTED_NAME;
         $(document.getElementById("createProjectBtn")).addClass("forced-inVisible");

src/brackets.js

@@ -421,7 +421,7 @@ define(function (require, exports, module) {
         // Add the platform (mac, win or linux) to the body tag so we can have platform-specific CSS rules
         const $body = $("body");
         $body.addClass("platform-" + brackets.platform);
-        if(Phoenix.browser.isTauri){
+        if(Phoenix.isNativeApp){
             $body.addClass("tauri");
         }
 

src/command/DefaultMenus.js

@@ -63,8 +63,8 @@ define(function (require, exports, module) {
         }
     }
 
-    const isBrowser = !Phoenix.browser.isTauri;
-    const isDesktop = Phoenix.browser.isTauri;
+    const isBrowser = !Phoenix.isNativeApp;
+    const isDesktop = Phoenix.isNativeApp;
     const fileNewShortcut = isDesktop ? "Ctrl-N" : ""; // Ctrl-1 universal shortcut is set in keyboard.json
     //`Ctrl-Shift-N` - desktop only. In browser, use can do `ctrl-T` and type phcode.dev using browser shortcuts itself. So we dont make a browser shortcut for this.
     const fileNewWindowShortcut = isDesktop ? "Ctrl-Shift-N" : "";
@@ -113,7 +113,7 @@ define(function (require, exports, module) {
         menu.addMenuItem(Commands.FILE_NEW_FOLDER);
         menu.addMenuItem(Commands.FILE_NEW_WINDOW, fileNewWindowShortcut);
         menu.addMenuDivider();
-        if(Phoenix.browser.isTauri){
+        if(Phoenix.isNativeApp){
             menu.addMenuItem(Commands.FILE_OPEN, openFileShortcut);
         }
         menu.addMenuItem(Commands.FILE_OPEN_FOLDER, openFolderShortcut);
@@ -130,7 +130,7 @@ define(function (require, exports, module) {
         // menu.addMenuItem(Commands.FILE_PROJECT_SETTINGS); not yet available in phoenix
         menu.addMenuDivider();
         menu.addMenuItem(Commands.FILE_EXTENSION_MANAGER);
-        if(Phoenix.browser.isTauri){
+        if(Phoenix.isNativeApp){
             menu.addMenuDivider();
             menu.addMenuItem(Commands.FILE_QUIT);
         }
@@ -146,7 +146,7 @@ define(function (require, exports, module) {
         // TODO: add js handlers for copy and paste using browser standards.
         menu.addMenuItem(Commands.EDIT_CUT);
         menu.addMenuItem(Commands.EDIT_COPY);
-        if(window.Phoenix.browser.isTauri || !window.Phoenix.browser.desktop.isFirefox){
+        if(window.Phoenix.isNativeApp || !window.Phoenix.browser.desktop.isFirefox){
             menu.addMenuItem(Commands.EDIT_PASTE);
         }
         menu.addMenuDivider();
@@ -288,7 +288,7 @@ define(function (require, exports, module) {
         var workingset_cmenu = Menus.registerContextMenu(Menus.ContextMenuIds.WORKING_SET_CONTEXT_MENU);
         workingset_cmenu.addMenuItem(Commands.FILE_SAVE);
         workingset_cmenu.addMenuItem(Commands.NAVIGATE_SHOW_IN_FILE_TREE);
-        if(Phoenix.browser.isTauri){
+        if(Phoenix.isNativeApp){
             workingset_cmenu.addMenuItem(Commands.NAVIGATE_SHOW_IN_OS);
         }
         workingset_cmenu.addMenuDivider();
@@ -322,7 +322,7 @@ define(function (require, exports, module) {
         var project_cmenu = Menus.registerContextMenu(Menus.ContextMenuIds.PROJECT_MENU);
         project_cmenu.addMenuItem(Commands.FILE_NEW);
         project_cmenu.addMenuItem(Commands.FILE_NEW_FOLDER);
-        if(Phoenix.browser.isTauri){
+        if(Phoenix.isNativeApp){
             project_cmenu.addMenuItem(Commands.NAVIGATE_SHOW_IN_OS);
         }
         project_cmenu.addMenuDivider();
@@ -352,7 +352,7 @@ define(function (require, exports, module) {
         editor_cmenu.addMenuDivider();
         editor_cmenu.addMenuItem(Commands.EDIT_CUT);
         editor_cmenu.addMenuItem(Commands.EDIT_COPY);
-        if(window.Phoenix.browser.isTauri || !window.Phoenix.browser.desktop.isFirefox){
+        if(window.Phoenix.isNativeApp || !window.Phoenix.browser.desktop.isFirefox){
             editor_cmenu.addMenuItem(Commands.EDIT_PASTE);
         }
         editor_cmenu.addMenuDivider();

src/document/DocumentCommandHandlers.js

@@ -2118,7 +2118,7 @@ define(function (require, exports, module) {
 
     let isTestWindow = (new window.URLSearchParams(window.location.search || "")).get("testEnvironment");
     if (!isTestWindow) {
-        if(Phoenix.browser.isTauri) {
+        if(Phoenix.isNativeApp) {
             attachTauriUnloadHandler();
         } else {
             attachBrowserUnloadHandler();

src/extensibility/ExtensionManagerView.js

@@ -514,7 +514,7 @@ define(function (require, exports, module) {
                 // save to metric id as it is from public extension store.
                 Metrics.countEvent(Metrics.EVENT_TYPE.EXTENSIONS, "update", id);
                 InstallExtensionDialog.updateUsingDialog(url).done((installResult)=>{
-                    if(Phoenix.browser.isTauri) {
+                    if(Phoenix.isNativeApp) {
                         // in tauri, due to browser cache for asset urls, updates to extensions will still load old
                         // extension through the http cache. So we show a restart app for the update to take effect
                         // message.

src/extensions/default/DebugCommands/main.js

@@ -800,7 +800,7 @@ define(function (require, exports, module) {
     });
     debugMenu.addMenuDivider();
     // Show Developer Tools (optionally enabled)
-    if(Phoenix.browser.isTauri){
+    if(Phoenix.isNativeApp){
         CommandManager.register(Strings.CMD_SHOW_DEV_TOOLS, DEBUG_SHOW_DEVELOPER_TOOLS, _handleShowDeveloperTools);
         debugMenu.addMenuItem(DEBUG_SHOW_DEVELOPER_TOOLS, KeyboardPrefs.showDeveloperTools);
     }
@@ -827,13 +827,13 @@ define(function (require, exports, module) {
     CommandManager.get(DEBUG_UNLOAD_CURRENT_EXTENSION)
         .setEnabled(extensionDevelopment.isProjectLoadedAsExtension());
     CommandManager.get(DEBUG_OPEN_EXTENSION_FOLDER)
-        .setEnabled(Phoenix.browser.isTauri); // only show in tauri
+        .setEnabled(Phoenix.isNativeApp); // only show in tauri
     CommandManager.get(DEBUG_ENABLE_PHNODE_INSPECTOR)
-        .setEnabled(Phoenix.browser.isTauri); // only show in tauri
+        .setEnabled(Phoenix.isNativeApp); // only show in tauri
     CommandManager.get(DEBUG_GET_PHNODE_INSPECTOR_URL)
-        .setEnabled(Phoenix.browser.isTauri); // only show in tauri
+        .setEnabled(Phoenix.isNativeApp); // only show in tauri
     CommandManager.get(DEBUG_OPEN_VIRTUAL_SERVER)
-        .setEnabled(!Phoenix.browser.isTauri); // don't show in tauri as there is no virtual server in tauri
+        .setEnabled(!Phoenix.isNativeApp); // don't show in tauri as there is no virtual server in tauri
 
     _updateLogToConsoleMenuItemChecked();
 

src/extensions/default/HealthData/SendToAnalytics.js

@@ -115,7 +115,7 @@ define(function (require, exports, module) {
         Metrics.countEvent(PLATFORM, "languageOS", brackets.app.language);
         Metrics.countEvent(PLATFORM, "languageBrackets", brackets.getLocale());
         Metrics.countEvent(PLATFORM, "bracketsVersion", brackets.metadata.version);
-        if(Phoenix.platform === "linux" && Phoenix.browser.isTauri) {
+        if(Phoenix.platform === "linux" && Phoenix.isNativeApp) {
             NodeUtils.getLinuxOSFlavorName()
                 .then(flavor=>{
                     if(flavor){
@@ -160,7 +160,7 @@ define(function (require, exports, module) {
         Metrics.valueEvent(PERFORMANCE, "startup", "PhStore", PhStore._storageBootstrapTime);
         _bugsnagPerformance("PhStore",
             PhStore._storageBootstrapTime); // expensive api, use sparsely
-        if(Phoenix.browser.isTauri) {
+        if(Phoenix.isNativeApp) {
             Metrics.valueEvent(PERFORMANCE, "startup", "tauriBoot", window._tauriBootVars.bootstrapTime);
             _bugsnagPerformance("tauriBootVars",
                 window._tauriBootVars.bootstrapTime); // expensive api, use sparsely

src/extensions/default/UrlCodeHints/unittests.js

@@ -706,7 +706,7 @@ define(function (require, exports, module) {
                 EditorManager;
 
             it("should hint site root '/'", async function () {
-                if(Phoenix.browser.isTauri && Phoenix.platform === "linux") {
+                if(Phoenix.isNativeApp && Phoenix.platform === "linux") {
                     // This tests breaks in github actions only in linux desktop builds for no reason i can fid out.
                     // no problem if we try to run it locally.
                     // so we disable this tests in linux desktop builds for now.

src/extensionsIntegrated/InAppNotifications/utils.js

@@ -30,12 +30,12 @@ define(function (require, exports, module) {
     function isValidForThisPlatform(platformFilter) {
         platformFilter = platformFilter.split(",");
         if(platformFilter.includes("all")
-            || (platformFilter.includes(brackets.platform) && Phoenix.browser.isTauri) // win linux and mac is only for tauri and not for browser in platform
-            || (platformFilter.includes("allDesktop") && Phoenix.browser.isTauri)
-            || (platformFilter.includes("firefox") && Phoenix.browser.desktop.isFirefox && !Phoenix.browser.isTauri)
-            || (platformFilter.includes("chrome") && Phoenix.browser.desktop.isChromeBased && !Phoenix.browser.isTauri)
-            || (platformFilter.includes("safari") && Phoenix.browser.desktop.isSafari && !Phoenix.browser.isTauri)
-            || (platformFilter.includes("allBrowser") && !Phoenix.browser.isTauri)){
+            || (platformFilter.includes(brackets.platform) && Phoenix.isNativeApp) // win linux and mac is only for tauri and not for browser in platform
+            || (platformFilter.includes("allDesktop") && Phoenix.isNativeApp)
+            || (platformFilter.includes("firefox") && Phoenix.browser.desktop.isFirefox && !Phoenix.isNativeApp)
+            || (platformFilter.includes("chrome") && Phoenix.browser.desktop.isChromeBased && !Phoenix.isNativeApp)
+            || (platformFilter.includes("safari") && Phoenix.browser.desktop.isSafari && !Phoenix.isNativeApp)
+            || (platformFilter.includes("allBrowser") && !Phoenix.isNativeApp)){
             return true;
         }
         return false;

src/extensionsIntegrated/Phoenix-live-preview/BrowserStaticServer.js

@@ -123,7 +123,7 @@ define(function (require, exports, module) {
         // live previews into its own domain apart from phcode.dev. Since safari doesn't support this, we are left
         // with using phcode.dev domain directly for live previews. That is a large attack surface for untrusted
         // code execution. so we will disable live previews in safari instead of shipping a security vulnerability.
-        return Phoenix.browser.isTauri || !(Phoenix.browser.desktop.isSafari || Phoenix.browser.mobile.isIos);
+        return Phoenix.isNativeApp || !(Phoenix.browser.desktop.isSafari || Phoenix.browser.mobile.isIos);
     }
 
     /**