Fix OO CSP cache

This commit is contained in:
yflory 2020-10-13 10:30:01 +02:00
parent 6e57366b7f
commit a7f747bd54
2 changed files with 3 additions and 3 deletions

View file

@ -408,7 +408,7 @@ define([
myUniqueOOId = undefined; myUniqueOOId = undefined;
setMyId(); setMyId();
if (APP.docEditor) { APP.docEditor.destroyEditor(); } // Kill the old editor if (APP.docEditor) { APP.docEditor.destroyEditor(); } // Kill the old editor
$('iframe[name="frameEditor"]').after(h('div#cp-app-oo-placeholder')).remove(); $('iframe[name="frameEditor"]').after(h('div#cp-app-oo-placeholder-a')).remove();
ooLoaded = false; ooLoaded = false;
oldLocks = {}; oldLocks = {};
Object.keys(pendingChanges).forEach(function (key) { Object.keys(pendingChanges).forEach(function (key) {
@ -1406,7 +1406,7 @@ define([
}); });
}; };
APP.docEditor = new window.DocsAPI.DocEditor("cp-app-oo-placeholder", APP.ooconfig); APP.docEditor = new window.DocsAPI.DocEditor("cp-app-oo-placeholder-a", APP.ooconfig);
ooLoaded = true; ooLoaded = true;
makeChannel(); makeChannel();
}; };

View file

@ -11,7 +11,7 @@
<div id="cp-toolbar" class="cp-toolbar-container"></div> <div id="cp-toolbar" class="cp-toolbar-container"></div>
<div id="cp-app-oo-container"> <div id="cp-app-oo-container">
<div id="cp-app-oo-editor"> <div id="cp-app-oo-editor">
<div id="cp-app-oo-placeholder"></div> <div id="cp-app-oo-placeholder-a"></div>
<!--<script type="text/javascript" src="/common/onlyoffice/web-apps/apps/api/documents/api.js"></script>--> <!--<script type="text/javascript" src="/common/onlyoffice/web-apps/apps/api/documents/api.js"></script>-->
</div> </div>
</div> </div>