Skip to content

Commit 1edc416

Browse files
phoenixidephoenixide
committed
deploy: 0b2f639 
1 parent 325a96b commit 1edc416

File tree

21 files changed

+78
-40
lines changed

21 files changed

+78
-40
lines changed

‎appConfig.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ window.AppConfig = {
2121
"extension_url": "https://brackets-archive.github.io/brackets-extensions/extensions/",
2222
"extension_store_url": "https://store.core.ai/src/",
2323
"linting.enabled_by_default": true,
24-
"build_timestamp": "2023-01-11T10:47:08.645Z",
24+
"build_timestamp": "2023-01-11T12:38:36.935Z",
2525
"googleAnalyticsID": "G-P4HJFPDB76",
2626
"mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
2727
"coreAnalyticsID": "phoenix",
@@ -31,7 +31,7 @@ window.AppConfig = {
3131
"bugsnagEnv": "development"
3232
},
3333
"name": "Phoenix",
34-
"version": "3.1.1-19078",
34+
"version": "3.1.1-19079",
3535
"apiVersion": "3.1.1",
3636
"homepage": "https://core.ai",
3737
"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.

‎cacheManifest.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"appConfig.js": "47d8a37a98e1a281ef6e5770694acc5f",
3-
"assets/default-project/en.zip": "9f7ee3504184ad2e65f49041c444faa8",
2+
"appConfig.js": "fd9ea1e6cd0cd2fcdbf9027c1299393d",
3+
"assets/default-project/en.zip": "67fa7c8699da8585206c3b7c48bdced1",
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",
@@ -115,7 +115,7 @@
115115
"assets/phoenix-splash/no-preview.html": "2c51d14109552b59976145fe9ac33236",
116116
"assets/phoenix-splash/safari.html": "0e96b2a56337e7d096a95da9d91f9257",
117117
"assets/phoenix-splash/styles.css": "6809a039001526eeec64eeef1f0ad807",
118-
"assets/sample-projects/bootstrap-blog.zip": "a1b1f64b1a26bea1a1716e8eb99487a6",
118+
"assets/sample-projects/bootstrap-blog.zip": "e690b6119500061097b5d9dad7e80b40",
119119
"assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo-white.svg": "2e642df55357162ad28519305c8fd4fe",
120120
"assets/sample-projects/bootstrap-blog/assets/brand/bootstrap-logo.svg": "88eef7f3c2bcf988457a0e6d123c3f1d",
121121
"assets/sample-projects/bootstrap-blog/assets/dist/css/bootstrap.min.css": "6d9c6fda1e7087224431cc8068bb998f",
@@ -125,7 +125,7 @@
125125
"assets/sample-projects/bootstrap-blog/blog.rtl.css": "c6c275bf0b804d3dec264ec7fb3d7677",
126126
"assets/sample-projects/bootstrap-blog/index-rtl.html": "506e2d3fd1c4bb3651377144a62d5e82",
127127
"assets/sample-projects/bootstrap-blog/index.html": "dd8824ad3c9520dc0a825176d20eb694",
128-
"assets/sample-projects/dashboard.zip": "a30ddbda1a2f4942cd6e96ce59bfd4b9",
128+
"assets/sample-projects/dashboard.zip": "c1a8c5cc0494129fb8ea1636cbc80351",
129129
"assets/sample-projects/dashboard/assets/brand/bootstrap-logo-white.svg": "2e642df55357162ad28519305c8fd4fe",
130130
"assets/sample-projects/dashboard/assets/brand/bootstrap-logo.svg": "88eef7f3c2bcf988457a0e6d123c3f1d",
131131
"assets/sample-projects/dashboard/assets/dist/css/bootstrap.min.css": "6d9c6fda1e7087224431cc8068bb998f",
@@ -137,7 +137,7 @@
137137
"assets/sample-projects/dashboard/index.html": "ddfda6ea9dfc8e12a8dcbbf065c804de",
138138
"assets/sample-projects/dashboard/signin.css": "a71ff2b493f230e0d6585793c2115809",
139139
"assets/sample-projects/dashboard/signin.html": "b108c183dfa7e2da3d88ec79bee79509",
140-
"assets/sample-projects/explore.zip": "ae44ed0bd916e71a6f489f6850de4d6f",
140+
"assets/sample-projects/explore.zip": "a3ddfe0cff663a99567e289ef78f1114",
141141
"assets/sample-projects/explore/A-tribute-page.html": "007699e85177db3d1cd87d0d47440b36",
142142
"assets/sample-projects/explore/adjustable-fireworks.html": "706a0995d00d8ae009b5426cf7ee69be",
143143
"assets/sample-projects/explore/ant_colony.html": "d0885229e57caecc83049b50ee98560c",
@@ -227,7 +227,7 @@
227227
"assets/sample-projects/explore/watermelon-pixel.html": "6f6754e8073436bb823807a10a0446ea",
228228
"assets/sample-projects/explore/webmine.html": "9879458a48c757dc6671d408e940da4d",
229229
"assets/sample-projects/explore/whack-a-mole.html": "827f15c53657350b9c898fa27ecf15ac",
230-
"assets/sample-projects/home-pages.zip": "f29bda6ff126bbd1d0c725af08cedd82",
230+
"assets/sample-projects/home-pages.zip": "b15a12ff66b3d1eeca1671c602ca740e",
231231
"assets/sample-projects/home-pages/album/index.html": "df20e4a479659463ab9d3f6b4ca4dbd1",
232232
"assets/sample-projects/home-pages/assets/brand/bootstrap-logo-white.svg": "2e642df55357162ad28519305c8fd4fe",
233233
"assets/sample-projects/home-pages/assets/brand/bootstrap-logo.svg": "88eef7f3c2bcf988457a0e6d123c3f1d",
@@ -239,7 +239,7 @@
239239
"assets/sample-projects/home-pages/carousel/index.html": "fc5bf7b2d8640a2c393f465294210e7c",
240240
"assets/sample-projects/home-pages/cover/cover.css": "3738586a82dd90263617020e7f1db82e",
241241
"assets/sample-projects/home-pages/cover/index.html": "a0ae1a11224672532b3466df93ce0821",
242-
"assets/sample-projects/HTML5.zip": "3542d4659e1a4c4aecc566c43aeae418",
242+
"assets/sample-projects/HTML5.zip": "bdcdfa068b07ae60fd0cacd447b9401f",
243243
"assets/sample-projects/HTML5/index.html": "ca318e370d63b3e083d3bd63052b8252",
244244
"assets/sample-projects/HTML5/script.js": "47de56d88cd6d866c4f77027128c0dd7",
245245
"assets/sample-projects/HTML5/styles.css": "8c798c8b3bba7e4d49dfe99b4deccd47",
@@ -249,13 +249,13 @@
249249
"brackets.config.dist.json": "4f77dd581944e20353b2b23cc824cc4a",
250250
"brackets.config.staging.json": "a1d92e1354fbb3ac701a7c2e7c8007e4",
251251
"brackets.js": "175a28457050c0dc608f9200c73996df",
252-
"cacheManifest.json": "bf199310d2120254aea81a562797f9b4",
252+
"cacheManifest.json": "e29cc55f7a788f4dab1e7c9c931c8e5c",
253253
"command/CommandManager.js": "ebbc15626600575d2dfe2a97da2993a0",
254254
"command/Commands.js": "d1b78cbe3e6272c06e442d8c3441838c",
255255
"command/DefaultMenus.js": "32a77445174fab4343a6da7b4e3bcd86",
256-
"command/KeyBindingManager.js": "f7edd8777e1615a59dfe7b82058e6e76",
256+
"command/KeyBindingManager.js": "1180ff869feb0a476b994f97778ee359",
257257
"command/Menus.js": "20d990cac9b0d3ecbcf2eb0dd34a8621",
258-
"config.json": "08fb371ba6ab798ed5cc096995e33e42",
258+
"config.json": "f425fd1c7ba70adc08942a2de25e472e",
259259
"devEnable.html": "afb2596268ea108f48121765e8244518",
260260
"document/ChangedDocumentTracker.js": "8763dbbd784b9e8a3614a8ee723d5273",
261261
"document/Document.js": "e54a90c638153d50fe7d23ffeeb0076c",

‎command/KeyBindingManager.js‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -816,19 +816,37 @@ define(function (require, exports, module) {
816816
return $.extend({}, defaults ? _defaultKeyMap : _keyMap);
817817
}
818818

819+
function _makeMapFromArray(map, arr){
820+
for(let item of arr) {
821+
map[item] = true;
822+
}
823+
return map;
824+
}
825+
819826
/**
820827
* If there is a registered and enabled key event, we always mark the event as processed
821828
* except the ones in UN_SWALLOWED_EVENTS.
822829
* @type {(string)[]}
823830
*/
824-
let UN_SWALLOWED_EVENTS = [
831+
const UN_SWALLOWED_EVENTS = _makeMapFromArray({}, [
825832
Commands.EDIT_SELECT_ALL,
826833
Commands.EDIT_UNDO,
827834
Commands.EDIT_REDO,
828835
Commands.EDIT_CUT,
829836
Commands.EDIT_COPY,
830837
Commands.EDIT_PASTE
831-
];
838+
]);
839+
840+
// single keys except function keys and key combinations are never swallowed. Áka we want default behavior
841+
// for the below keys if the command handler for the registered key didnt do anything.
842+
let UN_SWALLOWED_KEYS = _makeMapFromArray({},
843+
_keyNames.concat(_reservedShortcuts)
844+
.concat(_macReservedShortcuts));
845+
function _isUnSwallowedKeys(key) {
846+
return UN_SWALLOWED_KEYS[key]
847+
|| (key >= 'A' && key <= 'Z')
848+
|| (key >= '0' && key <= '9');
849+
}
832850

833851
/**
834852
* Process the keybinding for the current key.
@@ -841,13 +859,14 @@ define(function (require, exports, module) {
841859
Metrics.countEvent(Metrics.EVENT_TYPE.KEYBOARD, "shortcut", key);
842860
Metrics.countEvent(Metrics.EVENT_TYPE.KEYBOARD, "command", _keyMap[key].commandID);
843861
logger.leaveTrail("Keyboard shortcut: " + key + "command" + _keyMap[key].commandID);
862+
// If there is a registered and enabled key event except the swallowed key events,
863+
// we always mark the event as processed and return true.
864+
// We don't want multiple behavior tied to the same key event. For Instance, in browser, if `ctrl-k`
865+
// is not handled by quick edit, it will open browser url bar if we return false here(which is bad ux).
844866
let promise = CommandManager.execute(_keyMap[key].commandID);
845-
if(UN_SWALLOWED_EVENTS.includes(_keyMap[key].commandID)){
867+
if(UN_SWALLOWED_EVENTS[_keyMap[key].commandID] || _isUnSwallowedKeys(key)){
846868
return (promise.state() !== "rejected");
847869
}
848-
// If there is a registered and enabled key event, we always mark the event as processed and return true.
849-
// We don't want multiple behavior tied to the same key event. For Instance, in browser, if `ctrl-k`
850-
// is not handled by quick edit, it will open browser url bar if we return false here(which is bad ux).
851870
return true;
852871
}
853872
return false;

‎config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"extension_url": "https://brackets-archive.github.io/brackets-extensions/extensions/",
2121
"extension_store_url": "https://store.core.ai/src/",
2222
"linting.enabled_by_default": true,
23-
"build_timestamp": "2023-01-11T10:47:08.645Z",
23+
"build_timestamp": "2023-01-11T12:38:36.935Z",
2424
"googleAnalyticsID": "G-P4HJFPDB76",
2525
"mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
2626
"coreAnalyticsID": "phoenix",
@@ -30,7 +30,7 @@
3030
"bugsnagEnv": "development"
3131
},
3232
"name": "Phoenix",
33-
"version": "3.1.1-19078",
33+
"version": "3.1.1-19079",
3434
"apiVersion": "3.1.1",
3535
"homepage": "https://core.ai",
3636
"issues": {

0 commit comments

Comments
 (0)