Skip to content
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.

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

Fixed bug with replacing language after uploading transcript #70

Merged
merged 1 commit into from
Jan 16, 2017

Conversation

sendr
Copy link

@sendr sendr commented Jan 13, 2017

@@ -226,22 +226,29 @@ function StudioEditableXBlock(runtime, element) {
})
};

var pushTranscript = function (lang, label, url){
var pushTranscript = function (lang, label, url, oldLang, $uploadButton){
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add JSDoc for this function

@z4y4ts z4y4ts assigned sendr and unassigned z4y4ts Jan 16, 2017
@sendr sendr force-pushed the bugfix/replace_transciprt_lang branch from d71d352 to 88151e7 Compare January 16, 2017 11:58
@sendr sendr merged commit bfabc59 into dev Jan 16, 2017
@z4y4ts z4y4ts deleted the bugfix/replace_transciprt_lang branch January 16, 2017 15:42
z4y4ts added a commit that referenced this pull request Jan 18, 2017
* dev:
  Add pylint integration with TravisCI and pylintrc config
  Fix indentation in player-context-menu.js, use dot notation when possible
  Minor JavaScript optimization in studio_edit.js
  Fixed bug with replacing existing language after uploading transcript (#70)
  Downloading transcripts with correct filename (#68)
  fix "get_transcript_download_link" function (#67)
  Make transcripts download link follow selected transcript language (#64)
  Remove unused styles (#66)
  Add display captions
  Fix typo in install_requires section in setup.py
  Wrap transcripts in route_transcript() for on-the-fly convertion
  Fix pycaption dependency specification in requirements.txt
  Reduce code duplication and add docstrings
  Add support for .srt transcripts
  Enable popup submenu in Edge
  Fixed Speed label for Brightcove

# Conflicts:
#	.travis.yml
#	pylintrc
#	requirements.txt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants