Fixed bugs #29
Merged
Fixed bugs #29
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sendr
commented
Dec 16, 2016
sendr
commented
- 500 error with canceling of file upload
- Handout download on both sides
- Add status of upload handout
- Add name of file to status of uploading
- Add name of file to download attribute in button "Download"
- After uploading handout replace wording "Upload" to "Replace" in button
- 500 error with canceling of file upload - Handout download on both sides - Add status of upload handout - Add name of file to status of uploading - Add name of file to download attribute in button "Download" - After uploading handout replace wording "Upload" to "Replace" in button
z4y4ts
reviewed
Dec 16, 2016
| var showUploadStatus = function($element, filename){ | ||
| $element.find('.status-upload').text('File ' + '"' + filename + '"' + ' uploaded successfully').show(); | ||
| setTimeout(function(){ | ||
| $('.status-upload', $element).hide() |
There was a problem hiding this comment.
Is this default behavior of edx video module?
| } else { | ||
| if($fileUploader.val()){ | ||
| $('.file-uploader-form', element).ajaxSubmit({ | ||
| success: function(response, statusText, xhr, form) { |
There was a problem hiding this comment.
Please extract success callback into a function for easier reading.
| if(fieldName == "handout"){ | ||
| $('input[data-field-name=' + fieldName + ']').val(response['asset']['id']).change(); | ||
| } else { | ||
| if($fileUploader.val()){ |
There was a problem hiding this comment.
Please invert this if-clause to short-circuit in case if .val() is empty.
So that normal flow is outside if block.
z4y4ts
approved these changes
Dec 19, 2016
| @@ -309,42 +309,50 @@ function StudioEditableXBlock(runtime, element) { | |||
| }, 5000); | |||
| }; | |||
|
|
|||
| var successHandler = function(response, statusText, xhr, fieldName, lang, label, currentLiTag) { | |||
There was a problem hiding this comment.
Please write more descriptive name, saying what this function does.
| var url = '/' + response['asset']['id']; | ||
| var regExp = /.*@(.+\..+)/; | ||
| var filename = regExp.exec(url)[1]; | ||
| if(fieldName == "handout"){ |
| @@ -352,6 +374,10 @@ function StudioEditableXBlock(runtime, element) { | |||
|
|
|||
| $('.setting-clear').on('click', function (event){ | |||
| var $currentBlock = $(event.currentTarget).closest('li'); | |||
| if($('.file-uploader', $currentBlock).length > 0){ | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.