deploy: 8a905e4

Author: phoenixide

appConfig.js

@@ -23,7 +23,7 @@ window.AppConfig = {
         "extension_store_url": "https://store.core.ai/src/",
         "app_notification_url": "assets/notifications/dev/",
         "linting.enabled_by_default": true,
-        "build_timestamp": "2024-01-17T09:50:03.005Z",
+        "build_timestamp": "2024-01-17T16:16:27.659Z",
         "googleAnalyticsID": "G-P4HJFPDB76",
         "googleAnalyticsIDDesktop": "G-VE5BXWJ0HF",
         "mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
@@ -34,7 +34,7 @@ window.AppConfig = {
         "bugsnagEnv": "development"
     },
     "name": "Phoenix",
-    "version": "3.2.19-19724",
+    "version": "3.2.19-19727",
     "apiVersion": "3.2.19",
     "homepage": "https://core.ai",
     "issues": {

assets/default-project/en.zip

@@ -111398,10 +111398,12 @@ define("project/ProjectManager", function (require, exports, module) {
         OPERATION_COPY = 'copy';
 
     function _registerPathWithClipboard(path, operation) {
-        Phoenix.app.copyToClipboard(window.path.basename(path));
+        const clipboardText = window.path.basename(path);
+        Phoenix.app.copyToClipboard(clipboardText);
         PhStore.setItem(CLIPBOARD_SYNC_KEY, {
             operation: operation,
-            path: path
+            path: path,
+            clipboardText: clipboardText
         });
     }
 
@@ -111486,13 +111488,16 @@ define("project/ProjectManager", function (require, exports, module) {
         });
     }
 
-    function _isSubPathOf(dir, subDir) {
+    function _isSameOrSubPathOf(dir, subDir) {
+        if(dir === subDir){
+            return true;
+        }
         const relative = window.path.relative(dir, subDir);
         return relative && !relative.startsWith('..') && !window.path.isAbsolute(relative);
     }
 
     async function _validatePasteTarget(srcEntry, targetEntry) {
-        if(_isSubPathOf(srcEntry.fullPath, targetEntry.fullPath)){
+        if(_isSameOrSubPathOf(srcEntry.fullPath, targetEntry.fullPath)){
             _showErrorDialog(ERR_TYPE_PASTE_FAILED, srcEntry.isDirectory, "err",
                 _getProjectDisplayNameOrPath(srcEntry.fullPath),
                 _getProjectDisplayNameOrPath(targetEntry.fullPath));
@@ -111551,19 +111556,31 @@ define("project/ProjectManager", function (require, exports, module) {
         }
     }
 
-    function _pasteFileCMD() {
+    async function _pasteFileCMD() {
         let targetPath = getProjectRoot().fullPath;
         let context = getContext();
         if(context){
             targetPath = context.fullPath;
         }
+
+        const copiedFiles = await Phoenix.app.clipboardReadFiles();
+        if(copiedFiles) {
+            // there were some files the user copied external, eg. from os file explorer. This takes precedence
+            for(let copiedFileOrFolderPath of copiedFiles){
+                _performCopy(copiedFileOrFolderPath, targetPath);
+            }
+            return;
+        }
+
+        const clipboardText = await Phoenix.app.clipboardReadText();
         const clipboard = PhStore.getItem(CLIPBOARD_SYNC_KEY);
-        if(!clipboard){
+        if(!clipboard || clipboard.clipboardText !== clipboardText){
+            // either no copied file, or user copied something outside the app.
             return;
         }
         switch (clipboard.operation) {
-        case OPERATION_CUT: _performCut(clipboard.path, targetPath); break;
-        case OPERATION_COPY: _performCopy(clipboard.path, targetPath); break;
+        case OPERATION_CUT: await _performCut(clipboard.path, targetPath); break;
+        case OPERATION_COPY: await _performCopy(clipboard.path, targetPath); break;
         default: console.error("Clipboard unknown Operation: ", clipboard, targetPath);
         }
     }

assets/sample-projects/HTML5.zip

@@ -1,6 +1,6 @@
 {
-  "appConfig.js": "1dc42b2f90ce517371d9d945a3ae6541",
-  "assets/default-project/en.zip": "abc70c6c753aa405436572cf2d705266",
+  "appConfig.js": "1f4225b6ad088462056b173d51fdd3b5",
+  "assets/default-project/en.zip": "be4f39b2494bf72fe731d7c0a3f007bb",
   "assets/default-project/en/images/cloud1.svg": "aca7bba84a2237f1c1988caea54a67a9",
   "assets/default-project/en/images/cloud2.svg": "02880216ac461f1578ac8a18f158ce28",
   "assets/default-project/en/images/cloud3.svg": "7a78bb29bd895ead8c171001244d9b7d",
@@ -120,7 +120,7 @@
   "assets/phoenix-splash/live-preview-error.html": "98b11e5ae0c9341ab1450e029065ac7b",
   "assets/phoenix-splash/no-preview.html": "2c51d14109552b59976145fe9ac33236",
   "assets/phoenix-splash/styles.css": "6809a039001526eeec64eeef1f0ad807",
-  "assets/sample-projects/bootstrap-blog.zip": "09ee1d0e95a77f06de12cbbe57a5c010",
+  "assets/sample-projects/bootstrap-blog.zip": "b37f48c673b1668f68ec9f86bfdd547b",
   "assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo-white.svg": "2e642df55357162ad28519305c8fd4fe",
   "assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo.svg": "88eef7f3c2bcf988457a0e6d123c3f1d",
   "assets/sample-projects/bootstrap-blog/assets/dist/css/bootstrap.min.css": "6d9c6fda1e7087224431cc8068bb998f",
@@ -130,7 +130,7 @@
   "assets/sample-projects/bootstrap-blog/blog.rtl.css": "c6c275bf0b804d3dec264ec7fb3d7677",
   "assets/sample-projects/bootstrap-blog/index-rtl.html": "506e2d3fd1c4bb3651377144a62d5e82",
   "assets/sample-projects/bootstrap-blog/index.html": "dd8824ad3c9520dc0a825176d20eb694",
-  "assets/sample-projects/dashboard.zip": "04e6a3c8c82fc9e59066b5e497db1cd5",
+  "assets/sample-projects/dashboard.zip": "f09229c793b51b03c49146010095b86b",
   "assets/sample-projects/dashboard/assets/brand/bootstrap-logo-white.svg": "2e642df55357162ad28519305c8fd4fe",
   "assets/sample-projects/dashboard/assets/brand/bootstrap-logo.svg": "88eef7f3c2bcf988457a0e6d123c3f1d",
   "assets/sample-projects/dashboard/assets/dist/css/bootstrap.min.css": "6d9c6fda1e7087224431cc8068bb998f",
@@ -142,7 +142,7 @@
   "assets/sample-projects/dashboard/index.html": "ddfda6ea9dfc8e12a8dcbbf065c804de",
   "assets/sample-projects/dashboard/signin.css": "a71ff2b493f230e0d6585793c2115809",
   "assets/sample-projects/dashboard/signin.html": "b108c183dfa7e2da3d88ec79bee79509",
-  "assets/sample-projects/explore.zip": "6b7fe7d52e6009d89d65350b7f369d86",
+  "assets/sample-projects/explore.zip": "72144bfcc3b38aa37074fe7ebab368ec",
   "assets/sample-projects/explore/A-tribute-page.html": "007699e85177db3d1cd87d0d47440b36",
   "assets/sample-projects/explore/adjustable-fireworks.html": "706a0995d00d8ae009b5426cf7ee69be",
   "assets/sample-projects/explore/ant_colony.html": "d0885229e57caecc83049b50ee98560c",
@@ -232,7 +232,7 @@
   "assets/sample-projects/explore/watermelon-pixel.html": "6f6754e8073436bb823807a10a0446ea",
   "assets/sample-projects/explore/webmine.html": "9879458a48c757dc6671d408e940da4d",
   "assets/sample-projects/explore/whack-a-mole.html": "827f15c53657350b9c898fa27ecf15ac",
-  "assets/sample-projects/home-pages.zip": "2b0622a178f9c31783c0d52269075600",
+  "assets/sample-projects/home-pages.zip": "e2ab902d2696d72a142776ffee9254c1",
   "assets/sample-projects/home-pages/album/index.html": "df20e4a479659463ab9d3f6b4ca4dbd1",
   "assets/sample-projects/home-pages/assets/brand/bootstrap-logo-white.svg": "2e642df55357162ad28519305c8fd4fe",
   "assets/sample-projects/home-pages/assets/brand/bootstrap-logo.svg": "88eef7f3c2bcf988457a0e6d123c3f1d",
@@ -244,24 +244,24 @@
   "assets/sample-projects/home-pages/carousel/index.html": "fc5bf7b2d8640a2c393f465294210e7c",
   "assets/sample-projects/home-pages/cover/cover.css": "3738586a82dd90263617020e7f1db82e",
   "assets/sample-projects/home-pages/cover/index.html": "a0ae1a11224672532b3466df93ce0821",
-  "assets/sample-projects/HTML5.zip": "da39fe7a1cc23088f472fa413e064965",
+  "assets/sample-projects/HTML5.zip": "d61ee8ae15fa45b30ee5bf5bd1e76a46",
   "assets/sample-projects/HTML5/index.html": "ca318e370d63b3e083d3bd63052b8252",
   "assets/sample-projects/HTML5/script.js": "47de56d88cd6d866c4f77027128c0dd7",
   "assets/sample-projects/HTML5/styles.css": "8c798c8b3bba7e4d49dfe99b4deccd47",
   "assets/sample-projects/new-project-list.json": "52493b6373285d18a51a7e0319d812c2",
   "assets/sample-projects/zips/bootstrap.zip": "47b3132b5dbf324d6396188cf68ecae1",
   "base-config/keyboard.json": "fe78beab83ea31263c340439e97d4867",
-  "brackets-min.js": "87ea6cbc7679c233cd9208050c8e4edc",
+  "brackets-min.js": "e9b035349999ce363d82b3632dc4a26b",
   "brackets.config.dist.json": "65a7ad178b006a23115433cead0e3dc4",
   "brackets.config.staging.json": "64d4ae88ab3bf0a0841ee76ef036991d",
   "brackets.js": "ec2ae12d8f29444312817b05ddf0c10e",
-  "cacheManifest.json": "f36c0d7052f380067f4f82d2108e97d7",
+  "cacheManifest.json": "50ae6a25e16edeec2b9dd71385fc37b9",
   "command/CommandManager.js": "8763fce16883bbef252604330ac3bf49",
   "command/Commands.js": "15ae60b455ceef44d09dbfbdebf05567",
   "command/DefaultMenus.js": "95ac6ecc14fc1a5f5681d8535df92964",
   "command/KeyBindingManager.js": "fef7621c53af1cec6e070b4be6b82a5f",
   "command/Menus.js": "1dc0ebdbebf8815667452d61ae63728e",
-  "config.json": "6b39e50489838d9878b2118dbb3a7d30",
+  "config.json": "d86e8e246746819667b0f1144cb2cc20",
   "devEnable.html": "5c494d5e246bdb4260557c03b73eea32",
   "document/ChangedDocumentTracker.js": "8763dbbd784b9e8a3614a8ee723d5273",
   "document/Document.js": "311174e3df23c37caf5d1783a6377f40",
@@ -883,8 +883,8 @@
   "node-loader.js": "6ab5daf03bac6d25065bb38217dce3f6",
   "NodeConnector.js": "019a124dc5b402116d971932b714e0a6",
   "phoenix/errno.js": "6ca6e445e77fc2060df5ba36d88a8846",
-  "phoenix/init_vfs.js": "31d0174a992cd7c7ae16d4931d6d1ff3",
-  "phoenix/shell.js": "f1ee46ca6309c5bdabd765d762002abc",
+  "phoenix/init_vfs.js": "1bea8bee86ebe940609f2339a72b11f8",
+  "phoenix/shell.js": "b35470a439843b8a01f47af62e8f73c4",
   "phoenix/tauriShell.js": "6cb8aba882a54e13db38a3f74106f837",
   "phoenix/virtual-server-loader.js": "b357c2a0f5f0fba5db7002a5b83b25ef",
   "phoenix/virtualfs.js": "111d6f4f4299db4d55c47e16693a23e4",
@@ -903,7 +903,7 @@
   "project/FileTreeView.js": "fe84143b4e9e74012757e7d6078fb4c8",
   "project/FileTreeViewModel.js": "dccfbb087eb6de5017aaf1902c0c8899",
   "project/FileViewController.js": "882954f85e6fcc370eba7fb6cd0eeb83",
-  "project/ProjectManager.js": "4cdb37adc4f13d7a70f50d05f9058d56",
+  "project/ProjectManager.js": "63feee7936557e4fab4b0750adb871c9",
   "project/ProjectModel.js": "a0813bd4f38fcb5325938c68482a9d81",
   "project/SidebarView.js": "904ec1205dff6901725f2e0b0be117c1",
   "project/WorkingSetSort.js": "6afc1815ba2fea6def8cac4e9254c23f",

assets/sample-projects/bootstrap-blog.zip

@@ -22,7 +22,7 @@
         "extension_store_url": "https://store.core.ai/src/",
         "app_notification_url": "assets/notifications/dev/",
         "linting.enabled_by_default": true,
-        "build_timestamp": "2024-01-17T09:50:03.005Z",
+        "build_timestamp": "2024-01-17T16:16:27.659Z",
         "googleAnalyticsID": "G-P4HJFPDB76",
         "googleAnalyticsIDDesktop": "G-VE5BXWJ0HF",
         "mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
@@ -33,7 +33,7 @@
         "bugsnagEnv": "development"
     },
     "name": "Phoenix",
-    "version": "3.2.19-19724",
+    "version": "3.2.19-19727",
     "apiVersion": "3.2.19",
     "homepage": "https://core.ai",
     "issues": {