Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #285 from MITx/release_fixes

Browse Source 
Fixed bugs caused by modal cloning. Now, only video modals are cloned.
This commit is contained in:
jarv
2012-07-23 16:25:03 -07:00
parent 157af877cb 1e1e777e04
commit 6666c2fe8a
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lms/static/js/toggle_login_modal.js
View File

@@ -23,11 +23,17 @@
$(".modal").hide();
var modal_id = $(this).attr("href");
if ($(modal_id).hasClass("video-modal")) {
//Video modals need to be cloned before being presented as a modal
//This is because actions on the video get recorded in the history.
//Deleting the video (clone) prevents the odd back button behavior.
var modal_clone = $(modal_id).clone(true, true);
modal_clone.attr('id', 'modal_clone');
$(modal_id).after(modal_clone);
modal_id = '#modal_clone';
}
modal_clone = $(modal_id).clone(true, true);
modal_clone.attr('id', 'modal_clone');
$(modal_id).after(modal_clone);
modal_id = '#modal_clone';
$("#lean_overlay").click(function() {
close_modal(modal_id);
@@ -74,7 +80,9 @@
$("#lean_overlay").fadeOut(200);
$('iframe', modal_id).attr('src', '');
$(modal_id).css({ 'display' : 'none' });
$(modal_id).remove();
if (modal_id == '#modal_clone') {
$(modal_id).remove();
}
}
}
});