mirror/php-web-maker
1
0
Fork 0
mirror of https://github.com/chinchang/web-maker.git synced 2025-07-13 10:06:23 +02:00
Code Issues Releases Wiki Activity

fixes for acss config. fixes #109

Browse Source
This commit is contained in:
Kushagra Gour
2017-09-16 19:26:54 +05:30
parent 99800a728c
commit afd491b543
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/script.js
View File

@ -781,20 +781,24 @@ customEditorFontInput, cssSettingsModal, cssSettingsBtn, acssSettingsTextarea
d.resolve(result);
});
} else if (cssMode === CssModes.ACSS) {
const html = scope.cm.html.getValue();
const foundClasses = atomizer.findClassNames(html);
var finalConfig;
try {
finalConfig = atomizer.getConfig(
foundClasses,
JSON.parse(scope.acssSettingsCm.getValue())
);
} catch (e) {
finalConfig = atomizer.getConfig(foundClasses, {});
if (!window.atomizer) {
d.resolve('');
} else {
const html = scope.cm.html.getValue();
const foundClasses = atomizer.findClassNames(html);
var finalConfig;
try {
finalConfig = atomizer.getConfig(
foundClasses,
JSON.parse(scope.acssSettingsCm.getValue())
);
} catch (e) {
finalConfig = atomizer.getConfig(foundClasses, {});
}
const acss = atomizer.getCss(finalConfig);
scope.cm.css.setValue(acss);
d.resolve(acss);
}
const acss = atomizer.getCss(finalConfig);
scope.cm.css.setValue(acss);
d.resolve(acss);
}
return d.promise;
@ -1872,6 +1876,11 @@ customEditorFontInput, cssSettingsModal, cssSettingsBtn, acssSettingsTextarea
scope.openCssSettingsModal = function() {
scope.toggleModal(cssSettingsModal);
setTimeout(() => {
// Refresh is required because codemirror gets scaled inside modal and loses alignement.
scope.acssSettingsCm.refresh();
scope.acssSettingsCm.focus();
}, 500);
};
function init() {