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

Fix merge conflicts

Browse Source
This commit is contained in:
Calen Pennington
2014-05-16 14:10:50 -04:00
parent 18c91d0f1d
commit d4280e8529
9 changed files with 11 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lms/static/js/staff_debug_actions.js
View File

@@ -114,29 +114,16 @@ var StaffDebug = (function(){
// Register click handlers
$(document).ready(function() {
<<<<<<< HEAD
$('#staff-debug-reset').click(function() {
$('.staff-debug-reset').click(function() {
StaffDebug.reset($(this).parent().data('location-name'), $(this).parent().data('location'));
return false;
});
$('#staff-debug-sdelete').click(function() {
$('.staff-debug-sdelete').click(function() {
StaffDebug.sdelete($(this).parent().data('location-name'), $(this).parent().data('location'));
return false;
});
$('#staff-debug-rescore').click(function() {
StaffDebug.rescore($(this).parent().data('location-name'), $(this).parent().data('location'));
=======
$('.staff-debug-reset').click(function() {
StaffDebug.reset($(this).data('location'));
return false;
});
$('.staff-debug-sdelete').click(function() {
StaffDebug.sdelete($(this).data('location'));
return false;
});
$('.staff-debug-rescore').click(function() {
StaffDebug.rescore($(this).data('location'));
>>>>>>> edx/master
StaffDebug.rescore($(this).parent().data('location-name'), $(this).parent().data('location'));
return false;
});
});