You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2018/02/07 05:02:29 UTC
[1/2] guacamole-client git commit: GUACAMOLE-348: Only remove
download iframe if it's still attached to the DOM.
Repository: guacamole-client
Updated Branches:
refs/heads/master 9ee43e656 -> 49c11bbda
GUACAMOLE-348: Only remove download iframe if it's still attached to the DOM.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/017df40b
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/017df40b
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/017df40b
Branch: refs/heads/master
Commit: 017df40b335a97e447b3821b1acbb3bc7120c180
Parents: 5289774
Author: James Muehlner <ja...@guac-dev.org>
Authored: Tue Feb 6 20:11:30 2018 -0800
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Tue Feb 6 20:16:58 2018 -0800
----------------------------------------------------------------------
guacamole/src/main/webapp/app/rest/services/tunnelService.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/017df40b/guacamole/src/main/webapp/app/rest/services/tunnelService.js
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/rest/services/tunnelService.js b/guacamole/src/main/webapp/app/rest/services/tunnelService.js
index f74088d..c6d5ed4 100644
--- a/guacamole/src/main/webapp/app/rest/services/tunnelService.js
+++ b/guacamole/src/main/webapp/app/rest/services/tunnelService.js
@@ -224,7 +224,9 @@ angular.module('rest').factory('tunnelService', ['$injector',
// ends, in the browser does NOT fire the "load" event for downloads
stream.onend = function downloadComplete() {
$window.setTimeout(function cleanupIframe() {
- document.body.removeChild(iframe);
+ if (iframe.parentElement) {
+ document.body.removeChild(iframe);
+ }
}, DOWNLOAD_CLEANUP_WAIT);
};
[2/2] guacamole-client git commit: GUACAMOLE-348: Merge changes which
ensure the download iframe is removed only if actually present within the
DOM.
Posted by mj...@apache.org.
GUACAMOLE-348: Merge changes which ensure the download iframe is removed only if actually present within the DOM.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/49c11bbd
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/49c11bbd
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/49c11bbd
Branch: refs/heads/master
Commit: 49c11bbdadf976409d84cb17a1884947fcb4d126
Parents: 9ee43e6 017df40
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Feb 6 21:01:45 2018 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Feb 6 21:01:45 2018 -0800
----------------------------------------------------------------------
guacamole/src/main/webapp/app/rest/services/tunnelService.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/49c11bbd/guacamole/src/main/webapp/app/rest/services/tunnelService.js
----------------------------------------------------------------------