From ca20d6a17d7b4ff8defb093caf0182e6ce16d366 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Wed, 3 Feb 2016 16:53:13 -0800
Subject: [PATCH] GUAC-1480: Remove use of "Allow Clipboard" extension.

---
 .../app/client/services/clipboardService.js   | 70 +++++--------------
 1 file changed, 16 insertions(+), 54 deletions(-)

diff --git a/guacamole/src/main/webapp/app/client/services/clipboardService.js b/guacamole/src/main/webapp/app/client/services/clipboardService.js
index 788015928..801377177 100644
--- a/guacamole/src/main/webapp/app/client/services/clipboardService.js
+++ b/guacamole/src/main/webapp/app/client/services/clipboardService.js
@@ -77,34 +77,15 @@ angular.module('client').factory('clipboardService', ['$injector',
 
         var deferred = $q.defer();
 
-        // First, see if allow clipboard extension is installed
-        if (window.AllowClipboard) {
+        // Copy the given value into the clipboard DOM element
+        clipboardContent.value = text;
+        clipboardContent.select();
 
-            var clipboardClient = new AllowClipboard.Client.ClipboardClient();
-
-            clipboardClient.write(text, function(success) {
-                if (success)
-                    deferred.resolve();
-                else
-                    deferred.reject();
-            });
-
-        }
-
-        // Otherwise, try execCommand
-        else {
-
-            // Copy the given value into the clipboard DOM element
-            clipboardContent.value = text;
-            clipboardContent.select();
-
-            // Attempt to copy data from clipboard element into local clipboard
-            if (document.execCommand('copy'))
-                deferred.resolve();
-            else
-                deferred.reject();
-
-        }
+        // Attempt to copy data from clipboard element into local clipboard
+        if (document.execCommand('copy'))
+            deferred.resolve();
+        else
+            deferred.reject();
 
         return deferred.promise;
     };
@@ -121,34 +102,15 @@ angular.module('client').factory('clipboardService', ['$injector',
 
         var deferred = $q.defer();
 
-        // First, see if allow clipboard extension is installed
-        if (window.AllowClipboard) {
+        // Clear and select the clipboard DOM element
+        clipboardContent.value = '';
+        clipboardContent.select();
 
-            var clipboardClient = new AllowClipboard.Client.ClipboardClient();
-
-            clipboardClient.read(function(success, data) {
-                if (success)
-                    deferred.resolve(data);
-                else
-                    deferred.reject();
-            });
-
-        }
-
-        // Otherwise, try execCommand
-        else {
-
-            // Clear and select the clipboard DOM element
-            clipboardContent.value = '';
-            clipboardContent.select();
-
-            // Attempt paste local clipboard into clipboard DOM element
-            if (document.execCommand('paste'))
-                deferred.resolve(clipboardContent.value);
-            else
-                deferred.reject();
-
-        }
+        // Attempt paste local clipboard into clipboard DOM element
+        if (document.execCommand('paste'))
+            deferred.resolve(clipboardContent.value);
+        else
+            deferred.reject();
 
         return deferred.promise;
     };