From 4901c54d4f37bd8c44a975d41907fc2c08e90244 Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Wed, 5 Aug 2015 19:26:01 +1000 Subject: [PATCH] Fixes clash with progress bar and remove link --- .../backend/formwidgets/fileupload/assets/css/fileupload.css | 1 + modules/backend/formwidgets/fileupload/assets/js/fileupload.js | 2 ++ .../fileupload/assets/less/fileupload.filesingle.less | 1 + 3 files changed, 4 insertions(+) diff --git a/modules/backend/formwidgets/fileupload/assets/css/fileupload.css b/modules/backend/formwidgets/fileupload/assets/css/fileupload.css index 26407b93c..326924175 100644 --- a/modules/backend/formwidgets/fileupload/assets/css/fileupload.css +++ b/modules/backend/formwidgets/fileupload/assets/css/fileupload.css @@ -756,6 +756,7 @@ height: 20px; margin-top: -10px; margin-right: 10px; + z-index: 100; } .field-fileupload.style-file-single .upload-object .icon-container:after { width: 20px; diff --git a/modules/backend/formwidgets/fileupload/assets/js/fileupload.js b/modules/backend/formwidgets/fileupload/assets/js/fileupload.js index 22373d752..1e5b50e56 100644 --- a/modules/backend/formwidgets/fileupload/assets/js/fileupload.js +++ b/modules/backend/formwidgets/fileupload/assets/js/fileupload.js @@ -260,6 +260,8 @@ } FileUpload.prototype.onClickSuccessObject = function(ev) { + if ($(ev.target).closest('.meta').length) return + var $target = $(ev.target).closest('.upload-object') if (!this.options.configHandler) { diff --git a/modules/backend/formwidgets/fileupload/assets/less/fileupload.filesingle.less b/modules/backend/formwidgets/fileupload/assets/less/fileupload.filesingle.less index bcab0858a..b6f1431bb 100644 --- a/modules/backend/formwidgets/fileupload/assets/less/fileupload.filesingle.less +++ b/modules/backend/formwidgets/fileupload/assets/less/fileupload.filesingle.less @@ -101,6 +101,7 @@ height: 20px; margin-top: -10px; margin-right: 10px; + z-index: 100; } }