Revert "use codeflask for user css editor"
This reverts commit daa43e0572
.
This commit is contained in:
parent
6c9509ebae
commit
be49b77b14
|
@ -992,7 +992,12 @@ class Pref_Prefs extends Handler_Protected {
|
||||||
print_hidden("method", "setpref");
|
print_hidden("method", "setpref");
|
||||||
print_hidden("key", "USER_STYLESHEET");
|
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 "<div class='dlgButtons'>";
|
||||||
print "<button dojoType=\"dijit.form.Button\"
|
print "<button dojoType=\"dijit.form.Button\"
|
||||||
|
|
|
@ -1434,12 +1434,6 @@ body.ttrss_prefs #header img {
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
cursor: pointer;
|
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#filterTree .dijitTreeIcon,
|
||||||
body.ttrss_prefs .dijitTree#labelTree .dijitTreeIcon,
|
body.ttrss_prefs .dijitTree#labelTree .dijitTreeIcon,
|
||||||
body.ttrss_prefs .dijitTree#filterTree .dijitTreeIcon {
|
body.ttrss_prefs .dijitTree#filterTree .dijitTreeIcon {
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -28,14 +28,6 @@ body.ttrss_prefs {
|
||||||
cursor : pointer;
|
cursor : pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
#user-css-editor {
|
|
||||||
height : 300px;
|
|
||||||
|
|
||||||
.codeflask {
|
|
||||||
position : relative;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.dijitTree#filterTree .dijitTreeIcon,
|
.dijitTree#filterTree .dijitTreeIcon,
|
||||||
.dijitTree#labelTree .dijitTreeIcon,
|
.dijitTree#labelTree .dijitTreeIcon,
|
||||||
.dijitTree#filterTree .dijitTreeIcon {
|
.dijitTree#filterTree .dijitTreeIcon {
|
||||||
|
|
|
@ -103,8 +103,6 @@ define(["dojo/_base/declare"], function (declare) {
|
||||||
dialog.show();
|
dialog.show();
|
||||||
},
|
},
|
||||||
customizeCSS: function() {
|
customizeCSS: function() {
|
||||||
require(["codeflask"], function(CodeFlask) {
|
|
||||||
|
|
||||||
const query = "backend.php?op=pref-prefs&method=customizeCSS";
|
const query = "backend.php?op=pref-prefs&method=customizeCSS";
|
||||||
|
|
||||||
if (dijit.byId("cssEditDlg"))
|
if (dijit.byId("cssEditDlg"))
|
||||||
|
@ -117,10 +115,7 @@ define(["dojo/_base/declare"], function (declare) {
|
||||||
execute: function () {
|
execute: function () {
|
||||||
Notify.progress('Saving data...', true);
|
Notify.progress('Saving data...', true);
|
||||||
|
|
||||||
const params = this.attr('value');
|
xhrPost("backend.php", this.attr('value'), () => {
|
||||||
params.value = this._flask.getCode();
|
|
||||||
|
|
||||||
xhrPost("backend.php", params, () => {
|
|
||||||
window.location.reload();
|
window.location.reload();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -128,14 +123,7 @@ define(["dojo/_base/declare"], function (declare) {
|
||||||
href: query
|
href: query
|
||||||
});
|
});
|
||||||
|
|
||||||
dojo.connect(dialog, "onShow", function () {
|
|
||||||
setTimeout(() => {
|
|
||||||
dialog._flask = new CodeFlask('#user-css-editor', {language: 'css'});
|
|
||||||
}, 250);
|
|
||||||
});
|
|
||||||
|
|
||||||
dialog.show();
|
dialog.show();
|
||||||
});
|
|
||||||
},
|
},
|
||||||
confirmReset: function() {
|
confirmReset: function() {
|
||||||
if (confirm(__("Reset to defaults?"))) {
|
if (confirm(__("Reset to defaults?"))) {
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -59,9 +59,6 @@
|
||||||
packages: [
|
packages: [
|
||||||
{ name: "lib", location: "../" },
|
{ name: "lib", location: "../" },
|
||||||
{ name: "fox", location: "../../js" },
|
{ name: "fox", location: "../../js" },
|
||||||
],
|
|
||||||
aliases: [
|
|
||||||
[ "codeflask", "lib/codeflask.min.js" ]
|
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -1434,12 +1434,6 @@ body.ttrss_prefs #header img {
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
cursor: pointer;
|
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#filterTree .dijitTreeIcon,
|
||||||
body.ttrss_prefs .dijitTree#labelTree .dijitTreeIcon,
|
body.ttrss_prefs .dijitTree#labelTree .dijitTreeIcon,
|
||||||
body.ttrss_prefs .dijitTree#filterTree .dijitTreeIcon {
|
body.ttrss_prefs .dijitTree#filterTree .dijitTreeIcon {
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue