Skip to content

Commit fcae2b6

Browse files
bajrangCoderbajrangCoder
committed
Merge remote-tracking branch 'origin/main' into codemirror
2 parents 89f6464 + 532302f commit fcae2b6

Some content is hidden

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

50 files changed

+799
-83
lines changed

‎package-lock.json‎

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
"cordova-plugin-sftp": {},
4040
"cordova-plugin-system": {},
4141
"com.foxdebug.acode.rk.exec.proot": {},
42-
"com.foxdebug.acode.rk.exec.terminal": {}
42+
"com.foxdebug.acode.rk.exec.terminal": {},
43+
"com.foxdebug.acode.rk.customtabs": {}
4344
},
4445
"platforms": [
4546
"android"
@@ -65,6 +66,7 @@
6566
"@types/url-parse": "^1.4.11",
6667
"autoprefixer": "^10.4.22",
6768
"babel-loader": "^10.0.0",
69+
"com.foxdebug.acode.rk.customtabs": "file:src/plugins/custom-tabs",
6870
"com.foxdebug.acode.rk.exec.proot": "file:src/plugins/proot",
6971
"com.foxdebug.acode.rk.exec.terminal": "file:src/plugins/terminal",
7072
"cordova-android": "^14.0.1",

‎src/ace/commands.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,14 @@ const commands = [
349349
},
350350
readOnly: true,
351351
},
352+
{
353+
name: "acode:showWelcome",
354+
description: "Show Welcome",
355+
exec() {
356+
acode.exec("welcome");
357+
},
358+
readOnly: true,
359+
},
352360
];
353361

354362
export function setCommands(editor) {

‎src/handlers/quickTools.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,13 @@ function toggle() {
479479

480480
function setHeight(height = 1, save = true) {
481481
const { $footer, $row1, $row2 } = quickTools;
482-
const { editor } = editorManager;
482+
const { editor, activeFile } = editorManager;
483+
484+
// If active file has hideQuickTools, force height to 0 and don't save
485+
if (activeFile?.hideQuickTools) {
486+
height = 0;
487+
save = false;
488+
}
483489

484490
setFooterHeight(height);
485491
if (save) {

‎src/lang/ar-ye.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,5 +489,9 @@
489489
"issues found": "Issues found",
490490
"error details": "Error details",
491491
"active tools": "Active tools",
492-
"available tools": "Available tools"
492+
"available tools": "Available tools",
493+
"recent": "Recent Files",
494+
"command palette": "Open Command Palette",
495+
"change theme": "Change Theme",
496+
"documentation": "Documentation"
493497
}

‎src/lang/be-by.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,5 +490,9 @@
490490
"issues found": "Issues found",
491491
"error details": "Error details",
492492
"active tools": "Active tools",
493-
"available tools": "Available tools"
493+
"available tools": "Available tools",
494+
"recent": "Recent Files",
495+
"command palette": "Open Command Palette",
496+
"change theme": "Change Theme",
497+
"documentation": "Documentation"
494498
}

‎src/lang/bn-bd.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,5 +489,9 @@
489489
"issues found": "Issues found",
490490
"error details": "Error details",
491491
"active tools": "Active tools",
492-
"available tools": "Available tools"
492+
"available tools": "Available tools",
493+
"recent": "Recent Files",
494+
"command palette": "Open Command Palette",
495+
"change theme": "Change Theme",
496+
"documentation": "Documentation"
493497
}

‎src/lang/cs-cz.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,5 +489,9 @@
489489
"issues found": "Nalezené problémy",
490490
"error details": "Podrobnosti o chybě",
491491
"active tools": "Active tools",
492-
"available tools": "Available tools"
492+
"available tools": "Available tools",
493+
"recent": "Recent Files",
494+
"command palette": "Open Command Palette",
495+
"change theme": "Change Theme",
496+
"documentation": "Documentation"
493497
}

‎src/lang/de-de.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,5 +489,9 @@
489489
"issues found": "Gefundene Probleme",
490490
"error details": "Fehlerdetails",
491491
"active tools": "Aktive Tools",
492-
"available tools": "Verfügbare Tools"
492+
"available tools": "Verfügbare Tools",
493+
"recent": "Recent Files",
494+
"command palette": "Open Command Palette",
495+
"change theme": "Change Theme",
496+
"documentation": "Documentation"
493497
}

‎src/lang/en-us.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,5 +489,9 @@
489489
"issues found": "Issues found",
490490
"error details": "Error details",
491491
"active tools": "Active tools",
492-
"available tools": "Available tools"
492+
"available tools": "Available tools",
493+
"recent": "Recent Files",
494+
"command palette": "Open Command Palette",
495+
"change theme": "Change Theme",
496+
"documentation": "Documentation"
493497
}

0 commit comments

Comments
 (0)