Merge branch 'MDL-60549-master' of https://github.com/davidknu/moodle

This commit is contained in:
Andrew Nicols 2018-01-16 10:08:26 +08:00
commit 5705fd0907
3 changed files with 5 additions and 1 deletions

View File

@ -1 +1 @@
define(["jquery"],function(a){return{init:function(b){a(window).ready(function(){window!=top&&parent.processContentItemReturnData(b)})}}});
define(["jquery"],function(a){return{init:function(b){a(window).ready(function(){window!=top?parent.processContentItemReturnData(b):window.processContentItemReturnData(b)})}}});

View File

@ -36,6 +36,8 @@ define(['jquery'], function($) {
if (window != top) {
// Send return data to be processed by the parent window.
parent.processContentItemReturnData(returnData);
} else {
window.processContentItemReturnData(returnData);
}
});
}

View File

@ -119,6 +119,8 @@ if (!empty($errormsg)) {
//<![CDATA[
if(window != top){
top.location.href = '{$url}';
} else {
window.location.href = '{$url}';
}
//]]
</script>