From 430ee10f97d354213b69be856bcbc92adf72e451 Mon Sep 17 00:00:00 2001
From: Franco Pariani <franco19ps@gmail.com>
Date: Tue, 18 Dec 2018 09:08:56 -0300
Subject: [PATCH] Comment/Uncomment shortcut
---
.../src/app/layout/matefun/codemirror/matefun-mode-EN.js | 3 ++-
.../src/app/layout/matefun/matefun.component.html | 5 +++--
Frontend Angular 4/src/assets/i18n/en.json | 3 ++-
Frontend Angular 4/src/assets/i18n/es.json | 3 ++-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Frontend Angular 4/src/app/layout/matefun/codemirror/matefun-mode-EN.js b/Frontend Angular 4/src/app/layout/matefun/codemirror/matefun-mode-EN.js
index 7621f637..91d3f599 100644
--- a/Frontend Angular 4/src/app/layout/matefun/codemirror/matefun-mode-EN.js
+++ b/Frontend Angular 4/src/app/layout/matefun/codemirror/matefun-mode-EN.js
@@ -51,7 +51,7 @@
var re_digits = new RegExp(/^\d+$/, "g");
- // not word = 'Enter'
+ // press 'Enter'
if (options.key == 'Enter'){
var previous_line = editor.getLine(cur.line - 1);
var re_funs = new RegExp(FUNS.source, "g"), match;
@@ -79,6 +79,7 @@
var re_w_s = new RegExp(WRITING_SET.source, "g");
var re_w_c = new RegExp(WRITING_COMMENT.source, "g");
+ // no typing sets or comments
if (!re_w_s.exec(previous_part) && !re_w_c.exec(previous_part)){
// sets
var re_dom = new RegExp(DOM.source, "g");
diff --git a/Frontend Angular 4/src/app/layout/matefun/matefun.component.html b/Frontend Angular 4/src/app/layout/matefun/matefun.component.html
index 2d8ca089..be31779d 100755
--- a/Frontend Angular 4/src/app/layout/matefun/matefun.component.html
+++ b/Frontend Angular 4/src/app/layout/matefun/matefun.component.html
@@ -119,8 +119,8 @@
</div>
</div>
</ng-template>
- <ng-template #shortcutsPopoverContent style="width: 15em">
- <div style="width: 15em">
+ <ng-template #shortcutsPopoverContent style="width: 18em">
+ <div style="width: 18em">
<div class="form-group">
<label><b>Ctrl+P</b> {{ "i18n.shortcuts.runCode" | translate }}</label>
<label><b>Ctrl+A</b> {{ "i18n.shortcuts.newFile" | translate }}</label>
@@ -129,6 +129,7 @@
<label><b>Ctrl+R</b> {{ "i18n.shortcuts.restartInterpreter" | translate }}</label>
<label><b>Ctrl+G</b> {{ "i18n.shortcuts.saveFile" | translate }}</label>
<label><b>Ctrl+{{ "i18n.shortcuts.space" | translate }}</b> {{ "i18n.shortcuts.autocomplete" | translate }}</label>
+ <label><b>Ctrl+Shift+K</b> {{ "i18n.shortcuts.comment" | translate }}</label>
</div>
</div>
</ng-template>
diff --git a/Frontend Angular 4/src/assets/i18n/en.json b/Frontend Angular 4/src/assets/i18n/en.json
index 1108717a..2e3194ff 100644
--- a/Frontend Angular 4/src/assets/i18n/en.json
+++ b/Frontend Angular 4/src/assets/i18n/en.json
@@ -127,7 +127,8 @@
"restartInterpreter" : "Restart interpreter",
"saveFile" : "Save File",
"autocomplete" : "Autocomplete",
- "space" : "Space"
+ "space" : "Space",
+ "comment" : "Comment/Uncomment"
}
}
}
diff --git a/Frontend Angular 4/src/assets/i18n/es.json b/Frontend Angular 4/src/assets/i18n/es.json
index 5df33f3a..62e28832 100644
--- a/Frontend Angular 4/src/assets/i18n/es.json
+++ b/Frontend Angular 4/src/assets/i18n/es.json
@@ -127,7 +127,8 @@
"restartInterpreter" : "Reiniciar intérprete",
"saveFile" : "Guardar archivo",
"autocomplete" : "Autocompletar",
- "space" : "Espacio"
+ "space" : "Espacio",
+ "comment" : "Comentar/Descomentar"
}
}
}
--
GitLab