Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Specifying the language of the written code #44

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+88 −31
Open

Specifying the language of the written code #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff07dbc
add dropdown menu to specify the language for the written code
Apr 8, 2021
11c5a51
fix some bugs and add error checking
Apr 8, 2021
b447db1
clean up the code from some comments
Apr 8, 2021
00c3e8b
fix saving the language of the code
Apr 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 29 additions & 12 deletions src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,31 @@
.ce-code__textarea {
min-height: 200px;
font-family: Menlo, Monaco, Consolas, Courier New, monospace;
color: #41314e;
line-height: 1.6em;
font-size: 12px;
background: #f8f7fa;
border: 1px solid #f1f1f4;
box-shadow: none;
white-space: pre;
word-wrap: normal;
overflow-x: auto;
resize: vertical;
min-height: 200px;
font-family: Menlo, Monaco, Consolas, Courier New, monospace;
color: #41314e;
line-height: 1.6em;
font-size: 12px;
background: #f8f7fa;
border: 1px solid #f1f1f4;
box-shadow: none;
white-space: pre;
word-wrap: normal;
overflow-x: auto;
resize: vertical;
}

.ce-code__dropdown {
-webkit-appearance: none;
-moz-appearance: none;
-ms-appearance: none;
-o-appearnance: none;
appearnance: none;
min-height: 40px;
margin-bottom: 5px;
line-height: 1.6em;
font-size: 14px;
}

.ce-code__dropdown select:-moz-focusring {
color: transparent;
text-shadow: 0 0 0 #000;
}
78 changes: 59 additions & 19 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* Build styles
*/
import { getLineStartPosition } from './utils/string';
import './index.css';
import { getLineStartPosition } from "./utils/string";
import "./index.css";

/**
* CodeTool for Editor.js
Expand All @@ -19,7 +19,6 @@ import './index.css';
* Code Tool for the Editor.js allows to include code examples in your articles.
*/
export default class CodeTool {

/**
* Notify core that read-only mode is supported
*
Expand Down Expand Up @@ -59,20 +58,24 @@ export default class CodeTool {

this.placeholder = this.api.i18n.t(config.placeholder || CodeTool.DEFAULT_PLACEHOLDER);

this.languages = config.languages;

this.CSS = {
baseClass: this.api.styles.block,
input: this.api.styles.input,
wrapper: 'ce-code',
textarea: 'ce-code__textarea',
wrapper: "ce-code",
textarea: "ce-code__textarea",
dropdown: "ce-code__dropdown",
};

this.nodes = {
holder: null,
textarea: null,
dropdown: null,
};

this.data = {
code: data.code || '',
code: data.code || "",
};

this.nodes.holder = this.drawView();
Expand All @@ -85,8 +88,33 @@ export default class CodeTool {
* @private
*/
drawView() {
const wrapper = document.createElement('div'),
textarea = document.createElement('textarea');
const wrapper = document.createElement("div"),
textarea = document.createElement("textarea");

if (typeof this.languages === "object" && this.languages.length > 0) {
const dropdown = document.createElement("select");

dropdown.classList.add(this.CSS.dropdown, this.CSS.input);
dropdown.value = this.data.languages;

let isValidLang = true;

for (const lang of this.languages) {
if (typeof lang !== "string") {
isValidLang = false;
break;
}

let option = document.createElement("option");
option.classList.add(`${this.CSS.dropdown}__option`);
option.textContent = lang;
dropdown.appendChild(option);
}

if (isValidLang) wrapper.appendChild(dropdown);

this.nodes.dropdown = dropdown;
}

wrapper.classList.add(this.CSS.baseClass, this.CSS.wrapper);
textarea.classList.add(this.CSS.textarea, this.CSS.input);
Expand All @@ -103,9 +131,9 @@ export default class CodeTool {
/**
* Enable keydown handlers
*/
textarea.addEventListener('keydown', (event) => {
textarea.addEventListener("keydown", (event) => {
switch (event.code) {
case 'Tab':
case "Tab":
this.tabHandler(event);
break;
}
Expand Down Expand Up @@ -134,9 +162,16 @@ export default class CodeTool {
* @public
*/
save(codeWrapper) {
return {
code: codeWrapper.querySelector('textarea').value,
};
if (typeof this.languages === "object" && this.languages.length > 0) {
return {
language: codeWrapper.querySelector("select").value,
code: codeWrapper.querySelector("textarea").value,
};
} else {
return {
code: codeWrapper.querySelector("textarea").value,
};
}
}

/**
Expand Down Expand Up @@ -172,6 +207,9 @@ export default class CodeTool {
if (this.nodes.textarea) {
this.nodes.textarea.textContent = data.code;
}
if (this.nodes.dropdown) {
this.nodes.dropdown.value = data.languages;
}
}

/**
Expand All @@ -183,8 +221,9 @@ export default class CodeTool {
*/
static get toolbox() {
return {
icon: '<svg width="14" height="14" viewBox="0 -1 14 14" xmlns="http://www.w3.org/2000/svg" > <path d="M3.177 6.852c.205.253.347.572.427.954.078.372.117.844.117 1.417 0 .418.01.725.03.92.02.18.057.314.107.396.046.075.093.117.14.134.075.027.218.056.42.083a.855.855 0 0 1 .56.297c.145.167.215.38.215.636 0 .612-.432.934-1.216.934-.457 0-.87-.087-1.233-.262a1.995 1.995 0 0 1-.853-.751 2.09 2.09 0 0 1-.305-1.097c-.014-.648-.029-1.168-.043-1.56-.013-.383-.034-.631-.06-.733-.064-.263-.158-.455-.276-.578a2.163 2.163 0 0 0-.505-.376c-.238-.134-.41-.256-.519-.371C.058 6.76 0 6.567 0 6.315c0-.37.166-.657.493-.846.329-.186.56-.342.693-.466a.942.942 0 0 0 .26-.447c.056-.2.088-.42.097-.658.01-.25.024-.85.043-1.802.015-.629.239-1.14.672-1.522C2.691.19 3.268 0 3.977 0c.783 0 1.216.317 1.216.921 0 .264-.069.48-.211.643a.858.858 0 0 1-.563.29c-.249.03-.417.076-.498.126-.062.04-.112.134-.139.291-.031.187-.052.562-.061 1.119a8.828 8.828 0 0 1-.112 1.378 2.24 2.24 0 0 1-.404.963c-.159.212-.373.406-.64.583.25.163.454.342.612.538zm7.34 0c.157-.196.362-.375.612-.538a2.544 2.544 0 0 1-.641-.583 2.24 2.24 0 0 1-.404-.963 8.828 8.828 0 0 1-.112-1.378c-.009-.557-.03-.932-.061-1.119-.027-.157-.077-.251-.14-.29-.08-.051-.248-.096-.496-.127a.858.858 0 0 1-.564-.29C8.57 1.401 8.5 1.185 8.5.921 8.5.317 8.933 0 9.716 0c.71 0 1.286.19 1.72.574.432.382.656.893.671 1.522.02.952.033 1.553.043 1.802.009.238.041.458.097.658a.942.942 0 0 0 .26.447c.133.124.364.28.693.466a.926.926 0 0 1 .493.846c0 .252-.058.446-.183.58-.109.115-.281.237-.52.371-.21.118-.377.244-.504.376-.118.123-.212.315-.277.578-.025.102-.045.35-.06.733-.013.392-.027.912-.042 1.56a2.09 2.09 0 0 1-.305 1.097c-.2.323-.486.574-.853.75a2.811 2.811 0 0 1-1.233.263c-.784 0-1.216-.322-1.216-.934 0-.256.07-.47.214-.636a.855.855 0 0 1 .562-.297c.201-.027.344-.056.418-.083.048-.017.096-.06.14-.134a.996.996 0 0 0 .107-.396c.02-.195.031-.502.031-.92 0-.573.039-1.045.117-1.417.08-.382.222-.701.427-.954z" /> </svg>',
title: 'Code',
icon:
'<svg width="14" height="14" viewBox="0 -1 14 14" xmlns="http://www.w3.org/2000/svg" > <path d="M3.177 6.852c.205.253.347.572.427.954.078.372.117.844.117 1.417 0 .418.01.725.03.92.02.18.057.314.107.396.046.075.093.117.14.134.075.027.218.056.42.083a.855.855 0 0 1 .56.297c.145.167.215.38.215.636 0 .612-.432.934-1.216.934-.457 0-.87-.087-1.233-.262a1.995 1.995 0 0 1-.853-.751 2.09 2.09 0 0 1-.305-1.097c-.014-.648-.029-1.168-.043-1.56-.013-.383-.034-.631-.06-.733-.064-.263-.158-.455-.276-.578a2.163 2.163 0 0 0-.505-.376c-.238-.134-.41-.256-.519-.371C.058 6.76 0 6.567 0 6.315c0-.37.166-.657.493-.846.329-.186.56-.342.693-.466a.942.942 0 0 0 .26-.447c.056-.2.088-.42.097-.658.01-.25.024-.85.043-1.802.015-.629.239-1.14.672-1.522C2.691.19 3.268 0 3.977 0c.783 0 1.216.317 1.216.921 0 .264-.069.48-.211.643a.858.858 0 0 1-.563.29c-.249.03-.417.076-.498.126-.062.04-.112.134-.139.291-.031.187-.052.562-.061 1.119a8.828 8.828 0 0 1-.112 1.378 2.24 2.24 0 0 1-.404.963c-.159.212-.373.406-.64.583.25.163.454.342.612.538zm7.34 0c.157-.196.362-.375.612-.538a2.544 2.544 0 0 1-.641-.583 2.24 2.24 0 0 1-.404-.963 8.828 8.828 0 0 1-.112-1.378c-.009-.557-.03-.932-.061-1.119-.027-.157-.077-.251-.14-.29-.08-.051-.248-.096-.496-.127a.858.858 0 0 1-.564-.29C8.57 1.401 8.5 1.185 8.5.921 8.5.317 8.933 0 9.716 0c.71 0 1.286.19 1.72.574.432.382.656.893.671 1.522.02.952.033 1.553.043 1.802.009.238.041.458.097.658a.942.942 0 0 0 .26.447c.133.124.364.28.693.466a.926.926 0 0 1 .493.846c0 .252-.058.446-.183.58-.109.115-.281.237-.52.371-.21.118-.377.244-.504.376-.118.123-.212.315-.277.578-.025.102-.045.35-.06.733-.013.392-.027.912-.042 1.56a2.09 2.09 0 0 1-.305 1.097c-.2.323-.486.574-.853.75a2.811 2.811 0 0 1-1.233.263c-.784 0-1.216-.322-1.216-.934 0-.256.07-.47.214-.636a.855.855 0 0 1 .562-.297c.201-.027.344-.056.418-.083.048-.017.096-.06.14-.134a.996.996 0 0 0 .107-.396c.02-.195.031-.502.031-.92 0-.573.039-1.045.117-1.417.08-.382.222-.701.427-.954z" /> </svg>',
title: "Code",
};
}

Expand All @@ -195,7 +234,7 @@ export default class CodeTool {
* @returns {string}
*/
static get DEFAULT_PLACEHOLDER() {
return 'Enter a code';
return "Enter a code";
}

/**
Expand All @@ -207,7 +246,7 @@ export default class CodeTool {
*/
static get pasteConfig() {
return {
tags: [ 'pre' ],
tags: ["pre"],
};
}

Expand Down Expand Up @@ -244,7 +283,7 @@ export default class CodeTool {
const isShiftPressed = event.shiftKey;
const caretPosition = textarea.selectionStart;
const value = textarea.value;
const indentation = ' ';
const indentation = " ";

let newCaretPosition;

Expand All @@ -269,7 +308,8 @@ export default class CodeTool {
/**
* Trim the first two chars from the start of line
*/
textarea.value = value.substring(0, currentLineStart) + value.substring(currentLineStart + indentation.length);
textarea.value =
value.substring(0, currentLineStart) + value.substring(currentLineStart + indentation.length);
newCaretPosition = caretPosition - indentation.length;
}

Expand Down