Fixed #42 - Related modal does not dismiss on popup response.

pull/49/head
Fabio Caccamo 2018-10-24 17:27:42 +02:00
parent cf76fd412e
commit 3f7b1e54e9
3 changed files with 27 additions and 20 deletions

View File

@ -1,16 +1,24 @@
(function($) {
'use strict';
$(function() {
$('.cancel-link').click(function(e) {
e.preventDefault();
var parentWindow = window.parent;
if (parentWindow && typeof(parentWindow.dismissRelatedObjectModal) === 'function') {
parentWindow.dismissRelatedObjectModal();
} else {
// fallback to default behavior
history.back();
}
return false;
if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
{
(function($) {
'use strict';
$(document).ready(function() {
$('.cancel-link').click(function(e) {
e.preventDefault();
var parentWindow = window.parent;
if (parentWindow && typeof(parentWindow.dismissRelatedObjectModal) === 'function') {
parentWindow.dismissRelatedObjectModal();
} else {
// fallback to default behavior
history.back();
}
return false;
});
});
});
})(django.jQuery);
})(django.jQuery);
}

View File

@ -1,5 +1,5 @@
/* global opener */
(function($) {
(function() {
'use strict';
function getModalWindowData()
@ -48,5 +48,5 @@
}
break;
}
})(django.jQuery);
})();

View File

@ -129,5 +129,4 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
});
})(django.jQuery);
}
}