Skip to content

Commit c616b3a

Browse files
phoenixidephoenixide
committed
deploy: 606b7d0 
1 parent 62d1910 commit c616b3a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+168
-272
lines changed

‎appConfig.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ window.AppConfig = {
2626
"app_notification_url": "assets/notifications/dev/",
2727
"app_update_url": "https://updates.phcode.io/tauri/update-latest-experimental-build.json",
2828
"linting.enabled_by_default": true,
29-
"build_timestamp": "2024-08-28T14:25:31.526Z",
29+
"build_timestamp": "2024-08-29T02:36:48.386Z",
3030
"googleAnalyticsID": "G-P4HJFPDB76",
3131
"googleAnalyticsIDDesktop": "G-VE5BXWJ0HF",
3232
"mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
@@ -38,7 +38,7 @@ window.AppConfig = {
3838
"bugsnagEnv": "development"
3939
},
4040
"name": "Phoenix Code",
41-
"version": "3.9.1-20546",
41+
"version": "3.9.1-20548",
4242
"apiVersion": "3.9.1",
4343
"homepage": "https://core.ai",
4444
"issues": {

‎assets/default-project/en.zip‎

0 Bytes
Binary file not shown.

‎assets/sample-projects/HTML5.zip‎

0 Bytes
Binary file not shown.

‎assets/sample-projects/bootstrap-blog.zip‎

0 Bytes
Binary file not shown.

‎assets/sample-projects/dashboard.zip‎

0 Bytes
Binary file not shown.

‎assets/sample-projects/explore.zip‎

0 Bytes
Binary file not shown.

‎assets/sample-projects/home-pages.zip‎

0 Bytes
Binary file not shown.

‎brackets-min.js‎

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ define(function (require, exports, module) {
6969
require("NodeConnector");
7070
require("command/KeyboardOverlayMode");
7171
require("editor/EditorManager");
72+
require("project/FileViewController");
7273

7374
// Load dependent modules
7475
const AppInit = require("utils/AppInit"),
7576
LanguageManager = require("language/LanguageManager"),
7677
ProjectManager = require("project/ProjectManager"),
77-
FileViewController = require("project/FileViewController"),
7878
FileSyncManager = require("project/FileSyncManager"),
7979
Commands = require("command/Commands"),
8080
CommandManager = require("command/CommandManager"),
@@ -95,8 +95,8 @@ define(function (require, exports, module) {
9595
DeprecationWarning = require("utils/DeprecationWarning"),
9696
ViewCommandHandlers = require("view/ViewCommandHandlers"),
9797
NotificationUI = require("widgets/NotificationUI"),
98-
MainViewManager = require("view/MainViewManager"),
9998
Metrics = require("utils/Metrics");
99+
require("view/MainViewManager");
100100

101101
window.EventManager = EventManager; // Main event intermediary between brackets and other web pages.
102102
/**
@@ -361,34 +361,19 @@ define(function (require, exports, module) {
361361
if (PreferencesManager._isUserScopeCorrupt()) {
362362
const userPrefFullPath = PreferencesManager.getUserPrefFile();
363363
// user scope can get corrupt only if the file exists, is readable,
364-
// but malformed. no need to check for its existance.
365-
const info = MainViewManager.findInAllWorkingSets(userPrefFullPath);
366-
let paneId;
367-
if (info.length) {
368-
paneId = info[0].paneId;
369-
}
364+
// but malformed. no need to check for its existence.
370365
Metrics.countEvent(Metrics.EVENT_TYPE.STORAGE, "prefs.corrupt", "startup");
371-
FileViewController.openFileAndAddToWorkingSet(userPrefFullPath, paneId)
372-
.done(function () {
373-
Dialogs.showModalDialog(
374-
DefaultDialogs.DIALOG_ID_ERROR,
375-
Strings.ERROR_PREFS_CORRUPT_TITLE,
376-
Strings.ERROR_PREFS_CORRUPT
377-
).done(function () {
378-
// give the focus back to the editor with the pref file
379-
MainViewManager.focusActivePane();
380-
});
381-
});
366+
let file = FileSystem.getFileForPath(userPrefFullPath);
367+
file.unlinkAsync().finally(function () {
368+
Dialogs.showModalDialog(
369+
DefaultDialogs.DIALOG_ID_ERROR,
370+
Strings.ERROR_PREFS_RESET_TITLE,
371+
Strings.ERROR_PREFS_CORRUPT_RESET
372+
);
373+
});
382374
}
383375
});
384376
});
385-
386-
// See if any startup files were passed to the application
387-
if (brackets.app.getPendingFilesToOpen) {
388-
brackets.app.getPendingFilesToOpen(function (err, paths) {
389-
DragAndDrop.openDroppedFiles(paths);
390-
});
391-
}
392377
});
393378
});
394379
}
@@ -89530,9 +89515,11 @@ define("nls/root/strings", {
8953089515

8953189516
// Application preferences corrupt error strings
8953289517
"ERROR_PREFS_CORRUPT_TITLE": "Error Reading Preferences",
89518+
"ERROR_PREFS_RESET_TITLE": "Settings Reset - Restart Required",
8953389519
"ERROR_PREFS_PROJECT_LINT": "Project Preferences",
8953489520
"ERROR_PREFS_PROJECT_LINT_MESSAGE": "Error: The project contains both `.brackets.json` and `.phcode.json` files, causing a conflict. Please delete either `.brackets.json` or `.phcode.json` and then reload the project.",
8953589521
"ERROR_PREFS_CORRUPT": "Your preferences file is not valid JSON. The file will be opened so that you can correct the format. You will need to restart {APP_NAME} for the changes to take effect.",
89522+
"ERROR_PREFS_CORRUPT_RESET": "Your {APP_NAME} settings were damaged and have been reset. Please restart {APP_NAME} for the changes to take effect.",
8953689523
"ERROR_PROJ_PREFS_CORRUPT": "Your project preferences file is not valid JSON. The file will be opened so that you can correct the format. You will need to reload the project for the changes to take effect.",
8953789524

8953889525
// Application error strings

‎brackets.js‎

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ define(function (require, exports, module) {
6969
require("NodeConnector");
7070
require("command/KeyboardOverlayMode");
7171
require("editor/EditorManager");
72+
require("project/FileViewController");
7273

7374
// Load dependent modules
7475
const AppInit = require("utils/AppInit"),
7576
LanguageManager = require("language/LanguageManager"),
7677
ProjectManager = require("project/ProjectManager"),
77-
FileViewController = require("project/FileViewController"),
7878
FileSyncManager = require("project/FileSyncManager"),
7979
Commands = require("command/Commands"),
8080
CommandManager = require("command/CommandManager"),
@@ -95,8 +95,8 @@ define(function (require, exports, module) {
9595
DeprecationWarning = require("utils/DeprecationWarning"),
9696
ViewCommandHandlers = require("view/ViewCommandHandlers"),
9797
NotificationUI = require("widgets/NotificationUI"),
98-
MainViewManager = require("view/MainViewManager"),
9998
Metrics = require("utils/Metrics");
99+
require("view/MainViewManager");
100100

101101
window.EventManager = EventManager; // Main event intermediary between brackets and other web pages.
102102
/**
@@ -361,34 +361,19 @@ define(function (require, exports, module) {
361361
if (PreferencesManager._isUserScopeCorrupt()) {
362362
const userPrefFullPath = PreferencesManager.getUserPrefFile();
363363
// user scope can get corrupt only if the file exists, is readable,
364-
// but malformed. no need to check for its existance.
365-
const info = MainViewManager.findInAllWorkingSets(userPrefFullPath);
366-
let paneId;
367-
if (info.length) {
368-
paneId = info[0].paneId;
369-
}
364+
// but malformed. no need to check for its existence.
370365
Metrics.countEvent(Metrics.EVENT_TYPE.STORAGE, "prefs.corrupt", "startup");
371-
FileViewController.openFileAndAddToWorkingSet(userPrefFullPath, paneId)
372-
.done(function () {
373-
Dialogs.showModalDialog(
374-
DefaultDialogs.DIALOG_ID_ERROR,
375-
Strings.ERROR_PREFS_CORRUPT_TITLE,
376-
Strings.ERROR_PREFS_CORRUPT
377-
).done(function () {
378-
// give the focus back to the editor with the pref file
379-
MainViewManager.focusActivePane();
380-
});
381-
});
366+
let file = FileSystem.getFileForPath(userPrefFullPath);
367+
file.unlinkAsync().finally(function () {
368+
Dialogs.showModalDialog(
369+
DefaultDialogs.DIALOG_ID_ERROR,
370+
Strings.ERROR_PREFS_RESET_TITLE,
371+
Strings.ERROR_PREFS_CORRUPT_RESET
372+
);
373+
});
382374
}
383375
});
384376
});
385-
386-
// See if any startup files were passed to the application
387-
if (brackets.app.getPendingFilesToOpen) {
388-
brackets.app.getPendingFilesToOpen(function (err, paths) {
389-
DragAndDrop.openDroppedFiles(paths);
390-
});
391-
}
392377
});
393378
});
394379
}

‎cacheManifest.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"appConfig.js": "4a5871911c1b8c3677ad114365e7d5390569531f1710ef91d8ffc0271fe42ed1",
3-
"assets/default-project/en.zip": "21bf6d41ecc6b6d25ec17b5a7b923c8176e525a9e375f5808c4fb6b7a6fc0652",
2+
"appConfig.js": "3d4a0f00f99d7279f2898023d900297ac2c01469053e166014e25e11f9261e25",
3+
"assets/default-project/en.zip": "bcde6e1aec479a50b157cda8583b34537778ffc772485729f9bbb0888d3333fd",
44
"assets/default-project/en/images/cloud1.svg": "527399dadfa3357c3ee1a63d6c1c7dda81ecebb832f7383db26f1aaeaf722a8d",
55
"assets/default-project/en/images/cloud2.svg": "8127c63c0987bc674e2d25f7d24ead017853326c1e43d07706fec46091904418",
66
"assets/default-project/en/images/cloud3.svg": "15de53aa41dea3b0f685292814563f97213a9736c3cec2f8e17b5d9d45b3ae3d",
@@ -125,7 +125,7 @@
125125
"assets/pwa/32x32.png": "4f8f75bfcdb6efbbed1732f49edab4e292274cdeb1841e285ccc8194f4c9d8ac",
126126
"assets/pwa/phoenix.png": "d292bf76d6d61fdece2f97fb4cd71b8b0060d1058e9c1d02c94bfb20da8b7f0d",
127127
"assets/pwa/Square284x284Logo.png": "9887c2967039b4fae1214817925f1fb4f9227cba12d37612457c1c8ee1110c67",
128-
"assets/sample-projects/bootstrap-blog.zip": "4d54575df8160680cfa6cd2d1bc4fbcebbfa9e579cf27be894fd3781c04e50f4",
128+
"assets/sample-projects/bootstrap-blog.zip": "1389c6b907c7489e528bb7ec6e2253a8b91c2e51de03a051c75929c746e404da",
129129
"assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo-white.svg": "203d56e7e5e15d8203e596d4a711cec986f6380064591de21850f4563fb840bf",
130130
"assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo.svg": "df11d37a123e36a768f2a6064973c4c6ab17d1e3c6501c8bf434ca5c0134c9a2",
131131
"assets/sample-projects/bootstrap-blog/assets/dist/css/bootstrap.min.css": "fb1763b59f9f5764294b5af9fa5250835ae608282fe6f2f2213a5952aacf1fbf",
@@ -135,7 +135,7 @@
135135
"assets/sample-projects/bootstrap-blog/blog.rtl.css": "33f49d02bbcb2e78f019b7582408fad2b5a76a2ecf79fe09d5b3c08c6ee3872b",
136136
"assets/sample-projects/bootstrap-blog/index-rtl.html": "c582278884060098ff51b9d350b0739e1a0396debdc76772c62b6ec375b6efcb",
137137
"assets/sample-projects/bootstrap-blog/index.html": "f4716c2affa299a27ab6f8c74c22fe67564f1b1d36ff2f0b322672bf0479d739",
138-
"assets/sample-projects/dashboard.zip": "15ae6a42927cb76c3b8f20fafd6e5f9f2e9afd145032f33b76301c861257244e",
138+
"assets/sample-projects/dashboard.zip": "9ae2adda5cc4950c501209f833e38e25df300708367a47523a0675597a507ddc",
139139
"assets/sample-projects/dashboard/assets/brand/bootstrap-logo-white.svg": "203d56e7e5e15d8203e596d4a711cec986f6380064591de21850f4563fb840bf",
140140
"assets/sample-projects/dashboard/assets/brand/bootstrap-logo.svg": "df11d37a123e36a768f2a6064973c4c6ab17d1e3c6501c8bf434ca5c0134c9a2",
141141
"assets/sample-projects/dashboard/assets/dist/css/bootstrap.min.css": "fb1763b59f9f5764294b5af9fa5250835ae608282fe6f2f2213a5952aacf1fbf",
@@ -147,7 +147,7 @@
147147
"assets/sample-projects/dashboard/index.html": "1fb0c934f816d728cad85e180f78369679dc9edb1eca2d5c625b9360e6264235",
148148
"assets/sample-projects/dashboard/signin.css": "083bef710a6170a5112ce257c2ecf8580ca97ce19136d770f10460e5b85862de",
149149
"assets/sample-projects/dashboard/signin.html": "8c602e656631aeee624673397c0dc00c339498914ed930ab177478c4662a8d26",
150-
"assets/sample-projects/explore.zip": "73b0ff39f436f41b6583c592a27687f9fbd76d16cf7a0de0438eff41c4871ca0",
150+
"assets/sample-projects/explore.zip": "9f40ee16064def227e4c7772d3f7de203fdff60dd5c12d369130d4eff99704fe",
151151
"assets/sample-projects/explore/A-tribute-page.html": "bd510c60f444058b7fcb71d83841f32b1cb5193c1a39421d7739bd6af9fef248",
152152
"assets/sample-projects/explore/adjustable-fireworks.html": "11e69bb2dd8708ed8fbf1acc62b0aaaf88c7ffec859ee958dc1ae51cd53ddac8",
153153
"assets/sample-projects/explore/ant_colony.html": "bc9435ed1b9868f2fbc7212d526f7532c533a5fdf45da988fa5e575bc5f363b7",
@@ -237,7 +237,7 @@
237237
"assets/sample-projects/explore/watermelon-pixel.html": "765a3fbffb5db97910512fbabaa7c55c0b52dc8eedfcc630811be39d0af98663",
238238
"assets/sample-projects/explore/webmine.html": "6b808f52812dc03db28483411500c04daf8ee0226f535c600a36999d6b7837c0",
239239
"assets/sample-projects/explore/whack-a-mole.html": "25be94a3640553b4801f80edd49998bae3a360988e8a26ff3bdfdc2a76b77191",
240-
"assets/sample-projects/home-pages.zip": "3fe37da03b02b8f9f80752c0fa0a04e24c60f2edee39131ea25d0e1d06914351",
240+
"assets/sample-projects/home-pages.zip": "2962595190463546ad8dfaa0149af17fc5a14eb80d09126eb78a00dccfc621b9",
241241
"assets/sample-projects/home-pages/album/index.html": "e29a1e96644bc17bab1a7e3724e822d65a479e10df182725ee1afa916efbfdc1",
242242
"assets/sample-projects/home-pages/assets/brand/bootstrap-logo-white.svg": "203d56e7e5e15d8203e596d4a711cec986f6380064591de21850f4563fb840bf",
243243
"assets/sample-projects/home-pages/assets/brand/bootstrap-logo.svg": "df11d37a123e36a768f2a6064973c4c6ab17d1e3c6501c8bf434ca5c0134c9a2",
@@ -249,19 +249,19 @@
249249
"assets/sample-projects/home-pages/carousel/index.html": "235d650043a09f2954f24e4659f64d99ef3988858567fb2221fb1cf34df057e6",
250250
"assets/sample-projects/home-pages/cover/cover.css": "2fbb596077c570cad7ee9e98fb88f5665e0ecfc11e7085c3e04639ad03f7bc10",
251251
"assets/sample-projects/home-pages/cover/index.html": "759214701ff759432711b3421d80aca692c7a2b4c978c516a0bcd0c81a43f381",
252-
"assets/sample-projects/HTML5.zip": "fce62c1a386a41f10c67735d989034c7c52da674705521342005a59434f83244",
252+
"assets/sample-projects/HTML5.zip": "a022ccca3d6914a0dac61d09df3b65db1a7c8ddf363b5a939ddb9fe90475d9ad",
253253
"assets/sample-projects/HTML5/index.html": "2dc94c7d3e33aeeb44ec4f75bc7df86a5fd19f3121f2fd3638636fbf7c476c6a",
254254
"assets/sample-projects/HTML5/script.js": "c49e4b01cded4defbc21f5d5d0102719ce4cccbe1b9cb19f9232c5a05df658da",
255255
"assets/sample-projects/HTML5/styles.css": "744b85a9c31affbb00976694c4b9c9149b31e575ed9efdec386231d062ae93f2",
256256
"assets/sample-projects/new-project-list.json": "be1c907279163610779b000aa9ea6e4b035e07429203f16445a914c7045f2d64",
257257
"assets/sample-projects/zips/bootstrap.zip": "6f10407c00ce5d598e77f890528743dc645bc28014335483992b481e63fd7b97",
258258
"base-config/keyboard.json": "f3380c609a293a95644965958286b31863d733293824d56b7087fa0ce4c2d618",
259259
"base-config/readme-keyboard.md": "27e98128176dbd060e93b1f321a4ddcd609571b7b8eb8c9112588f4767d08a03",
260-
"brackets-min.js": "0bfa9d222e311f67cbf1095c9c801a58e9fa0a90f6a506b0ce6e98ef65a31ebe",
260+
"brackets-min.js": "ba97353c560ed5cdd5ce4c93054af3a0d221272ee4bc8a695df0820d40485869",
261261
"brackets.config.dist.json": "8faa5c0a82bb4f49784e93d1225dbd5e1fd8ec6ab07b95f5f874c7c7bd7bb234",
262262
"brackets.config.staging.json": "c0e1f22c772c80f4f5756ab947e40538bcaf7fb7f8925834cfd4ef57c55e477a",
263-
"brackets.js": "0b10cd30e4e2ca2e8bf1dae6af3f33d88e487063ef1b0bcfb35b60f71aa108b6",
264-
"cacheManifest.json": "ad12171d8255f27bb58341132cd33ca0f3e7f7e5a6d06976cb92e36d2401129f",
263+
"brackets.js": "f7a3164510e76e012591c9758acb47f2445526642503180c57209d30faa24d69",
264+
"cacheManifest.json": "67600dcbb1cefd3a419558fe3bce61f8989c8728f29b3ce862b8b05cc95055b1",
265265
"command/ChangeShortcutTemplate.html": "345d682d8bde29380822824778cf09acc79affae6e82b9db00c6205b2b3dd2ee",
266266
"command/CommandManager.js": "0600518322584495bbbfae76ed2bb39e416de3735ee65b12c63a2b3e6b3423ca",
267267
"command/Commands.js": "2dfb209ddd6f5f65da5434d45acb982772f27e629e82a0be2c35ecf178e5d45e",
@@ -270,7 +270,7 @@
270270
"command/KeyboardOverlayMode.js": "8ed49bc8728a109e3850d8ad2df374b51021f24a65811ac826210a1adcdbbb56",
271271
"command/Keys.js": "31cd87a01ce41de28e56ccbdd4fa14866cccc2b7bcde61c5134095adaa5cb674",
272272
"command/Menus.js": "6baf556623f3dea60474cd3b884478e03bb7d5c272b60c5a9b06ca003b9baefe",
273-
"config.json": "b14fee77fc3bd632a028f0a0611108767e6a29c418079d689b78692cd6b67586",
273+
"config.json": "5e59370550f5a751a2a99edb4f93e3f7d0e6161ab8b9f41306060ca63ffd82f2",
274274
"desktop-metrics.html": "66f87550ddf04f284a6c1e81567b7dfbefb2b8007f48f0bad7d8f7aacdb11bac",
275275
"devEnable.html": "44aa1a496a8be413299f651e6b0c3e62ac50cd5d40126ad1bb6b70b9b2b818c4",
276276
"document/ChangedDocumentTracker.js": "03b0eaf0995fee6d27c782a8028a1314f61214e383f5f5e198320b2faac4cf40",
@@ -835,7 +835,7 @@
835835
"nls/ro/lastTranslatedLocale.json": "c838972971c3388cbc8852f5a27a2454eb2ed160794adbfe41335ab50ea953f3",
836836
"nls/ro/strings.js": "1b58f3da043ddfaf1baaeab58b6b077018b429985620937f3a2ef3f9497d02d3",
837837
"nls/root/strings-app.js": "e82c0a855a2f6abc77063465c89c64974f1204146fbc629bd54fef2ae11a81bb",
838-
"nls/root/strings.js": "4d883a2b36049f8278b8f5bd0ff4e9a485d5812901ba24c3c2124098cb69b104",
838+
"nls/root/strings.js": "977b922d674b1b10c9510a54932d318796feccd946ee3d14e0af3c67a879be4d",
839839
"nls/root/urls.js": "0e8522a0a58bb321a1de2d5fd72277089d558809a7c20af8922f1ea61ed4097e",
840840
"nls/ru/expertTranslations.json": "3feda049ee9cda78d51bf12678b10ccc1b4f1548eb84eeb8c46e321b4c3eab9b",
841841
"nls/ru/lastTranslated.json": "191a9fedbe76630217550fc7396251634653af11ac2119f5222c31606bafa4ff",

0 commit comments

Comments
 (0)