Revert "use codeflask for user css editor"

This reverts commit daa43e0572.
This commit is contained in:
Andrew Dolgov 2018-12-11 20:48:17 +03:00
parent 6c9509ebae
commit be49b77b14
9 changed files with 24 additions and 55 deletions

View File

@ -992,7 +992,12 @@ class Pref_Prefs extends Handler_Protected {
print_hidden("method", "setpref");
print_hidden("key", "USER_STYLESHEET");
print "<div class='panel' id='user-css-editor'>$value</div>";
print "<table width='100%'><tr><td>";
print "<textarea dojoType=\"dijit.form.SimpleTextarea\"
style='font-size : 12px; width : 98%; height: 200px;'
placeHolder='body#ttrssMain { font-size : 14px; };'
name='value'>$value</textarea>";
print "</td></tr></table>";
print "<div class='dlgButtons'>";
print "<button dojoType=\"dijit.form.Button\"

View File

@ -1434,12 +1434,6 @@ body.ttrss_prefs #header img {
vertical-align: middle;
cursor: pointer;
}
body.ttrss_prefs #user-css-editor {
height: 300px;
}
body.ttrss_prefs #user-css-editor .codeflask {
position: relative;
}
body.ttrss_prefs .dijitTree#filterTree .dijitTreeIcon,
body.ttrss_prefs .dijitTree#labelTree .dijitTreeIcon,
body.ttrss_prefs .dijitTree#filterTree .dijitTreeIcon {

File diff suppressed because one or more lines are too long

View File

@ -28,14 +28,6 @@ body.ttrss_prefs {
cursor : pointer;
}
#user-css-editor {
height : 300px;
.codeflask {
position : relative;
}
}
.dijitTree#filterTree .dijitTreeIcon,
.dijitTree#labelTree .dijitTreeIcon,
.dijitTree#filterTree .dijitTreeIcon {

View File

@ -103,8 +103,6 @@ define(["dojo/_base/declare"], function (declare) {
dialog.show();
},
customizeCSS: function() {
require(["codeflask"], function(CodeFlask) {
const query = "backend.php?op=pref-prefs&method=customizeCSS";
if (dijit.byId("cssEditDlg"))
@ -117,10 +115,7 @@ define(["dojo/_base/declare"], function (declare) {
execute: function () {
Notify.progress('Saving data...', true);
const params = this.attr('value');
params.value = this._flask.getCode();
xhrPost("backend.php", params, () => {
xhrPost("backend.php", this.attr('value'), () => {
window.location.reload();
});
@ -128,14 +123,7 @@ define(["dojo/_base/declare"], function (declare) {
href: query
});
dojo.connect(dialog, "onShow", function () {
setTimeout(() => {
dialog._flask = new CodeFlask('#user-css-editor', {language: 'css'});
}, 250);
});
dialog.show();
});
},
confirmReset: function() {
if (confirm(__("Reset to defaults?"))) {

File diff suppressed because one or more lines are too long

View File

@ -59,9 +59,6 @@
packages: [
{ name: "lib", location: "../" },
{ name: "fox", location: "../../js" },
],
aliases: [
[ "codeflask", "lib/codeflask.min.js" ]
]
};
</script>

View File

@ -1434,12 +1434,6 @@ body.ttrss_prefs #header img {
vertical-align: middle;
cursor: pointer;
}
body.ttrss_prefs #user-css-editor {
height: 300px;
}
body.ttrss_prefs #user-css-editor .codeflask {
position: relative;
}
body.ttrss_prefs .dijitTree#filterTree .dijitTreeIcon,
body.ttrss_prefs .dijitTree#labelTree .dijitTreeIcon,
body.ttrss_prefs .dijitTree#filterTree .dijitTreeIcon {

File diff suppressed because one or more lines are too long