NoLog.cz/etherpad
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

assets: also use cache busting via query string in files imported from acs.js

Browse source 
Before this change, a client would require two versions of the same assets (with
and without randomVersionString), wasting resources and triggering all sorts of
hard to debug inconsistencies.

This change should have been part of 95fd5ce2a4 and completes it.
This commit is contained in:
muxator 2020-05-14 01:54:57 +02:00 committed by muxator
parent edfc7a4916
commit 6dd9e9adc8
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/node/handler/PadMessageHandler.js
View file

@ -1076,6 +1076,7 @@ async function handleClientReady(client, message)
var clientVars = {
"skinName": settings.skinName,
"skinVariants": settings.skinVariants,
"randomVersionString": settings.randomVersionString,
"accountPrivs": {
"maxRevisions": 100
},

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

@ -237,7 +237,7 @@ function Ace2Editor()
// disableCustomScriptsAndStyles can be used to disable loading of custom scripts
if(!clientVars.disableCustomScriptsAndStyles){
$$INCLUDE_CSS("../static/css/pad.css");
$$INCLUDE_CSS("../static/css/pad.css?v=" + clientVars.randomVersionString);
}
var additionalCSS = _(hooks.callAll("aceEditorCSS")).map(function(path){
@ -247,7 +247,7 @@ function Ace2Editor()
return '../static/plugins/' + path;
});
includedCSS = includedCSS.concat(additionalCSS);
$$INCLUDE_CSS("../static/skins/" + clientVars.skinName + "/pad.css");
$$INCLUDE_CSS("../static/skins/" + clientVars.skinName + "/pad.css?v=" + clientVars.randomVersionString);
pushStyleTagsFor(iframeHTML, includedCSS);
@ -321,7 +321,7 @@ window.onload = function () {\n\
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/css/pad.css?v=" + clientVars.randomVersionString);
var additionalCSS = _(hooks.callAll("aceEditorCSS")).map(function(path){
@ -331,7 +331,7 @@ window.onload = function () {\n\
return '../static/plugins/' + path }
);
includedCSS = includedCSS.concat(additionalCSS);
$$INCLUDE_CSS("../static/skins/" + clientVars.skinName + "/pad.css");
$$INCLUDE_CSS("../static/skins/" + clientVars.skinName + "/pad.css?v=" + clientVars.randomVersionString);
pushStyleTagsFor(outerHTML, includedCSS);