From 88923b49d29897cea9ddd5439674168431928d22 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Wed, 26 Jun 2013 12:43:14 -0700 Subject: [PATCH] Fixing cross browser issues when importing media from local computer --HG-- branch : 1.x --- .../Styles/orchard-clientstorage-admin.css | 14 ++++++++++---- .../Views/ClientStorage/Index.cshtml | 9 +++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-clientstorage-admin.css b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-clientstorage-admin.css index 321e1ef8d..4169d6398 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-clientstorage-admin.css +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/orchard-clientstorage-admin.css @@ -26,17 +26,23 @@ bottom: 0; padding: 0; margin: 10px 15px 15px 10px; - } #fileupload input{ position: absolute; opacity: 0; top: 0; - right: 0; left: 0; - bottom: 0; - z-index: 0; + /*bottom: 0;*/ + width: 0; + height: 0; + cursor: none; + z-index: 1000; +} + +#fileupload ul { + width: 100%; + z-index: 2000; } #clientstorage-main li { diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/ClientStorage/Index.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/ClientStorage/Index.cshtml index bc72aebfb..d792b7752 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/ClientStorage/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/ClientStorage/Index.cshtml @@ -73,6 +73,15 @@ var viewModel = new clientStorageViewModel(); ko.applyBindings(viewModel); + $('#fileupload').click(function() { + console.log('click'); + $('#fileupload > input').trigger('click'); + }); + + $('#fileupload > input').click(function(event) { + event.stopPropagation(); + }); + // Add drag-n-drop HTML5 support $('#fileupload').fileupload({ url: '@Url.Action("Upload", "ClientStorage")',