From f54553d13bb16f61107c7bf20729980e8d93d6c2 Mon Sep 17 00:00:00 2001 From: msilvers Date: Fri, 7 Aug 2015 02:00:13 -0400 Subject: [PATCH] file explorer modifications file explorer - change to use checkboxes; toggle multiselect and use of checkbox based on dialog context --- Duplicati/Server/webroot/greeno/scripts/editdialog.js | 1 + Duplicati/Server/webroot/greeno/scripts/folderbrowser.js | 6 +++++- Duplicati/Server/webroot/greeno/scripts/plugins.js | 1 + Duplicati/Server/webroot/greeno/scripts/restoredialog.js | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Duplicati/Server/webroot/greeno/scripts/editdialog.js b/Duplicati/Server/webroot/greeno/scripts/editdialog.js index da38c6513..f931fa5e4 100644 --- a/Duplicati/Server/webroot/greeno/scripts/editdialog.js +++ b/Duplicati/Server/webroot/greeno/scripts/editdialog.js @@ -827,6 +827,7 @@ $(document).ready(function() { var browsePath = function() { $.browseForFolder({ title: 'Select folder to back up', + multiSelect: true, callback: function(path, disp) { disp = (disp || path).split(dirSep); addSourceFolder(path, disp[disp.length - 1]); diff --git a/Duplicati/Server/webroot/greeno/scripts/folderbrowser.js b/Duplicati/Server/webroot/greeno/scripts/folderbrowser.js index 7595b3e70..ac42030bd 100644 --- a/Duplicati/Server/webroot/greeno/scripts/folderbrowser.js +++ b/Duplicati/Server/webroot/greeno/scripts/folderbrowser.js @@ -20,6 +20,7 @@ $(document).ready(function() { self.rootel.attr('title', config.title); self.resolvePath = config.resolvePath; + self.multiSelect = config.multiSelect; self.loadData = function(path, callback) { $.ajax({ @@ -88,9 +89,12 @@ $(document).ready(function() { } else { self.loadData(node.original.filepath, callback); } - } + }, + 'multiple' : self.multiSelect }, 'dnd': { copy: false }, + 'checkbox' : { visible: self.multiSelect, three_state: self.multiSelect }, + 'plugins': ["checkbox"] }); self.rootel.dialog({ diff --git a/Duplicati/Server/webroot/greeno/scripts/plugins.js b/Duplicati/Server/webroot/greeno/scripts/plugins.js index 30b9976b5..77b2e527c 100644 --- a/Duplicati/Server/webroot/greeno/scripts/plugins.js +++ b/Duplicati/Server/webroot/greeno/scripts/plugins.js @@ -75,6 +75,7 @@ $(document).ready(function() { this.btnel.click(function() { $.browseForFolder({ title: 'Select target folder', + multiSelect: false, resolvePath: true, callback: function(path, display) { $('#server-path').val(path); diff --git a/Duplicati/Server/webroot/greeno/scripts/restoredialog.js b/Duplicati/Server/webroot/greeno/scripts/restoredialog.js index 9b528bad1..b33fe8eba 100644 --- a/Duplicati/Server/webroot/greeno/scripts/restoredialog.js +++ b/Duplicati/Server/webroot/greeno/scripts/restoredialog.js @@ -787,6 +787,7 @@ $(document).ready(function() { $.browseForFolder({ title: 'Select restore folder', resolvePath: true, + multiSelect: false, callback: function(path, display) { $('#restore-target-path').val(path); $('#restore-overwrite-target-other').each(function(i, e) { e.checked = true; });