feature(terminal) move out terminal.css from view.css

This commit is contained in:
coderaiser 2018-06-22 16:43:41 +03:00
parent 15e5fb6951
commit dc781447a8
3 changed files with 20 additions and 13 deletions

View file

@ -19,6 +19,7 @@ const cssNames = [
'nojs',
'view',
'config',
'terminal',
...getCSSList('columns'),
];
@ -33,7 +34,7 @@ const cssLoader = isDev ? 'css-loader' : 'css-loader?minimize';
const rules = [{
test: /\.css$/,
exclude: /css\/(nojs|view|config|columns.*)\.css/,
exclude: /css\/(nojs|view|config|terminal|columns.*)\.css/,
use: extractMain.extract([
cssLoader,
]),

View file

@ -3,6 +3,7 @@
/* global CloudCmd, gritty */
const {promisify} = require('es6-promisify');
const tryToCatch = require('try-to-catch');
require('../../css/terminal.css');
@ -11,6 +12,8 @@ const load = require('../dom/load');
const DOM = require('../dom');
const Images = require('../dom/images');
const loadParallel = promisify(load.parallel);
const TITLE = 'Terminal';
const {Dialog} = DOM;
@ -24,18 +27,22 @@ let Terminal;
const {config} = CloudCmd;
const loadAll = promisify((callback) => {
const prefix = getPrefix();
const url = prefix + '/gritty.js';
const loadAll = async () => {
const {
PREFIX,
} = CloudCmd;
DOM.load.js(url, (error) => {
if (error)
return Dialog.alert(TITLE, error.message);
Loaded = true;
exec(callback);
});
});
const prefix = getPrefix();
const js = `${prefix}/gritty.js`;
const css = `${PREFIX}/dist/terminal.css`;
const [e] = await tryToCatch(loadParallel, [js, css]);
if (e)
return Dialog.alert(TITLE, e.message);
Loaded = true;
};
module.exports.init = async () => {
Images.show.load('top');

View file

@ -5,5 +5,4 @@
@import './help.css';
@import './query.css';
@import './supports.css';
@import './terminal.css';