Skip to content

[STUD-256] Seems like on chrome when cancel is hit in the file chooser, the 'change... #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrisndodge merged 3 commits into from
Jun 11, 2013
Merged

[STUD-256] Seems like on chrome when cancel is hit in the file chooser, the 'change... #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa8ae22
Seems like on chrome when cancel is hit in the file chooser, the 'cha…
Jun 11, 2013
1602f59
use better API
Jun 11, 2013
be6fbf9
make local variable
Jun 11, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cms/djangoapps/contentstore/views/assets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ def upload_asset(request, org, course, coursename):
logging.error('Could not find course' + location)
return HttpResponseBadRequest()

if 'file' not in request.FILES:
return HttpResponseBadRequest()

# compute a 'filename' which is similar to the location formatting, we're using the 'filename'
# nomenclature since we're using a FileSystem paradigm here. We're just imposing
# the Location string formatting expectations to keep things a bit more consistent
Expand Down
6 changes: 5 additions & 1 deletion cms/static/js/base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,8 +411,12 @@ function showFileSelectionMenu(e) {
}

function startUpload(e) {
var files = $('.file-input').get(0).files;
if (files.length === 0)
return;

$('.upload-modal h1').html(gettext('Uploading…'));
$('.upload-modal .file-name').html($('.file-input').val().replace('C:\\fakepath\\', ''));
$('.upload-modal .file-name').html(files[0].name);
$('.upload-modal .file-chooser').ajaxSubmit({
beforeSend: resetUploadBar,
uploadProgress: showUploadFeedback,
Expand Down