extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

* SmallPART: fix not working LTI launch after last maintenance release

Browse Source 
checking if we are about to load required files, before redirecting to cd=popup to load them
This commit is contained in:
Ralf Becker 2020-10-22 10:00:13 +02:00
parent b1275dd2da
commit 765b545697
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/js/jsapi/egw.js
View File

@ -105,6 +105,8 @@
} }
else if (debug) console.log('found injected egw object'); else if (debug) console.log('found injected egw object');
var include = JSON.parse(egw_script.getAttribute('data-include')) || [];
// check for a framework object // check for a framework object
if (typeof window.framework == 'undefined') if (typeof window.framework == 'undefined')
{ {
@ -130,12 +132,14 @@
// ignore SecurityError exception if top is different security context / cross-origin // ignore SecurityError exception if top is different security context / cross-origin
} }
// if framework not found, but requested to check for it, redirect to cd=yes to create it // if framework not found, but requested to check for it, redirect to cd=yes to create it
var check_framework = egw_script.getAttribute('data-check-framework');
if (typeof window.framework == 'undefined' && if (typeof window.framework == 'undefined' &&
!window.location.pathname.match(/\/login.php/) && // not for login page !window.location.pathname.match(/\/(smallpart\/|login.php)/) && // not for login page
!window.location.search.match(/[&?]cd=/)) !window.location.search.match(/[&?]cd=/) &&
// for popups check if required files are not about to be loaded (saved additional redirect and fixes LTI launches)
(check_framework || include.filter(function(_uri){return _uri.match(/api\/(config|user)\.php/);}).length < 2))
{ {
window.location.search += (window.location.search ? "&" : "?")+ window.location.search += (window.location.search ? "&" : "?")+(check_framework ? "cd=yes" : "cd=popup");
(egw_script.getAttribute('data-check-framework') ? "cd=yes" : "cd=popup");
} }
} }
try { try {
@ -162,7 +166,6 @@
} }
window.egw_LAB = $LAB.setOptions({AlwaysPreserveOrder:true,BasePath:window.egw_webserverUrl+'/'}); window.egw_LAB = $LAB.setOptions({AlwaysPreserveOrder:true,BasePath:window.egw_webserverUrl+'/'});
var include = JSON.parse(egw_script.getAttribute('data-include'));
window.egw_LAB.script(include).wait(function() window.egw_LAB.script(include).wait(function()
{ {
// We need to override the globalEval to mitigate potential execution of // We need to override the globalEval to mitigate potential execution of