Mirrors/ICEcoder
2
0
Fork 0
mirror of https://github.com/icecoder/ICEcoder.git synced 2026-03-06 08:44:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Git green if files, Output red if errors, try/catch Prettier, error.message to Output pane, no scrolling on plugins manager iFrame, fix code fold shortcut

Browse Source
This commit is contained in:
mattpass
2020-06-30 20:08:51 +01:00
parent 84ffbb8b62
commit 4ef637a0f5
1 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
assets/js/icecoder.js
View File

@@ -1009,6 +1009,9 @@ var ICEcoder = {
// Update Git diff pane (the diffs between saved content and git commits)
updateGitDiffPane: function() {
let gitDiffList = "";
get("toolLinkGit").className = 0 < this.indexData.gitDiff.paths.length
? "highlight info"
: "";
for (let i = 0; i<this.indexData.gitDiff.paths.length; i++) {
gitDiffList +=
'<div class="link" onclick="this.toolShowHideToggle(\'git\'); this.openFile(\'/' +
@@ -2010,13 +2013,18 @@ var ICEcoder = {
case "md": parser = "markdown"; break;
case "php": parser = "php"; break;
}
this.getThisCM().setValue(prettier.format(
this.getThisCM().getValue(),
{
parser: parser,
plugins: prettierPlugins
}
));
try {
this.getThisCM().setValue(prettier.format(
this.getThisCM().getValue(),
{
parser: parser,
plugins: prettierPlugins
}
));
} catch(err) {
get("toolLinkOutput").className = "highlight error";
this.outputMsg('<div style="background: #b00; padding: 1px 3px; border-radius: 3px; font-family: monospace;">Syntax error in ' + this.openFiles[this.selectedTab - 1].replace(iceRoot, "") + '</div>\n' + err.message);
}
}
setTimeout(function() {
// If we're not 'saving as', establish changes between current and known saved version from array
@@ -3468,7 +3476,7 @@ var ICEcoder = {
// Show the plugins manager
pluginsManager: function() {
get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/plugins-manager.php" id="pluginsManagerIFrame" class="whiteGlow" style="width: 800px; height: 450px" scrolling="no"></iframe>';
get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/plugins-manager.php" id="pluginsManagerIFrame" class="whiteGlow" style="width: 800px; height: 450px"></iframe>';
this.showHide('show',get('blackMask'));
},
@@ -4615,26 +4623,8 @@ var ICEcoder = {
// CTRL + . (Fold/unfold current line)
} else if(key==190 && (evt.ctrlKey||this.cmdKey)) {
// TODO: doesn't seem to be working
var line = this.getThisCM().getCursor().line;
thisCM = this.getThisCM();
thisCM.foldCode(thisCM.getCursor());
return false;
// ESC in content area (Comment/Uncomment line)