remove the option to show CKEditor banner

This commit is contained in:
zadam 2023-06-30 15:58:42 +02:00
parent f78d96a3d4
commit 068684101f
7 changed files with 6 additions and 45 deletions

View File

@ -31,7 +31,6 @@ import VacuumDatabaseOptions from "./options/advanced/vacuum_database.js";
import DatabaseAnonymizationOptions from "./options/advanced/database_anonymization.js"; import DatabaseAnonymizationOptions from "./options/advanced/database_anonymization.js";
import BackendLogWidget from "./content/backend_log.js"; import BackendLogWidget from "./content/backend_log.js";
import AttachmentErasureTimeoutOptions from "./options/other/attachment_erasure_timeout.js"; import AttachmentErasureTimeoutOptions from "./options/other/attachment_erasure_timeout.js";
import PoweredByCKEditorOptions from "./options/appearance/powered_by_ckeditor.js";
const TPL = `<div class="note-detail-content-widget note-detail-printable"> const TPL = `<div class="note-detail-content-widget note-detail-printable">
<style> <style>
@ -54,7 +53,6 @@ const TPL = `<div class="note-detail-content-widget note-detail-printable">
const CONTENT_WIDGETS = { const CONTENT_WIDGETS = {
_optionsAppearance: [ _optionsAppearance: [
PoweredByCKEditorOptions,
ThemeOptions, ThemeOptions,
FontsOptions, FontsOptions,
ZoomFactorOptions, ZoomFactorOptions,

View File

@ -1,32 +0,0 @@
import OptionsWidget from "../options_widget.js";
import utils from "../../../../services/utils.js";
const TPL = `
<div class="options-section">
<h4>Powered by CKEditor banner</h4>
<p>CKEditor by default displays a small banner in the editing area. Some users may find this distracting, so it is possible to hide it.</p>
<select class="powered-by-ckeditor-select form-control">
<option value="show">shown</option>
<option value="hide">hidden</option>
</select>
</div>`;
export default class PoweredByCKEditorOptions extends OptionsWidget {
doRender() {
this.$widget = $(TPL);
this.$poweredByCKEditorSelect = this.$widget.find(".powered-by-ckeditor-select");
this.$poweredByCKEditorSelect.on('change', async () => {
const hidePoweredByCKEditor = this.$poweredByCKEditorSelect.val() === 'hide' ? 'true' : 'false';
await this.updateOption('hidePoweredByCKEditor', hidePoweredByCKEditor);
utils.reloadFrontendApp("Powered by CKEditor change");
});
}
async optionsLoaded(options) {
this.$poweredByCKEditorSelect.val(options.hidePoweredByCKEditor === 'true' ? 'hide' : 'show');
}
}

View File

@ -1043,3 +1043,7 @@ textarea {
/* Fix center vertical alignment of table cells */ /* Fix center vertical alignment of table cells */
vertical-align: middle; vertical-align: middle;
} }
.ck-powered-by-balloon {
display: none !important;
}

View File

@ -55,8 +55,7 @@ const ALLOWED_OPTIONS = new Set([
'eraseUnusedAttachmentsAfterSeconds', 'eraseUnusedAttachmentsAfterSeconds',
'disableTray', 'disableTray',
'customSearchEngineName', 'customSearchEngineName',
'customSearchEngineUrl', 'customSearchEngineUrl'
'hidePoweredByCKEditor'
]); ]);
function getOptions() { function getOptions() {

View File

@ -29,7 +29,6 @@ function index(req, res) {
mainFontSize: parseInt(options.mainFontSize), mainFontSize: parseInt(options.mainFontSize),
treeFontSize: parseInt(options.treeFontSize), treeFontSize: parseInt(options.treeFontSize),
detailFontSize: parseInt(options.detailFontSize), detailFontSize: parseInt(options.detailFontSize),
hidePoweredByCKEditor: options.hidePoweredByCKEditor === 'true',
maxEntityChangeIdAtLoad: sql.getValue("SELECT COALESCE(MAX(id), 0) FROM entity_changes"), maxEntityChangeIdAtLoad: sql.getValue("SELECT COALESCE(MAX(id), 0) FROM entity_changes"),
maxEntityChangeSyncIdAtLoad: sql.getValue("SELECT COALESCE(MAX(id), 0) FROM entity_changes WHERE isSynced = 1"), maxEntityChangeSyncIdAtLoad: sql.getValue("SELECT COALESCE(MAX(id), 0) FROM entity_changes WHERE isSynced = 1"),
instanceName: config.General ? config.General.instanceName : null, instanceName: config.General ? config.General.instanceName : null,

View File

@ -88,8 +88,7 @@ const defaultOptions = [
{ name: 'disableTray', value: 'false', isSynced: false }, { name: 'disableTray', value: 'false', isSynced: false },
{ name: 'eraseUnusedAttachmentsAfterSeconds', value: '2592000', isSynced: true }, { name: 'eraseUnusedAttachmentsAfterSeconds', value: '2592000', isSynced: true },
{ name: 'customSearchEngineName', value: 'DuckDuckGo', isSynced: true }, { name: 'customSearchEngineName', value: 'DuckDuckGo', isSynced: true },
{ name: 'customSearchEngineUrl', value: 'https://duckduckgo.com/?q={keyword}', isSynced: true }, { name: 'customSearchEngineUrl', value: 'https://duckduckgo.com/?q={keyword}', isSynced: true }
{ name: 'hidePoweredByCKEditor', value: 'false', isSynced: true },
]; ];
function initStartupOptions() { function initStartupOptions() {

View File

@ -44,12 +44,6 @@
.note-split { .note-split {
max-width: <%= maxContentWidth %>px; max-width: <%= maxContentWidth %>px;
} }
<% if (hidePoweredByCKEditor) { %>
.ck-powered-by-balloon {
display: none !important;
}
<% } %>
</style> </style>
<!-- Required for correct loading of scripts in Electron --> <!-- Required for correct loading of scripts in Electron -->