Bug 1690232: Comments link on retractable block failing to open modal

Actually the modal is opening and closing in the same instant.

This is caused by some code dealing with collapsible blocks making
sure modals are closed if outside certain rules.

This change checks what modal we are wanting and closing all but the
one are targeting when clicking the 'comments' link

behatnotneeded

Sponsored by SWITCH

Change-Id: Idb5165bdc8349f77286aa776ff75d152968aefda
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 5ce66781)

htdocs/theme/raw/js/theme.js

@@ -219,8 +219,12 @@ jQuery(function($) {
     $('.block.collapse').on('click',function(e) {
         var dialog = $('.modal-dialog'),
             dialogParent = $(e.target).closest('.modal-dialog').length;
-
-        if(e.target !== dialog && !dialogParent){
+        // If we have a link to a comments dialog within a collapsible block
+        // We need to close all of them except for the one we just
+        // clicked for
+        var collapseModalTarget = $(e.target).data('target');
+        var wantedDialog = $(collapseModalTarget);
+        if (e.target !== dialog && !wantedDialog.length && !dialogParent) {
             $(this).find('button.close').trigger('click');
         }
     });