From cba1aae0736c0b1022561a8834a008496711c67a Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Thu, 8 Oct 2015 12:27:33 +0200 Subject: [PATCH] Disable "Continue" button in conflict dialog when no selection --- core/js/oc-dialogs.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 7af50c4ddf..b5c87084e2 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -601,6 +601,14 @@ var OCdialogs = { $(dialogId).css('height','auto'); + var $primaryButton = $dlg.closest('.oc-dialog').find('button.continue'); + $primaryButton.prop('disabled', true); + + function updatePrimaryButton() { + var checkedCount = $dlg.find('th .checkbox:checked').length; + $primaryButton.prop('disabled', checkedCount === 0); + } + //add checkbox toggling actions $(dialogId).find('.allnewfiles').on('click', function() { var $checkboxes = $(dialogId).find('.conflict .replacement input[type="checkbox"]'); @@ -632,6 +640,7 @@ var OCdialogs = { $(dialogId).find('.allnewfiles').prop('checked', false); $(dialogId).find('.allnewfiles + .count').text(''); } + updatePrimaryButton(); }); $(dialogId).on('click', '.original,.allexistingfiles', function(){ var count = $(dialogId).find('.conflict .original input[type="checkbox"]:checked').length; @@ -646,7 +655,9 @@ var OCdialogs = { $(dialogId).find('.allexistingfiles').prop('checked', false); $(dialogId).find('.allexistingfiles + .count').text(''); } + updatePrimaryButton(); }); + dialogDeferred.resolve(); }) .fail(function() {