Skip to content

Commit 6eea608

Browse files
phoenixidephoenixide
committed
deploy: 8a905e4 
1 parent b9605be commit 6eea608

File tree

25 files changed

+216
-68
lines changed

25 files changed

+216
-68
lines changed

‎appConfig.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ window.AppConfig = {
2323
"extension_store_url": "https://store.core.ai/src/",
2424
"app_notification_url": "assets/notifications/dev/",
2525
"linting.enabled_by_default": true,
26-
"build_timestamp": "2024-02-10T17:20:31.406Z",
26+
"build_timestamp": "2024-02-11T09:14:34.713Z",
2727
"googleAnalyticsID": "G-P4HJFPDB76",
2828
"googleAnalyticsIDDesktop": "G-VE5BXWJ0HF",
2929
"mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
@@ -35,7 +35,7 @@ window.AppConfig = {
3535
"bugsnagEnv": "development"
3636
},
3737
"name": "Phoenix",
38-
"version": "3.3.3-19873",
38+
"version": "3.3.3-19874",
3939
"apiVersion": "3.3.3",
4040
"homepage": "https://core.ai",
4141
"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: 46 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13597,7 +13597,10 @@ define("document/DocumentCommandHandlers", function (require, exports, module) {
1359713597
/**
1359813598
* Event triggered when File Save is cancelled, when prompted to save dirty files
1359913599
*/
13600-
var APP_QUIT_CANCELLED = "appQuitCancelled";
13600+
const APP_QUIT_CANCELLED = "appQuitCancelled";
13601+
// private event emitted when a file is opened via user right-clicking a file from the os explorer in phcode.
13602+
const _EVENT_OPEN_WITH_FILE_FROM_OS = "_openWithFileFromOS";
13603+
let _filesOpenedFromOsCount = 0;
1360113604

1360213605

1360313606
/**
@@ -15111,6 +15114,8 @@ define("document/DocumentCommandHandlers", function (require, exports, module) {
1511115114
}
1511215115
}
1511315116
if(openCount){
15117+
exports.trigger(_EVENT_OPEN_WITH_FILE_FROM_OS);
15118+
_filesOpenedFromOsCount++;
1511415119
Metrics.countEvent(Metrics.EVENT_TYPE.PLATFORM, 'openWith', "file", openCount);
1511515120
}
1511615121
}
@@ -15580,6 +15585,12 @@ define("document/DocumentCommandHandlers", function (require, exports, module) {
1558015585
showInOS = Strings.CMD_SHOW_IN_FINDER;
1558115586
}
1558215587

15588+
// private api
15589+
exports._EVENT_OPEN_WITH_FILE_FROM_OS = _EVENT_OPEN_WITH_FILE_FROM_OS;
15590+
exports._isOpenWithFileFromOS = function () {
15591+
return !!_filesOpenedFromOsCount;
15592+
};
15593+
1558315594
// Define public API
1558415595
exports.showFileOpenError = showFileOpenError;
1558515596
exports.APP_QUIT_CANCELLED = APP_QUIT_CANCELLED;
@@ -34357,6 +34368,7 @@ define("extensionsIntegrated/Phoenix/new-project", function (require, exports, m
3435734368
ZipUtils = require("utils/ZipUtils"),
3435834369
ProjectManager = require("project/ProjectManager"),
3435934370
EventDispatcher = require("utils/EventDispatcher"),
34371+
DocumentCommandHandlers = require("document/DocumentCommandHandlers"),
3436034372
createProjectDialogue = `<div class="modal" style="display: flex; flex-direction: column; justify-content: space-between; background-color:#3C3F41;">
3436134373
<div class="modal-header">
3436234374
<h1 id="new-prj-msg-dlg-title" class="dialog-title">{{TITLE}}</h1>
@@ -34440,7 +34452,7 @@ define("extensionsIntegrated/Phoenix/new-project", function (require, exports, m
3444034452
}
3444134453

3444234454
function closeDialogue() {
34443-
Metrics.countEvent(Metrics.EVENT_TYPE.NEW_PROJECT, "dialogue", "open");
34455+
Metrics.countEvent(Metrics.EVENT_TYPE.NEW_PROJECT, "dialogue", "close");
3444434456
newProjectDialogueObj.close();
3444534457
exports.trigger(exports.EVENT_NEW_PROJECT_DIALOGUE_CLOSED);
3444634458
guidedTour.startTourIfNeeded();
@@ -34458,6 +34470,28 @@ define("extensionsIntegrated/Phoenix/new-project", function (require, exports, m
3445834470
CommandManager.execute(Commands.FILE_OPEN_FOLDER).then(closeDialogue);
3445934471
}
3446034472

34473+
async function _shouldNotShowDialog() {
34474+
if(!Phoenix.browser.isTauri){
34475+
// in browser we always show the new project dialog even if there is a different startup project open. This
34476+
// is mainly for users to discover the download native app button in the new project window.
34477+
return false;
34478+
}
34479+
// in tauri, we don't show the dialog if its not default project or
34480+
// if phoenix was opened with a file/folder from os with cli args. In mac, this is done via
34481+
// setSingleInstanceCLIArgsHandler as it doesnt use cli args for open with like other os.
34482+
if(ProjectManager.getProjectRoot().fullPath !== ProjectManager.getWelcomeProjectPath() ||
34483+
DocumentCommandHandlers._isOpenWithFileFromOS()){
34484+
return true;
34485+
}
34486+
// we are in the default project, show the dialog only if we are not opened with a file
34487+
const cliArgs= await Phoenix.app.getCommandLineArgs();
34488+
const args = cliArgs && cliArgs.args;
34489+
if(!args || args.length <= 1){
34490+
return false;
34491+
}
34492+
return true;
34493+
}
34494+
3446134495
function init() {
3446234496
_addMenuEntries();
3446334497
const shouldShowWelcome = PhStore.getItem("new-project.showWelcomeScreen") || 'Y';
@@ -34466,13 +34500,16 @@ define("extensionsIntegrated/Phoenix/new-project", function (require, exports, m
3446634500
guidedTour.startTourIfNeeded();
3446734501
return;
3446834502
}
34469-
if(ProjectManager.getProjectRoot().fullPath !== ProjectManager.getWelcomeProjectPath() &&
34470-
Phoenix.browser.isTauri){
34471-
// in browser we always show the new project dialog even if there is a different startup project open. This
34472-
// is mainly for users to discover the download native app button in the new project window.
34473-
return;
34474-
}
34475-
_showNewProjectDialogue();
34503+
_shouldNotShowDialog()
34504+
.then(notShow=>{
34505+
if(notShow){
34506+
return;
34507+
}
34508+
_showNewProjectDialogue();
34509+
DocumentCommandHandlers.on(DocumentCommandHandlers._EVENT_OPEN_WITH_FILE_FROM_OS, ()=>{
34510+
closeDialogue();
34511+
});
34512+
});
3447634513
}
3447734514

3447834515
function _showProjectErrorDialogue(desc, projectPath, err) {

‎cacheManifest.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"appConfig.js": "fd793adbacfa9e0d968d75b30573a89c",
3-
"assets/default-project/en.zip": "1f299ee73fa6529b5e6955d377339da9",
2+
"appConfig.js": "8ffb3ede1a3c32bbeef68aa0d65a0261",
3+
"assets/default-project/en.zip": "da19cbb74f7c26d0f09308449f05009d",
44
"assets/default-project/en/images/cloud1.svg": "aca7bba84a2237f1c1988caea54a67a9",
55
"assets/default-project/en/images/cloud2.svg": "02880216ac461f1578ac8a18f158ce28",
66
"assets/default-project/en/images/cloud3.svg": "7a78bb29bd895ead8c171001244d9b7d",
@@ -120,7 +120,7 @@
120120
"assets/phoenix-splash/live-preview-error.html": "98b11e5ae0c9341ab1450e029065ac7b",
121121
"assets/phoenix-splash/no-preview.html": "2c51d14109552b59976145fe9ac33236",
122122
"assets/phoenix-splash/styles.css": "6809a039001526eeec64eeef1f0ad807",
123-
"assets/sample-projects/bootstrap-blog.zip": "0bab6b5f836553875e55e1c75bf001c2",
123+
"assets/sample-projects/bootstrap-blog.zip": "2bb15b753f1e413c3b2a66d673bf2463",
124124
"assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo-white.svg": "2e642df55357162ad28519305c8fd4fe",
125125
"assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo.svg": "88eef7f3c2bcf988457a0e6d123c3f1d",
126126
"assets/sample-projects/bootstrap-blog/assets/dist/css/bootstrap.min.css": "6d9c6fda1e7087224431cc8068bb998f",
@@ -130,7 +130,7 @@
130130
"assets/sample-projects/bootstrap-blog/blog.rtl.css": "c6c275bf0b804d3dec264ec7fb3d7677",
131131
"assets/sample-projects/bootstrap-blog/index-rtl.html": "506e2d3fd1c4bb3651377144a62d5e82",
132132
"assets/sample-projects/bootstrap-blog/index.html": "dd8824ad3c9520dc0a825176d20eb694",
133-
"assets/sample-projects/dashboard.zip": "e051ecdb36fa24e3db2c35e02bdcb319",
133+
"assets/sample-projects/dashboard.zip": "fefd39cb4f851fe5ac0a99f6b257e79b",
134134
"assets/sample-projects/dashboard/assets/brand/bootstrap-logo-white.svg": "2e642df55357162ad28519305c8fd4fe",
135135
"assets/sample-projects/dashboard/assets/brand/bootstrap-logo.svg": "88eef7f3c2bcf988457a0e6d123c3f1d",
136136
"assets/sample-projects/dashboard/assets/dist/css/bootstrap.min.css": "6d9c6fda1e7087224431cc8068bb998f",
@@ -142,7 +142,7 @@
142142
"assets/sample-projects/dashboard/index.html": "ddfda6ea9dfc8e12a8dcbbf065c804de",
143143
"assets/sample-projects/dashboard/signin.css": "a71ff2b493f230e0d6585793c2115809",
144144
"assets/sample-projects/dashboard/signin.html": "b108c183dfa7e2da3d88ec79bee79509",
145-
"assets/sample-projects/explore.zip": "54879e57cf9eb433bc38dc96cc7a9da2",
145+
"assets/sample-projects/explore.zip": "5aac76a315a333a0ad256bf9f118afbf",
146146
"assets/sample-projects/explore/A-tribute-page.html": "007699e85177db3d1cd87d0d47440b36",
147147
"assets/sample-projects/explore/adjustable-fireworks.html": "706a0995d00d8ae009b5426cf7ee69be",
148148
"assets/sample-projects/explore/ant_colony.html": "d0885229e57caecc83049b50ee98560c",
@@ -232,7 +232,7 @@
232232
"assets/sample-projects/explore/watermelon-pixel.html": "6f6754e8073436bb823807a10a0446ea",
233233
"assets/sample-projects/explore/webmine.html": "9879458a48c757dc6671d408e940da4d",
234234
"assets/sample-projects/explore/whack-a-mole.html": "827f15c53657350b9c898fa27ecf15ac",
235-
"assets/sample-projects/home-pages.zip": "e47c46ef8297d4ee7f5aac1163cb724e",
235+
"assets/sample-projects/home-pages.zip": "940028af11ac931782508fe839ce969b",
236236
"assets/sample-projects/home-pages/album/index.html": "df20e4a479659463ab9d3f6b4ca4dbd1",
237237
"assets/sample-projects/home-pages/assets/brand/bootstrap-logo-white.svg": "2e642df55357162ad28519305c8fd4fe",
238238
"assets/sample-projects/home-pages/assets/brand/bootstrap-logo.svg": "88eef7f3c2bcf988457a0e6d123c3f1d",
@@ -244,19 +244,19 @@
244244
"assets/sample-projects/home-pages/carousel/index.html": "fc5bf7b2d8640a2c393f465294210e7c",
245245
"assets/sample-projects/home-pages/cover/cover.css": "3738586a82dd90263617020e7f1db82e",
246246
"assets/sample-projects/home-pages/cover/index.html": "a0ae1a11224672532b3466df93ce0821",
247-
"assets/sample-projects/HTML5.zip": "fc3ea860148e5b7e7666982ff1c6b878",
247+
"assets/sample-projects/HTML5.zip": "17d06d6ee01a8ca8ba4e1c69269706fe",
248248
"assets/sample-projects/HTML5/index.html": "ca318e370d63b3e083d3bd63052b8252",
249249
"assets/sample-projects/HTML5/script.js": "47de56d88cd6d866c4f77027128c0dd7",
250250
"assets/sample-projects/HTML5/styles.css": "8c798c8b3bba7e4d49dfe99b4deccd47",
251251
"assets/sample-projects/new-project-list.json": "52493b6373285d18a51a7e0319d812c2",
252252
"assets/sample-projects/zips/bootstrap.zip": "47b3132b5dbf324d6396188cf68ecae1",
253253
"base-config/keyboard.json": "397585f99c96c29c2cc45018a517e02e",
254254
"base-config/readme-keyboard.md": "4a35b329e66feff11a3f080e25695f68",
255-
"brackets-min.js": "942d8d308d60f2ec130a67b42081aa51",
255+
"brackets-min.js": "9363d89caf178dbe74fbff9f93196343",
256256
"brackets.config.dist.json": "aa92e7f1403ab80ac571c63559c3098e",
257257
"brackets.config.staging.json": "25c205fd98b6c14ba0356fa4b5b647c0",
258258
"brackets.js": "8ba8fe05c48bf1a8eee453a8a0de6227",
259-
"cacheManifest.json": "e7d32861147fd9136b0a956a42541bb4",
259+
"cacheManifest.json": "5712fe27e6578b0d31b6c6665b491a0c",
260260
"command/ChangeShortcutTemplate.html": "e842dfbc58589b3ce1ab1964e13be5cd",
261261
"command/CommandManager.js": "8763fce16883bbef252604330ac3bf49",
262262
"command/Commands.js": "4b8830d74eb37115dc3980f494f3bac1",
@@ -265,12 +265,12 @@
265265
"command/KeyboardOverlayMode.js": "8eb29a228b69fe9e299e88af31a0d541",
266266
"command/Keys.js": "1197df29f8ffa01c62cd2700df9ad216",
267267
"command/Menus.js": "a620c28bdccc72d13022b6474a8487f2",
268-
"config.json": "2172618bd07eecfed4885b58c37ebe56",
268+
"config.json": "40446962249b157a7ff48cdb217effa8",
269269
"desktop-metrics.html": "170f5466bbbce9dc6dd174092cca35ce",
270270
"devEnable.html": "5c494d5e246bdb4260557c03b73eea32",
271271
"document/ChangedDocumentTracker.js": "8763dbbd784b9e8a3614a8ee723d5273",
272272
"document/Document.js": "eb760e79fc98a767f350cea658935803",
273-
"document/DocumentCommandHandlers.js": "65f95e25dbbf66ee84c5accf11fc9120",
273+
"document/DocumentCommandHandlers.js": "975c514ffccc82b1b33c9a3abb05bb6b",
274274
"document/DocumentManager.js": "a6183ec6a19f146cd2068071f25b5d85",
275275
"document/InMemoryFile.js": "34c461337dea2e4b5886586a4f929e6e",
276276
"document/TextRange.js": "12463434e5dbacabd457911259a26c52",
@@ -568,7 +568,7 @@
568568
"extensionsIntegrated/Phoenix/html/replace-project-dialogue.html": "4f2f3369aa462e796f26e0aa59b77124",
569569
"extensionsIntegrated/Phoenix/html/survey-template.html": "8730475b2b4c9b52be1a62706610307e",
570570
"extensionsIntegrated/Phoenix/main.js": "c022e802910b4cf97a5442850d92284b",
571-
"extensionsIntegrated/Phoenix/new-project.js": "fcb6e172ef78e38d0a9922c2f263682a",
571+
"extensionsIntegrated/Phoenix/new-project.js": "ce117536f2cedb42165aab37c6b3975e",
572572
"extensionsIntegrated/Phoenix/newly-added-features.js": "536d6b417cd9591ba967a17ff7b5c7ca",
573573
"extensionsIntegrated/Phoenix/serverSync.js": "fff4c01db6148714e9951fd553877886",
574574
"extensionsIntegrated/QuickOpen/css.js": "5adc42b3ac8aaf77080dd34ac7d63503",

‎config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"extension_store_url": "https://store.core.ai/src/",
2323
"app_notification_url": "assets/notifications/dev/",
2424
"linting.enabled_by_default": true,
25-
"build_timestamp": "2024-02-10T17:20:31.406Z",
25+
"build_timestamp": "2024-02-11T09:14:34.713Z",
2626
"googleAnalyticsID": "G-P4HJFPDB76",
2727
"googleAnalyticsIDDesktop": "G-VE5BXWJ0HF",
2828
"mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
@@ -34,7 +34,7 @@
3434
"bugsnagEnv": "development"
3535
},
3636
"name": "Phoenix",
37-
"version": "3.3.3-19873",
37+
"version": "3.3.3-19874",
3838
"apiVersion": "3.3.3",
3939
"homepage": "https://core.ai",
4040
"issues": {

0 commit comments

Comments
 (0)