From: Errietta Kostala Date: Tue, 30 Jun 2015 12:20:46 +0000 (+0000) Subject: Don't show merge option for detach X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8f6a090156b798530c69d925664637557ea7342f;p=scpubgit%2Fstemmaweb.git Don't show merge option for detach --- diff --git a/root/js/relationship.js b/root/js/relationship.js index fe9f624..7088831 100644 --- a/root/js/relationship.js +++ b/root/js/relationship.js @@ -1387,6 +1387,20 @@ $(document).ready(function () { mybuttons[1].id = 'detach_btn'; mybuttons[2].id = 'merge_btn'; + + if ($('#action-merge')[0].checked) { + $('#detach_collated_form').hide(); + $('#multipleselect-form-text').hide(); + + $('#detach_btn').hide(); + $('#merge_btn').show(); + } else { + $('#detach_collated_form').show(); + $('#multipleselect-form-text').show(); + + $('#detach_btn').show(); + $('#merge_btn').hide(); + } }, close: function() { marquee.unselect();