From 4afda98420e4f19d61465ce201f81d27d2a172a9 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Wed, 24 Oct 2012 15:22:23 -0400 Subject: [PATCH 1/2] fixed multiple file picker bug; removed 'fakepath' from uploading file name --- cms/static/js/base.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cms/static/js/base.js b/cms/static/js/base.js index 17a0b33ca3..091c9ebc73 100644 --- a/cms/static/js/base.js +++ b/cms/static/js/base.js @@ -431,7 +431,6 @@ function showUploadModal(e) { e.preventDefault(); $modal = $('.upload-modal').show(); $('.file-input').bind('change', startUpload); - $('.upload-modal .choose-file-button').bind('click', showFileSelectionMenu); $modalCover.show(); } @@ -442,7 +441,7 @@ function showFileSelectionMenu(e) { function startUpload(e) { $('.upload-modal h1').html('Uploading…'); - $('.upload-modal .file-name').html($('.file-input').val()); + $('.upload-modal .file-name').html($('.file-input').val().replace(/.+\\/g, '')); $('.upload-modal .file-chooser').ajaxSubmit({ beforeSend: resetUploadBar, uploadProgress: showUploadFeedback, From b4ce13af8e8cb277ea26cf5670fc434221f53b85 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Wed, 24 Oct 2012 15:58:29 -0400 Subject: [PATCH 2/2] more specific fakepath cut --- cms/static/js/base.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/static/js/base.js b/cms/static/js/base.js index 091c9ebc73..6dda6b6126 100644 --- a/cms/static/js/base.js +++ b/cms/static/js/base.js @@ -441,7 +441,7 @@ function showFileSelectionMenu(e) { function startUpload(e) { $('.upload-modal h1').html('Uploading…'); - $('.upload-modal .file-name').html($('.file-input').val().replace(/.+\\/g, '')); + $('.upload-modal .file-name').html($('.file-input').val().replace('C:\\fakepath\\', '')); $('.upload-modal .file-chooser').ajaxSubmit({ beforeSend: resetUploadBar, uploadProgress: showUploadFeedback,