diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-05 10:19:54 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-05 10:19:54 +0200 |
| commit | bbf8acb383bdcb1dcb53f4b9d5a8d894b17401df (patch) | |
| tree | e6130262f0c7efea76135181b772c71eb76a080a /core | |
| parent | 49fd7e9f1e037266304053c7337c714339d82553 (diff) | |
| download | nextcloud-server-bbf8acb383bdcb1dcb53f4b9d5a8d894b17401df.tar.gz nextcloud-server-bbf8acb383bdcb1dcb53f4b9d5a8d894b17401df.zip | |
separate uploading code from progress code, add progress capability detection
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/oc-dialogs.js | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 5ed24417264..08afbfd42f2 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -257,13 +257,7 @@ var OCdialogs = { //TODO add to same size collection? } - //add checkbox toggling actions - conflict.find('.replacement,.original').on('click', function(){ - var checkbox = $(this).find('input[type="checkbox"]'); - checkbox.prop('checkbox', !checkbox.prop('checkbox')); - }).find('input[type="checkbox"]').prop('checkbox',false); - - //TODO show skip action for files with same size and mtime + //TODO show skip action for files with same size and mtime in bottom row }; var selection = controller.getSelection(data.originalFiles); @@ -345,11 +339,14 @@ var OCdialogs = { var checkboxes = $(dialog_id).find('.conflict:not(.template) .original input[type="checkbox"]'); checkboxes.prop('checked', $(this).prop('checked')); }); - $(dialog_id).find('.conflicts').on('click', '.replacement,.original', function() { var checkbox = $(this).find('input[type="checkbox"]'); checkbox.prop('checked', !checkbox.prop('checked')); }); + $(dialog_id).find('.conflicts').on('click', 'input[type="checkbox"]', function() { + var checkbox = $(this); + checkbox.prop('checked', !checkbox.prop('checked')); + }); //update counters $(dialog_id).on('click', '.replacement,.allnewfiles', function() { |