Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-20 15:30:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: ace

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2022-02-19 11:35:47 -05:00
parent 3b8f35a51d
commit a7fc159353
4 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
public/src/admin/appearance/customise.js
View File

@@ -1,6 +1,6 @@
'use strict'; 'use strict';
define('admin/appearance/customise', ['admin/settings', 'ace-editor'], function (Settings, ace) { define('admin/appearance/customise', ['admin/settings', 'ace/ace'], function (Settings, ace) {
const Customise = {}; const Customise = {};
Customise.init = function () { Customise.init = function () {
@@ -9,36 +9,9 @@ define('admin/appearance/customise', ['admin/settings', 'ace-editor'], function
$('#customJS').text($('#customJS-holder').val()); $('#customJS').text($('#customJS-holder').val());
$('#customHTML').text($('#customHTML-holder').val()); $('#customHTML').text($('#customHTML-holder').val());
const customCSS = ace.edit('customCSS'); initACE('customCSS', 'less', '#customCSS-holder');
const customJS = ace.edit('customJS'); initACE('customJS', 'javascript', '#customJS-holder');
const customHTML = ace.edit('customHTML'); initACE('customHTML', 'html', '#customHTML-holder');
customCSS.setTheme('ace/theme/twilight');
customCSS.getSession().setMode('ace/mode/less');
customCSS.on('change', function () {
app.flags = app.flags || {};
app.flags._unsaved = true;
$('#customCSS-holder').val(customCSS.getValue());
});
customJS.setTheme('ace/theme/twilight');
customJS.getSession().setMode('ace/mode/javascript');
customJS.on('change', function () {
app.flags = app.flags || {};
app.flags._unsaved = true;
$('#customJS-holder').val(customJS.getValue());
});
customHTML.setTheme('ace/theme/twilight');
customHTML.getSession().setMode('ace/mode/html');
customHTML.on('change', function () {
app.flags = app.flags || {};
app.flags._unsaved = true;
$('#customHTML-holder').val(customHTML.getValue());
});
$('#save').on('click', function () { $('#save').on('click', function () {
if ($('#enableLiveReload').is(':checked')) { if ($('#enableLiveReload').is(':checked')) {
@@ -48,5 +21,20 @@ define('admin/appearance/customise', ['admin/settings', 'ace-editor'], function
}); });
}; };
function initACE(aceElementId, mode, holder) {
var editorEl = ace.edit(aceElementId, {
mode: 'ace/mode/' + mode,
theme: 'ace/theme/twilight',
maxLines: 30,
minLines: 30,
fontSize: 14,
});
editorEl.on('change', function () {
app.flags = app.flags || {};
app.flags._unsaved = true;
$(holder).val(editorEl.getValue());
});
}
return Customise; return Customise;
}); });

2
public/src/admin/settings/email.js
View File

@@ -1,7 +1,7 @@
'use strict'; 'use strict';
define('admin/settings/email', ['alerts', 'admin/settings', 'ace-editor'], function (ace, alerts) { define('admin/settings/email', ['ace/ace', 'alerts', 'admin/settings'], function (ace, alerts) {
const module = {}; const module = {};
let emailEditor; let emailEditor;

2
public/src/modules/ace-editor.js
View File

@@ -1,4 +1,4 @@
import ace from 'ace-builds'; export * from 'ace-builds';
// only import the modes and theme we use // only import the modes and theme we use
import 'ace-builds/src-noconflict/mode-javascript'; import 'ace-builds/src-noconflict/mode-javascript';

1
webpack.common.js
View File

@@ -52,6 +52,7 @@ module.exports = {
Chart: path.resolve(__dirname, 'node_modules/chart.js'), Chart: path.resolve(__dirname, 'node_modules/chart.js'),
Sortable: path.resolve(__dirname, 'node_modules/sortablejs'), Sortable: path.resolve(__dirname, 'node_modules/sortablejs'),
'jquery-ui/widgets': path.resolve(__dirname, 'node_modules/jquery-ui/ui/widgets'), 'jquery-ui/widgets': path.resolve(__dirname, 'node_modules/jquery-ui/ui/widgets'),
'ace/ace': path.resolve(__dirname, 'build/public/src/modules/ace-editor.js'),
}, },
}, },
}; };