mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ace.js: prioritize the skin style over the plugin style

Browse source 
Preparatory work for introducing colibris skin
This commit is contained in:
Sebastian Castro 2018-11-08 21:55:34 +01:00
parent 8a6eae26d7
commit 4115f792e4
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/static/js/ace.js
View file

@ -230,7 +230,6 @@ function Ace2Editor()
// disableCustomScriptsAndStyles can be used to disable loading of custom scripts // disableCustomScriptsAndStyles can be used to disable loading of custom scripts
if(!clientVars.disableCustomScriptsAndStyles){ if(!clientVars.disableCustomScriptsAndStyles){
$$INCLUDE_CSS("../static/css/pad.css"); $$INCLUDE_CSS("../static/css/pad.css");
$$INCLUDE_CSS("../static/skins/" + clientVars.skinName + "/pad.css");
} }
var additionalCSS = _(hooks.callAll("aceEditorCSS")).map(function(path){ var additionalCSS = _(hooks.callAll("aceEditorCSS")).map(function(path){
@ -240,6 +239,7 @@ function Ace2Editor()
return '../static/plugins/' + path; return '../static/plugins/' + path;
}); });
includedCSS = includedCSS.concat(additionalCSS); includedCSS = includedCSS.concat(additionalCSS);
$$INCLUDE_CSS("../static/skins/" + clientVars.skinName + "/pad.css");
pushStyleTagsFor(iframeHTML, includedCSS); pushStyleTagsFor(iframeHTML, includedCSS);
@ -314,7 +314,6 @@ window.onload = function () {\n\
var $$INCLUDE_CSS = function(filename) {includedCSS.push(filename)}; var $$INCLUDE_CSS = function(filename) {includedCSS.push(filename)};
$$INCLUDE_CSS("../static/css/iframe_editor.css"); $$INCLUDE_CSS("../static/css/iframe_editor.css");
$$INCLUDE_CSS("../static/css/pad.css"); $$INCLUDE_CSS("../static/css/pad.css");
$$INCLUDE_CSS("../static/skins/" + clientVars.skinName + "/pad.css");
var additionalCSS = _(hooks.callAll("aceEditorCSS")).map(function(path){ var additionalCSS = _(hooks.callAll("aceEditorCSS")).map(function(path){
@ -324,6 +323,7 @@ window.onload = function () {\n\
return '../static/plugins/' + path } return '../static/plugins/' + path }
); );
includedCSS = includedCSS.concat(additionalCSS); includedCSS = includedCSS.concat(additionalCSS);
$$INCLUDE_CSS("../static/skins/" + clientVars.skinName + "/pad.css");
pushStyleTagsFor(outerHTML, includedCSS); pushStyleTagsFor(outerHTML, includedCSS);