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

admin_interface/static/admin/js/cancel.js

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

admin_interface/static/admin/js/popup_response.js

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

admin_interface/static/admin_interface/related-modal/related-modal.js

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