espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ace dark mode

Browse Source
This commit is contained in:
Yuri Kuznetsov
2021-12-24 15:29:26 +02:00
parent 05d3610f5f
commit 25508b932e
6 changed files with 57 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Resources/metadata/app/jsLibs.json
+6
View File
@@ -84,5 +84,11 @@
"devPath": "node_modules/ace-builds/src-noconflict/ext-language_tools.js",
"exportsTo": "ace.require.define.modules",
"exportsAs": "ace/ext/language_tools"
},
"ace-theme-pastel_on_dark": {
"path": "client/lib/ace-theme-pastel_on_dark.js",
"devPath": "node_modules/ace-builds/src-noconflict/theme-pastel_on_dark.js",
"exportsTo": "ace.require.define.modules",
"exportsAs": "ace/theme/pastel_on_dark"
}
}
application/Espo/Resources/metadata/themes/Dark.json
+2 -1
View File
@@ -17,5 +17,6 @@
"Meeting": "#6680b3",
"Call": "#a1404a",
"Task": "#5d8a55"
}
},
"isDark": true
}
application/Espo/Resources/metadata/themes/DarkVertical.json
+2 -1
View File
@@ -21,5 +21,6 @@
"Meeting": "#6680b3",
"Call": "#a1404a",
"Task": "#5d8a55"
}
},
"isDark": true
}
client/src/views/fields/complex-expression.js
+21 -14
View File
@@ -85,20 +85,21 @@ define('views/fields/complex-expression', 'views/fields/text', function (Dep) {
},
requireAce: function () {
return new Promise(resolve =>
Espo.loader.require('lib!ace', () =>
Promise
.all([
/*new Promise(resolve =>
Espo.loader.require('lib!ace-mode-javascript', () => resolve())
),*/
new Promise(resolve =>
Espo.loader.require('lib!ace-ext-language_tools', () => resolve())
),
])
.then(() => resolve())
)
);
return Espo.loader
.requirePromise('lib!ace')
.then(() => {
let list = [
Espo.loader.requirePromise('lib!ace-ext-language_tools'),
];
if (this.getThemeManager().getParam('isDark')) {
list.push(
Espo.loader.requirePromise('lib!ace-theme-pastel_on_dark')
);
}
return Promise.all(list);
});
},
data: function () {
@@ -133,6 +134,12 @@ define('views/fields/complex-expression', 'views/fields/text', function (Dep) {
maxLines: this.mode === 'edit' ? this.maxLineEditCount : this.maxLineDetailCount,
});
if (this.getThemeManager().getParam('isDark')) {
editor.setOptions({
theme: 'ace/theme/pastel_on_dark',
});
}
if (this.isEditMode()) {
editor.getSession().on('change', () => {
this.trigger('change', {ui: true});
client/src/views/fields/formula.js
+22 -14
View File
@@ -87,20 +87,22 @@ define('views/fields/formula', 'views/fields/text', function (Dep) {
},
requireAce: function () {
return new Promise(resolve =>
Espo.loader.require('lib!ace', () =>
Promise
.all([
new Promise(resolve =>
Espo.loader.require('lib!ace-mode-javascript', () => resolve())
),
new Promise(resolve =>
Espo.loader.require('lib!ace-ext-language_tools', () => resolve())
),
])
.then(() => resolve())
)
);
return Espo.loader
.requirePromise('lib!ace')
.then(() => {
let list = [
Espo.loader.requirePromise('lib!ace-mode-javascript'),
Espo.loader.requirePromise('lib!ace-ext-language_tools'),
];
if (this.getThemeManager().getParam('isDark')) {
list.push(
Espo.loader.requirePromise('lib!ace-theme-pastel_on_dark')
);
}
return Promise.all(list);
});
},
data: function () {
@@ -134,6 +136,12 @@ define('views/fields/formula', 'views/fields/text', function (Dep) {
maxLines: this.mode === 'edit' ? this.maxLineEditCount : this.maxLineDetailCount,
});
if (this.getThemeManager().getParam('isDark')) {
editor.setOptions({
theme: 'ace/theme/pastel_on_dark',
});
}
if (this.isEditMode()) {
editor.getSession().on('change', () => {
this.trigger('change', {ui: true});
frontend/libs.json
+4
View File
@@ -141,6 +141,10 @@
{
"src": "node_modules/ace-builds/src-noconflict/ext-language_tools.js",
"dest": "client/lib/ace-ext-language_tools.js"
},
{
"src": "node_modules/ace-builds/src-noconflict/theme-pastel_on_dark.js",
"dest": "client/lib/ace-theme-pastel_on_dark.js"
}
]
},