Skip to content

Commit 051ace2

Browse files
phoenixidephoenixide
committed
deploy: 606b7d0 
1 parent 28a75ca commit 051ace2

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

+452
-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-06-26T05:38:51.086Z",
29+
"build_timestamp": "2024-06-26T10:54:30.147Z",
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.8.5-20436",
41+
"version": "3.8.5-20442",
4242
"apiVersion": "3.8.5",
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: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -139712,16 +139712,39 @@ define("utils/DragAndDrop", function (require, exports, module) {
139712139712
});
139713139713
}
139714139714

139715-
async function showAndResizeFileDropWindow(event) {
139716-
// Get the current window
139715+
const MAC_TITLE_BAR_HEIGHT = 28;
139716+
async function _computeNewPositionAndSizeWebkit() {
139717+
const currentWindow = window.__TAURI__.window.getCurrent();
139718+
const newSize = await currentWindow.innerSize();
139719+
const newPosition = await currentWindow.innerPosition();
139720+
if(Phoenix.platform === "mac") {
139721+
// in mac we somehow get the top left of the window including the title bar even though we are calling the
139722+
// tauri innerPosition api. So we just adjust for a generally constant title bar height of mac that is 28px.
139723+
newPosition.y = newPosition.y + MAC_TITLE_BAR_HEIGHT;
139724+
newSize.height = newSize.height - MAC_TITLE_BAR_HEIGHT;
139725+
}
139726+
return {newSize, newPosition};
139727+
}
139728+
139729+
async function _computeNewPositionAndSizeWindows() {
139730+
// Note that the drop window may be on different screens if multi window setup. in windows os, there can be
139731+
// of different scale factors like 1x and 1.5x on another monitor. Additionally, we may apply our own zoom
139732+
// settings. So its is always better to just use the tauri provided positions. the tauri api returned values
139733+
// will position the window to the correct monitor as well.
139717139734
const currentWindow = window.__TAURI__.window.getCurrent();
139735+
const newSize = await currentWindow.innerSize();
139736+
const newPosition = await currentWindow.innerPosition();
139737+
return {newSize, newPosition};
139738+
}
139718139739

139719-
// Get the bounds of the current window
139720-
const size = await currentWindow.innerSize();
139721-
// in mac, the innerSize api in tauri gets the full size including titlebar. Since our sidebar is full size
139722-
const titlebarHeightIfAny = size.height - window.innerHeight;
139723-
const currentWindowPos = await currentWindow.innerPosition();
139740+
async function _computeNewPositionAndSize() {
139741+
if(Phoenix.platform === "win") {
139742+
return _computeNewPositionAndSizeWindows();
139743+
}
139744+
return _computeNewPositionAndSizeWebkit();
139745+
}
139724139746

139747+
async function showAndResizeFileDropWindow(event) {
139725139748
let $activeElement;
139726139749
const fileDropWindow = window.__TAURI__.window.WebviewWindow.getByLabel('fileDrop');
139727139750
if($("#editor-holder").has(event.target).length) {
@@ -139735,14 +139758,7 @@ define("utils/DragAndDrop", function (require, exports, module) {
139735139758
return;
139736139759
}
139737139760

139738-
const offset = $activeElement.offset();
139739-
const width = $activeElement.outerWidth();
139740-
const height = $activeElement.outerHeight();
139741-
const x = currentWindowPos.x + offset.left,
139742-
y =currentWindowPos.y + titlebarHeightIfAny + offset.top;
139743-
const newSize = new window.__TAURI__.window.LogicalSize(width, height);
139744-
const newPosition = new window.__TAURI__.window.LogicalPosition(x, y);
139745-
139761+
const {newSize, newPosition} = await _computeNewPositionAndSize();
139746139762
const currentSize = await fileDropWindow.innerSize();
139747139763
const currentPosition = await fileDropWindow.innerPosition();
139748139764
const isSameSize = currentSize.width === newSize.width && currentSize.height === newSize.height;
@@ -139752,7 +139768,8 @@ define("utils/DragAndDrop", function (require, exports, module) {
139752139768
dropMessage: Strings.DROP_TO_OPEN_FILES,
139753139769
dropMessageOneFile: Strings.DROP_TO_OPEN_FILE,
139754139770
dropProjectMessage: Strings.DROP_TO_OPEN_PROJECT,
139755-
windowLabelOfListener: window.__TAURI__.window.appWindow.label
139771+
windowLabelOfListener: window.__TAURI__.window.appWindow.label,
139772+
platform: Phoenix.platform
139756139773
});
139757139774
if (isSameSize && isSamePosition && (await fileDropWindow.isVisible())) {
139758139775
return; // Do nothing if the window is already at the correct size and position and visible

‎cacheManifest.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"appConfig.js": "0eb9659477380cada128b1e8bbd91fe9a52292aa3c74200dcf166cc1435e3090",
3-
"assets/default-project/en.zip": "fa86c4ea4fa1f7ba315ff44b3126917dea0ec5b6e0790bb883722bcd9c8cddcd",
2+
"appConfig.js": "c69ce0793afbced06db31c8cca9ba0da17e8ca70d4e84d5c65f277feb76d964f",
3+
"assets/default-project/en.zip": "6d92995ec5d3ce6fe8c1a5e8aa2e4ea7f6dd1d2c2697cd2535e43bf5b1f2ae5a",
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": "ec3058693f0e7f03615f0b6b9781274ff69ff0dfb6f2ab0ff391c632c14534ce",
128+
"assets/sample-projects/bootstrap-blog.zip": "5e14b0e950fdbf4c94c6adb7f814a9c87cc53e93402c692ce23ed939e0de0b2b",
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": "ac928f2c7c17c3076aa2865b6e7652f663a74947154f8f8d48db77965de6a4be",
138+
"assets/sample-projects/dashboard.zip": "8268128061c024ce238a045177abcb10524b6cf9a8dad689c2d8aa98e9821722",
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": "355e6ebae5dcc4259e4c60877883337f2aa2932d47ae9854c113710e5f9a0160",
150+
"assets/sample-projects/explore.zip": "c6edfcced679c34ee5c868042bfdcb8ae1e79f2c5778f04ff6badb03162baa33",
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": "541f39313a287c940a16ccb2a9e842c17ca469b828bb59ff992a2704189b1dd4",
240+
"assets/sample-projects/home-pages.zip": "6213b4790a49abda5d58c3051a3ea82084708ee328b24637f497885dc5804f18",
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": "569e2eed28bd7e6b2287aaec10af8c598fe1a6a689fba79f04cecdc389eb18fd",
252+
"assets/sample-projects/HTML5.zip": "6cb9b17da09d656df2514d3caa6555bc673ea63110c2a5e741c5cc13d164d070",
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": "810b77ed12adddfffa711c57de85384ce6835039f40717b00739c26e45d2525f",
259259
"base-config/readme-keyboard.md": "27e98128176dbd060e93b1f321a4ddcd609571b7b8eb8c9112588f4767d08a03",
260-
"brackets-min.js": "afccb442e60d7e580f2254d199f426a1750de68debb7f3f4fe4b06404b39da78",
260+
"brackets-min.js": "59123eb090c6729487ff7ea4b80d9bb1277c140aa859f30ae3138ebe34190a61",
261261
"brackets.config.dist.json": "8faa5c0a82bb4f49784e93d1225dbd5e1fd8ec6ab07b95f5f874c7c7bd7bb234",
262262
"brackets.config.staging.json": "c0e1f22c772c80f4f5756ab947e40538bcaf7fb7f8925834cfd4ef57c55e477a",
263263
"brackets.js": "96bd8651ba06616484543cf6c610d21d9abc3569d170e2c83fc490723d544273",
264-
"cacheManifest.json": "574b41fac7c901d37b1394381a4a353dc81a86a43e44602947794af181cb7f8d",
264+
"cacheManifest.json": "52f4b5e0457609a727da684f657d4fb08816db382dbff627e2ebb58a1c7dc3c5",
265265
"command/ChangeShortcutTemplate.html": "345d682d8bde29380822824778cf09acc79affae6e82b9db00c6205b2b3dd2ee",
266266
"command/CommandManager.js": "0600518322584495bbbfae76ed2bb39e416de3735ee65b12c63a2b3e6b3423ca",
267267
"command/Commands.js": "c95b1a34ca20736c3a37bb66b64a9b4085054dd1231007f6fd33262019a1ce02",
@@ -270,7 +270,7 @@
270270
"command/KeyboardOverlayMode.js": "46a9aee18e36a7861fd0f0ae46d765cb30b079a6a5f00b21fbf1e3acd91dacee",
271271
"command/Keys.js": "31cd87a01ce41de28e56ccbdd4fa14866cccc2b7bcde61c5134095adaa5cb674",
272272
"command/Menus.js": "d607c5717e9dceb3d9616d5470ef7d78ce27acb81d54e38c6bc17d1dc42d34e9",
273-
"config.json": "6b871ab1948c2976acefca0d0387bed9de469f805a0892e72b401b3e148a3d66",
273+
"config.json": "4ae7cb411ac05b88b5a64481671be40b80e24bcbe15859a24e24e632af15e337",
274274
"desktop-metrics.html": "66f87550ddf04f284a6c1e81567b7dfbefb2b8007f48f0bad7d8f7aacdb11bac",
275275
"devEnable.html": "44aa1a496a8be413299f651e6b0c3e62ac50cd5d40126ad1bb6b70b9b2b818c4",
276276
"document/ChangedDocumentTracker.js": "03b0eaf0995fee6d27c782a8028a1314f61214e383f5f5e198320b2faac4cf40",
@@ -281,7 +281,7 @@
281281
"document/TextRange.js": "6e5312ca03ed80864092da7347de08a5db17b659ab08fab72cb4786c07abe157",
282282
"download/index.html": "b934309be1ea825679cce7e93beb0fb99347043d5b76564d0f1a69a5a1ba0a42",
283283
"download/styles.css": "d2a3b22794d0110b76d8fad7773456b20a786335e706785f1826b41f7b82dcb4",
284-
"drop-files.html": "94cba3986f61e94241e22418cb2a9526c73bb5eeb95541b6c343f153817e28fc",
284+
"drop-files.html": "687888f4a2703c571ba94ae5befdebf90a59810cf70fcee7862028c703c3b099",
285285
"editor/CodeHintList.js": "b0e38b0714484b84ded353074594337ad5a4461907925861b0eab625a6ab6fc3",
286286
"editor/CodeHintManager.js": "b16d286856b5c48d3410f18b3946c675917691bc020b693b71bdaa4279fb5304",
287287
"editor/CSSInlineEditor.js": "20329138aea67b56f34a8d0772caab6a9a944db6ef7ac491a4be4cd8ed89c4cd",
@@ -1730,7 +1730,7 @@
17301730
"utils/ColorUtils.js": "1bed193e04b5ef7ee362690c1ec820853b23ddf64fc20aefd7448db9bd2e17e8",
17311731
"utils/Compatibility.js": "61b906840cad8d22ce3131d961d00d6e4f3edc0dc6e8e76f2e9e2aa1d987ceb0",
17321732
"utils/DeprecationWarning.js": "d727db6833b1bc4fdbb46097c2b6c961e685272c008df40dfd92e961444c5abe",
1733-
"utils/DragAndDrop.js": "6fe44748f397cba7dc4075c7ce7ad09fd5d1b07a45f9ad1e2a6973b97d1d3358",
1733+
"utils/DragAndDrop.js": "8e0b49adb975fb5d391474784a97edaf2250bd0c454daccf7a6c1c5380c99a69",
17341734
"utils/DropdownEventHandler.js": "f509f3737b0fc86dd3b91bb43f711f29a3c20e056a16f0e5813c1e159175696f",
17351735
"utils/EventDispatcher.js": "acacaa3327d4277550ea8ffddb38c2cedeac10bc36e53658c22b67392ef142a3",
17361736
"utils/EventManager.js": "f7db93f483ca201c97b12b9684171ac081d2f398e55cd45c0139f8e8ad59b90f",

‎config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"app_notification_url": "assets/notifications/dev/",
2626
"app_update_url": "https://updates.phcode.io/tauri/update-latest-experimental-build.json",
2727
"linting.enabled_by_default": true,
28-
"build_timestamp": "2024-06-26T05:38:51.086Z",
28+
"build_timestamp": "2024-06-26T10:54:30.147Z",
2929
"googleAnalyticsID": "G-P4HJFPDB76",
3030
"googleAnalyticsIDDesktop": "G-VE5BXWJ0HF",
3131
"mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
@@ -37,7 +37,7 @@
3737
"bugsnagEnv": "development"
3838
},
3939
"name": "Phoenix Code",
40-
"version": "3.8.5-20436",
40+
"version": "3.8.5-20442",
4141
"apiVersion": "3.8.5",
4242
"homepage": "https://core.ai",
4343
"issues": {

0 commit comments

Comments
 (0)