mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

simplify conflict template handling, fix reopen after ESC

This commit is contained in:
Jörn Friedrich Dreyer 2013-09-18 17:22:29 +02:00
parent 12ff268e60
commit 7bd5e89f8c
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/templates/fileexists.html
View File

@ -7,7 +7,7 @@
<th><label><input class="allexistingfiles" type="checkbox" />Already existing files<span class="count"></span></label></th> <th><label><input class="allexistingfiles" type="checkbox" />Already existing files<span class="count"></span></label></th>
</table> </table>
<div class="conflicts"> <div class="conflicts">
<div class="conflict template"> <div class="template">
<div class="filename"></div> <div class="filename"></div>
<div class="replacement"> <div class="replacement">
<input type="checkbox" /> <input type="checkbox" />

22
core/js/oc-dialogs.js
View File

@ -281,7 +281,7 @@ var OCdialogs = {
var addConflict = function(conflicts, original, replacement) { var addConflict = function(conflicts, original, replacement) {
var conflict = conflicts.find('.conflict.template').clone(); var conflict = conflicts.find('.template').clone().removeClass('template').addClass('conflict');
conflict.data('data',data); conflict.data('data',data);
@ -306,7 +306,6 @@ var OCdialogs = {
}); });
} }
); );
conflict.removeClass('template');
conflicts.append(conflict); conflicts.append(conflict);
//set more recent mtime bold //set more recent mtime bold
@ -343,7 +342,7 @@ var OCdialogs = {
var conflicts = $(dialog_id+ ' .conflicts'); var conflicts = $(dialog_id+ ' .conflicts');
addConflict(conflicts, original, replacement); addConflict(conflicts, original, replacement);
var title = t('files','{count} file conflicts',{count:$(dialog_id+ ' .conflict:not(.template)').length}); var title = t('files','{count} file conflicts',{count:$(dialog_id+ ' .conflict').length});
$(dialog_id).parent().children('.oc-dialog-title').text(title); $(dialog_id).parent().children('.oc-dialog-title').text(title);
//recalculate dimensions //recalculate dimensions
@ -371,7 +370,6 @@ var OCdialogs = {
text: t('core', 'Cancel'), text: t('core', 'Cancel'),
classes: 'cancel', classes: 'cancel',
click: function(){ click: function(){
self._fileexistsshown = false;
if ( typeof controller.onCancel !== 'undefined') { if ( typeof controller.onCancel !== 'undefined') {
controller.onCancel(data); controller.onCancel(data);
} }
@ -382,9 +380,8 @@ var OCdialogs = {
text: t('core', 'Continue'), text: t('core', 'Continue'),
classes: 'continue', classes: 'continue',
click: function(){ click: function(){
self._fileexistsshown = false;
if ( typeof controller.onContinue !== 'undefined') { if ( typeof controller.onContinue !== 'undefined') {
controller.onContinue($(dialog_id + ' .conflict:not(.template)')); controller.onContinue($(dialog_id + ' .conflict'));
} }
$(dialog_id).ocdialog('close'); $(dialog_id).ocdialog('close');
} }
@ -397,6 +394,7 @@ var OCdialogs = {
buttons: buttonlist, buttons: buttonlist,
closeButton: null, closeButton: null,
close: function(event, ui) { close: function(event, ui) {
self._fileexistsshown = false;
$(this).ocdialog('destroy').remove(); $(this).ocdialog('destroy').remove();
} }
}); });
@ -405,11 +403,11 @@ var OCdialogs = {
//add checkbox toggling actions //add checkbox toggling actions
$(dialog_id).find('.allnewfiles').on('click', function() { $(dialog_id).find('.allnewfiles').on('click', function() {
var checkboxes = $(dialog_id).find('.conflict:not(.template) .replacement input[type="checkbox"]'); var checkboxes = $(dialog_id).find('.conflict .replacement input[type="checkbox"]');
checkboxes.prop('checked', $(this).prop('checked')); checkboxes.prop('checked', $(this).prop('checked'));
}); });
$(dialog_id).find('.allexistingfiles').on('click', function() { $(dialog_id).find('.allexistingfiles').on('click', function() {
var checkboxes = $(dialog_id).find('.conflict:not(.template) .original input[type="checkbox"]'); var checkboxes = $(dialog_id).find('.conflict .original input[type="checkbox"]');
checkboxes.prop('checked', $(this).prop('checked')); checkboxes.prop('checked', $(this).prop('checked'));
}); });
$(dialog_id).find('.conflicts').on('click', '.replacement,.original', function() { $(dialog_id).find('.conflicts').on('click', '.replacement,.original', function() {
@ -423,8 +421,8 @@ var OCdialogs = {
//update counters //update counters
$(dialog_id).on('click', '.replacement,.allnewfiles', function() { $(dialog_id).on('click', '.replacement,.allnewfiles', function() {
var count = $(dialog_id).find('.conflict:not(.template) .replacement input[type="checkbox"]:checked').length; var count = $(dialog_id).find('.conflict .replacement input[type="checkbox"]:checked').length;
if (count === $(dialog_id+ ' .conflict:not(.template)').length) { if (count === $(dialog_id+ ' .conflict').length) {
$(dialog_id).find('.allnewfiles').prop('checked', true); $(dialog_id).find('.allnewfiles').prop('checked', true);
$(dialog_id).find('.allnewfiles + .count').text(t('files','(all selected)')); $(dialog_id).find('.allnewfiles + .count').text(t('files','(all selected)'));
} else if (count > 0) { } else if (count > 0) {
@ -436,8 +434,8 @@ var OCdialogs = {
} }
}); });
$(dialog_id).on('click', '.original,.allexistingfiles', function(){ $(dialog_id).on('click', '.original,.allexistingfiles', function(){
var count = $(dialog_id).find('.conflict:not(.template) .original input[type="checkbox"]:checked').length; var count = $(dialog_id).find('.conflict .original input[type="checkbox"]:checked').length;
if (count === $(dialog_id+ ' .conflict:not(.template)').length) { if (count === $(dialog_id+ ' .conflict').length) {
$(dialog_id).find('.allexistingfiles').prop('checked', true); $(dialog_id).find('.allexistingfiles').prop('checked', true);
$(dialog_id).find('.allexistingfiles + .count').text(t('files','(all selected)')); $(dialog_id).find('.allexistingfiles + .count').text(t('files','(all selected)'));
} else if (count > 0) { } else if (count > 0) {