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

Merge pull request #1316 from edx/usman/lms930-unregister-button-broken

Browse Source 
Setup leanModel handlers on jQuery.ready() so that the rest of the scripts get a chance to load before modals can be activated.
This commit is contained in:
Usman Khalid
2013-10-23 04:36:49 -07:00
parent 6c08708131 91fbc6610e
commit 0a9db94004
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,17 +87,19 @@
}
});
$("a[rel*=leanModal]").each(function(){
$(this).leanModal({ top : 120, overlay: 1, closeButton: ".close-modal", position: 'absolute' });
embed = $($(this).attr('href')).find('iframe')
if(embed.length > 0) {
if(embed.attr('src').indexOf("?") > 0) {
embed.data('src', embed.attr('src') + '&autoplay=1&rel=0');
embed.attr('src', '');
} else {
embed.data('src', embed.attr('src') + '?autoplay=1&rel=0');
embed.attr('src', '');
}
}
$(document).ready(function($) {
$("a[rel*=leanModal]").each(function(){
$(this).leanModal({ top : 120, overlay: 1, closeButton: ".close-modal", position: 'absolute' });
embed = $($(this).attr('href')).find('iframe')
if(embed.length > 0) {
if(embed.attr('src').indexOf("?") > 0) {
embed.data('src', embed.attr('src') + '&autoplay=1&rel=0');
embed.attr('src', '');
} else {
embed.data('src', embed.attr('src') + '?autoplay=1&rel=0');
embed.attr('src', '');
}
}
});
});
})(jQuery);

12
lms/templates/dashboard.html
View File

@@ -35,7 +35,7 @@
$("#unenroll_course_id").val() + "&enrollment_action=unenroll";
} else {
$('#unenroll_error').html(
xhr.responseText ? xhr.responseText : "An error occurred. Please try again later."
xhr.responseText ? xhr.responseText : "${_('An error occurred. Please try again later.')}"
).stop().css("display", "block");
}
});
@@ -56,11 +56,10 @@
{"new_email" : new_email, "password" : new_password},
function(data) {
if (data.success) {
$("#change_email_title").html("Please verify your new email");
$("#change_email_form").html("<p>You'll receive a confirmation in your " +
"in-box. Please click the link in the " +
"email to confirm the email change.</p>");
$("#change_email_form").html("<p>${_('You\'ll receive a confirmation in your in-box. Please click the link in the email to confirm the email change.')}</p>");
$("#change_email_title").html("${_('Please verify your new email')}");
$("#change_email_form").html("<p>${_(('You\'ll receive a confirmation in your in-box.'
' Please click the link in the email to confirm'
' the email change.'))}</p>");
} else {
$("#change_email_error").html(data.error).stop().css("display", "block");
}
@@ -77,7 +76,6 @@
function(data) {
if(data.success) {
location.reload();
// $("#change_name_body").html("<p>Name changed.</p>");
} else {
$("#change_name_error").html(data.error).stop().css("display", "block");
}