summaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
authorHendrik Leppelsack <hendrik@leppelsack.de>2015-09-19 15:44:49 +0200
committerHendrik Leppelsack <hendrik@leppelsack.de>2015-09-21 12:57:34 +0200
commit964cfc8e08467c93e18d78ab20f311d05b22eeb9 (patch)
tree06dd65d9da1d3dbd84d3d7551054625cb1c264fa /core/js
parent6006a03ef1361f8805c323627fb6d8e9c37be9cd (diff)
downloadnextcloud-server-964cfc8e08467c93e18d78ab20f311d05b22eeb9.tar.gz
nextcloud-server-964cfc8e08467c93e18d78ab20f311d05b22eeb9.zip
fix missing checkboxes in file comparator
Diffstat (limited to 'core/js')
-rw-r--r--core/js/oc-dialogs.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 52ed34f61ec..719ac8587a4 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -400,6 +400,11 @@ var OCdialogs = {
$replacementDiv.find('.icon').css('background-image','url(' + path + ')');
}
);
+ // connect checkboxes with labels
+ var checkboxId = $conflicts.find('.conflict').length;
+ $originalDiv.find('input:checkbox').attr('id', 'checkbox_original_'+checkboxId);
+ $replacementDiv.find('input:checkbox').attr('id', 'checkbox_replacement_'+checkboxId);
+
$conflicts.append($conflict);
//set more recent mtime bold