summaryrefslogtreecommitdiff
path: root/src/static/js/ace.js
diff options
context:
space:
mode:
Diffstat (limited to 'src/static/js/ace.js')
-rw-r--r--src/static/js/ace.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index a5e365ce..ac288e6f 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -226,8 +226,13 @@ function Ace2Editor()
var includedCSS = [];
var $$INCLUDE_CSS = function(filename) {includedCSS.push(filename)};
$$INCLUDE_CSS("../static/css/iframe_editor.css");
- $$INCLUDE_CSS("../static/css/pad.css");
- $$INCLUDE_CSS("../static/custom/pad.css");
+
+ // disableCustomScriptsAndStyles can be used to disable loading of custom scripts
+ if(!clientVars.disableCustomScriptsAndStyles){
+ console.log("loading custom shit"); // cake remove me
+ $$INCLUDE_CSS("../static/css/pad.css");
+ $$INCLUDE_CSS("../static/custom/pad.css");
+ }
var additionalCSS = _(hooks.callAll("aceEditorCSS")).map(function(path){
if (path.match(/\/\//)) { // Allow urls to external CSS - http(s):// and //some/path.css