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

dont show media comment both inline and in modal dialog 

fixes #3887

Change-Id: I2ada94bdcd79332ef0d0fb6a98ee7459e18f6693
Reviewed-on: https://gerrit.instructure.com/2405
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
This commit is contained in:
Ryan Shaw 2011-02-23 10:45:05 -07:00
parent ba7b585193
commit a8443755bc
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/views/submissions/show.html.erb
View File

@ -78,8 +78,6 @@
$(document).ready(function() {
$(".comments .comment_list .play_comment_link").mediaCommentThumbnail('small');
$(window).bind('resize', function() {
// $(document).css('overflow', 'hidden');
// $("body").css('overflow', 'hidden');
var $frame = $("#preview_frame");
var top = $frame.offset().top;
var height = $(window).height() - top;
@ -227,13 +225,26 @@
$("#add_comment_form").show();
$("#media_media_recording").hide();
});
$(".play_comment_link").live('click', function(event) {
event.preventDefault();
var comment_id = $(this).parents(".comment_media").getTemplateData({textValues: ['media_comment_id']}).media_comment_id;
if(comment_id) {
$(this).parents(".comment_media").find(".media_comment_content").mediaComment('show', comment_id, 'audio');
}
});
$(".comments .comment_list")
.delegate(".play_comment_link", 'click', function(event) {
event.preventDefault();
var comment_id = $(this).parents(".comment_media").getTemplateData({textValues: ['media_comment_id']}).media_comment_id;
if(comment_id) {
$(this).parents(".comment_media").find(".media_comment_content").mediaComment('show', comment_id, 'audio');
}
})
// this is to prevent the default behavior of loading the video inline from happening
// the .delegate(".play_comment_link"... and the .delegate('a.instructure_inline_media_comment'...
// are actually selecting the same links I just wanted to use the different selectors because
// instructure.js uses 'a.instructure_inline_media_comment' as the selector for its .live handler
// to show things inline.
.delegate('a.instructure_inline_media_comment', 'click', function(e){
// dont let it bubble past this so it doesnt get to the .live handler to show the video inline
e.preventDefault();
e.stopPropagation();
});
});
$(document).fragmentChange(function(event, hash) {
if(hash == '#rubric') {