sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19645 from owncloud/file-conflict-disablecontinue 

Disable "Continue" button in conflict dialog when no selection
remotes/origin/dropbox-use-clientmtime
Thomas Müller 2015-10-14 12:39:37 +07:00
parent f34b97bc98 3c005bc020
commit a83e003ae3
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/js/oc-dialogs.js
Unescape Escape View File

@ -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('.conflicts .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() {