ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix kaltura previews in full_files (fixes #11047) 

Test plan:
  preview a media object in course or user files and make sure it plays

Change-Id: I44f0ae788f4b02cb5399945336ff0656fa428f56
Reviewed-on: https://gerrit.instructure.com/14076
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Tested-by: Bryan Madsen <bryan@instructure.com>
This commit is contained in:
Cameron Matheson 2012-10-01 16:10:23 -06:00 committed by Bryan Madsen
parent 27f9f0ecac
commit d64f329b94
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/javascripts/full_files.js
View File

@ -1718,6 +1718,8 @@ define([
$panel.data('node', node);
$panel.show();
if ($preview) {
$preview.addClass('file_preview');
$files_content.append($preview);
var showPreview = function() {
$('#doc_preview_holder').loadDocPreview({
mimeType: data.content_type,
@ -1730,8 +1732,6 @@ define([
files.viewFile(data.context_string, data.id);
};
if (data.permissions && data.permissions.download && $.isPreviewable(data.content_type)) {
$preview.addClass('file_preview');
$files_content.append($preview);
if (data['crocodoc_available?'] && !data.crocodocSession) {
$preview.disableWhileLoading(
$.ajaxJSON(