From 169be87239e4a20999a418178afedaf99fb796f0 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Thu, 13 Aug 2015 11:23:47 -0700
Subject: [PATCH 01/11] GUAC-1293: Display file transfer dialog in front of
 file browser / guac menu.

---
 .../main/webapp/app/client/styles/file-transfer-dialog.css   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/guacamole/src/main/webapp/app/client/styles/file-transfer-dialog.css b/guacamole/src/main/webapp/app/client/styles/file-transfer-dialog.css
index 52c00d65c..5f7d594fa 100644
--- a/guacamole/src/main/webapp/app/client/styles/file-transfer-dialog.css
+++ b/guacamole/src/main/webapp/app/client/styles/file-transfer-dialog.css
@@ -25,6 +25,7 @@
     position: absolute;
     right: 0;
     bottom: 0;
+    z-index: 20;
 
     font-size: 0.8em;
     padding: 0.5em;
@@ -35,6 +36,6 @@
 }
 
 #file-transfer-dialog .transfer-manager {
-    border: 1px solid rgba(0, 0, 0, 0.125);
-    box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.125);
+    border: 1px solid rgba(0, 0, 0, 0.5);
+    box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.25);
 }

From 56d35a84d83aaab1d8f48231406f469bd7dea5cb Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Thu, 13 Aug 2015 11:57:52 -0700
Subject: [PATCH 02/11] GUAC-1293: Focus files on click. Download or change
 directory on double-click.

---
 .../webapp/app/client/directives/guacFileBrowser.js    | 10 ++++++++--
 .../src/main/webapp/app/client/styles/file-browser.css |  6 ++++++
 .../webapp/app/client/templates/guacFileBrowser.html   |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
index d612dfdfc..bd68211b4 100644
--- a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
+++ b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
@@ -145,7 +145,7 @@ angular.module('client').directive('guacFileBrowser', [function guacFileBrowser(
                 // Change current directory when directories are clicked
                 if ($scope.isDirectory(file)) {
                     element.addClass('directory');
-                    element.on('click', function changeDirectory() {
+                    element.on('dblclick', function changeDirectory() {
                         $scope.changeDirectory(file);
                     });
                 }
@@ -153,11 +153,17 @@ angular.module('client').directive('guacFileBrowser', [function guacFileBrowser(
                 // Initiate downloads when normal files are clicked
                 else if ($scope.isNormalFile(file)) {
                     element.addClass('normal-file');
-                    element.on('click', function downloadFile() {
+                    element.on('dblclick', function downloadFile() {
                         $scope.downloadFile(file);
                     });
                 }
 
+                // Mark file as focused upon click
+                element.on('click', function focusFile() {
+                    element.parent().children().removeClass('focused');
+                    element.addClass('focused');
+                });
+
                 return element;
 
             };
diff --git a/guacamole/src/main/webapp/app/client/styles/file-browser.css b/guacamole/src/main/webapp/app/client/styles/file-browser.css
index 73fce34ad..602f4069c 100644
--- a/guacamole/src/main/webapp/app/client/styles/file-browser.css
+++ b/guacamole/src/main/webapp/app/client/styles/file-browser.css
@@ -29,6 +29,12 @@
 
 .file-browser .list-item .caption {
     white-space: nowrap;
+    border: 1px solid transparent;
+}
+
+.file-browser .list-item.focused .caption {
+    border: 1px dotted rgba(0, 0, 0, 0.5);
+    background: rgba(204, 221, 170, 0.5);
 }
 
 /* Directory / file icons */
diff --git a/guacamole/src/main/webapp/app/client/templates/guacFileBrowser.html b/guacamole/src/main/webapp/app/client/templates/guacFileBrowser.html
index 196a18dcd..57b4967e1 100644
--- a/guacamole/src/main/webapp/app/client/templates/guacFileBrowser.html
+++ b/guacamole/src/main/webapp/app/client/templates/guacFileBrowser.html
@@ -23,7 +23,7 @@
 
     <!-- Parent directory -->
     <div class="list-item directory previous" ng-show="filesystem.currentDirectory.parent">
-        <div class="caption" ng-click="changeDirectory(filesystem.currentDirectory.parent)">
+        <div class="caption" ng-dblclick="changeDirectory(filesystem.currentDirectory.parent)">
             <div class="icon"></div>..
         </div>
     </div>

From 4ae069d424f3965a85afca9621f0879c8276dbb8 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Thu, 13 Aug 2015 12:02:32 -0700
Subject: [PATCH 03/11] GUAC-1293: Prevent selection of filename text during
 navigation.

---
 .../main/webapp/app/client/directives/guacFileBrowser.js    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
index bd68211b4..894469300 100644
--- a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
+++ b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
@@ -164,6 +164,12 @@ angular.module('client').directive('guacFileBrowser', [function guacFileBrowser(
                     element.addClass('focused');
                 });
 
+                // Prevent text selection during navigation
+                element.on('selectstart', function avoidSelect(e) {
+                    e.preventDefault();
+                    e.stopPropagation();
+                });
+
                 return element;
 
             };

From 3596ca8383346a0d515b26cf899e477c6cb62b29 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Thu, 13 Aug 2015 12:40:15 -0700
Subject: [PATCH 04/11] GUAC-1293: Do not use double click - use click when
 file is focused.

---
 .../app/client/directives/guacFileBrowser.js  | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
index 894469300..4469cecbd 100644
--- a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
+++ b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
@@ -142,26 +142,42 @@ angular.module('client').directive('guacFileBrowser', [function guacFileBrowser(
                 // Create from internal template
                 var element = angular.element($interpolate(fileTemplate)(file));
 
+                // Double-clicking on unknown file types will do nothing
+                var fileAction = function doNothing() {};
+
                 // Change current directory when directories are clicked
                 if ($scope.isDirectory(file)) {
                     element.addClass('directory');
-                    element.on('dblclick', function changeDirectory() {
+                    fileAction = function changeDirectory() {
                         $scope.changeDirectory(file);
-                    });
+                    };
                 }
 
                 // Initiate downloads when normal files are clicked
                 else if ($scope.isNormalFile(file)) {
                     element.addClass('normal-file');
-                    element.on('dblclick', function downloadFile() {
+                    fileAction = function downloadFile() {
                         $scope.downloadFile(file);
-                    });
+                    };
                 }
 
                 // Mark file as focused upon click
-                element.on('click', function focusFile() {
-                    element.parent().children().removeClass('focused');
-                    element.addClass('focused');
+                element.on('click', function focusFile(e) {
+
+                    // Fire file-specific action if already focused
+                    if (element.hasClass('focused'))
+                        fileAction();
+
+                    // Otherwise mark as focused
+                    else {
+                        element.parent().children().removeClass('focused');
+                        element.addClass('focused');
+                    }
+
+                    // Do not allow default action
+                    e.preventDefault();
+                    e.stopPropagation();
+
                 });
 
                 // Prevent text selection during navigation

From 96908d424888693d856d484635ace1549280504c Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Thu, 13 Aug 2015 12:48:54 -0700
Subject: [PATCH 05/11] GUAC-1293: Remove parent directory entry.

---
 .../main/webapp/app/client/templates/guacFileBrowser.html  | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/guacamole/src/main/webapp/app/client/templates/guacFileBrowser.html b/guacamole/src/main/webapp/app/client/templates/guacFileBrowser.html
index 57b4967e1..2fd57c70d 100644
--- a/guacamole/src/main/webapp/app/client/templates/guacFileBrowser.html
+++ b/guacamole/src/main/webapp/app/client/templates/guacFileBrowser.html
@@ -21,13 +21,6 @@
        THE SOFTWARE.
     -->
 
-    <!-- Parent directory -->
-    <div class="list-item directory previous" ng-show="filesystem.currentDirectory.parent">
-        <div class="caption" ng-dblclick="changeDirectory(filesystem.currentDirectory.parent)">
-            <div class="icon"></div>..
-        </div>
-    </div>
-
     <!-- Current directory contents -->
     <div class="current-directory-contents"></div>
 

From ae642030b381df4f9f5751b8b16c7c6810304ce1 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Thu, 13 Aug 2015 12:49:11 -0700
Subject: [PATCH 06/11] GUAC-1293: Remove "focused" class after action is
 fired.

---
 .../src/main/webapp/app/client/directives/guacFileBrowser.js  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
index 4469cecbd..f5a8c684d 100644
--- a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
+++ b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
@@ -165,8 +165,10 @@ angular.module('client').directive('guacFileBrowser', [function guacFileBrowser(
                 element.on('click', function focusFile(e) {
 
                     // Fire file-specific action if already focused
-                    if (element.hasClass('focused'))
+                    if (element.hasClass('focused')) {
                         fileAction();
+                        element.removeClass('focused');
+                    }
 
                     // Otherwise mark as focused
                     else {

From a2efb47e3cdd7c7380818f775a01c5f4ef829f72 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Thu, 13 Aug 2015 12:51:15 -0700
Subject: [PATCH 07/11] GUAC-1293: Rename click handler sensibly. No need to
 prevent default, etc. for clicks.

---
 .../main/webapp/app/client/directives/guacFileBrowser.js    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
index f5a8c684d..26be23b48 100644
--- a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
+++ b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
@@ -162,7 +162,7 @@ angular.module('client').directive('guacFileBrowser', [function guacFileBrowser(
                 }
 
                 // Mark file as focused upon click
-                element.on('click', function focusFile(e) {
+                element.on('click', function handleFileClick() {
 
                     // Fire file-specific action if already focused
                     if (element.hasClass('focused')) {
@@ -176,10 +176,6 @@ angular.module('client').directive('guacFileBrowser', [function guacFileBrowser(
                         element.addClass('focused');
                     }
 
-                    // Do not allow default action
-                    e.preventDefault();
-                    e.stopPropagation();
-
                 });
 
                 // Prevent text selection during navigation

From 03e2fe86c1408f08b26191181a1cef347f8bd9ed Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Thu, 13 Aug 2015 13:04:12 -0700
Subject: [PATCH 08/11] GUAC-1293: Fire events when file uploads and downloads
 complete.

---
 .../src/main/webapp/app/client/types/ManagedFileDownload.js    | 3 +++
 .../src/main/webapp/app/client/types/ManagedFileUpload.js      | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/guacamole/src/main/webapp/app/client/types/ManagedFileDownload.js b/guacamole/src/main/webapp/app/client/types/ManagedFileDownload.js
index f6c8ffb77..9c9c39f9d 100644
--- a/guacamole/src/main/webapp/app/client/types/ManagedFileDownload.js
+++ b/guacamole/src/main/webapp/app/client/types/ManagedFileDownload.js
@@ -138,6 +138,9 @@ angular.module('client').factory('ManagedFileDownload', ['$rootScope', '$injecto
                 ManagedFileTransferState.setStreamState(managedFileDownload.transferState,
                     ManagedFileTransferState.StreamState.CLOSED);
 
+                // Notify of upload completion
+                $rootScope.$broadcast('guacDownloadComplete', filename);
+
             });
         };
 
diff --git a/guacamole/src/main/webapp/app/client/types/ManagedFileUpload.js b/guacamole/src/main/webapp/app/client/types/ManagedFileUpload.js
index 6cd51bba9..15839a7a5 100644
--- a/guacamole/src/main/webapp/app/client/types/ManagedFileUpload.js
+++ b/guacamole/src/main/webapp/app/client/types/ManagedFileUpload.js
@@ -211,6 +211,9 @@ angular.module('client').factory('ManagedFileUpload', ['$rootScope', '$injector'
                         ManagedFileTransferState.setStreamState(managedFileUpload.transferState,
                             ManagedFileTransferState.StreamState.CLOSED);
 
+                        // Notify of upload completion
+                        $rootScope.$broadcast('guacUploadComplete', file.name);
+
                     }
 
                     // Otherwise, update progress

From f019a36ccfe016f8bd5ee8f2b27b1aa9cc5255aa Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Thu, 13 Aug 2015 13:04:32 -0700
Subject: [PATCH 09/11] GUAC-1293: Refresh file browser when any upload
 completes.

---
 .../webapp/app/client/directives/guacFileBrowser.js  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
index 26be23b48..0a380cf19 100644
--- a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
+++ b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
@@ -122,6 +122,13 @@ angular.module('client').directive('guacFileBrowser', [function guacFileBrowser(
                 ManagedFilesystem.downloadFile($scope.client, $scope.filesystem, file.streamName);
             };
 
+            /**
+             * Refreshes the contents of the current directory.
+             */
+            $scope.refresh = function refresh() {
+                ManagedFilesystem.refresh($scope.filesystem, $scope.filesystem.currentDirectory);
+            };
+
             /**
              * Creates a new element representing the given file and properly
              * handling user events, bypassing the overhead incurred through
@@ -248,6 +255,11 @@ angular.module('client').directive('guacFileBrowser', [function guacFileBrowser(
 
             }); // end retrieve file template
 
+            // Refresh file browser when any upload completes
+            $scope.$on('guacUploadComplete', function uploadComplete(event, filename) {
+                $scope.refresh();
+            });
+
         }]
 
     };

From 6b27b6a87712ee38e9d829f5f50aa71929c7ebba Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Thu, 13 Aug 2015 13:19:02 -0700
Subject: [PATCH 10/11] GUAC-1293: Refresh file browser when file browser is
 shown.

---
 .../webapp/app/client/controllers/clientController.js  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/guacamole/src/main/webapp/app/client/controllers/clientController.js b/guacamole/src/main/webapp/app/client/controllers/clientController.js
index e13a4cdf5..692051bc1 100644
--- a/guacamole/src/main/webapp/app/client/controllers/clientController.js
+++ b/guacamole/src/main/webapp/app/client/controllers/clientController.js
@@ -586,6 +586,16 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
         return !!$scope.filesystemMenuContents && $scope.menu.shown;
     };
 
+    // Automatically refresh display when filesystem menu is shown
+    $scope.$watch('isFilesystemMenuShown()', function refreshFilesystem() {
+
+        // Refresh filesystem, if defined
+        var filesystem = $scope.filesystemMenuContents;
+        if (filesystem)
+            ManagedFilesystem.refresh(filesystem, filesystem.currentDirectory);
+
+    });
+
     /**
      * Returns the full path to the given file as an ordered array of parent
      * directories.

From b3a5ad38f8db63217e14df2fcab078d74d897080 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Thu, 13 Aug 2015 13:22:48 -0700
Subject: [PATCH 11/11] GUAC-1293: Refresh function need not be on scope.

---
 .../main/webapp/app/client/directives/guacFileBrowser.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
index 0a380cf19..dca073a66 100644
--- a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
+++ b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
@@ -122,13 +122,6 @@ angular.module('client').directive('guacFileBrowser', [function guacFileBrowser(
                 ManagedFilesystem.downloadFile($scope.client, $scope.filesystem, file.streamName);
             };
 
-            /**
-             * Refreshes the contents of the current directory.
-             */
-            $scope.refresh = function refresh() {
-                ManagedFilesystem.refresh($scope.filesystem, $scope.filesystem.currentDirectory);
-            };
-
             /**
              * Creates a new element representing the given file and properly
              * handling user events, bypassing the overhead incurred through
@@ -257,7 +250,7 @@ angular.module('client').directive('guacFileBrowser', [function guacFileBrowser(
 
             // Refresh file browser when any upload completes
             $scope.$on('guacUploadComplete', function uploadComplete(event, filename) {
-                $scope.refresh();
+                ManagedFilesystem.refresh($scope.filesystem, $scope.filesystem.currentDirectory);
             });
 
         }]