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

Cleaning up code.

Browse Source
This commit is contained in:
Valera Rozuvan
2013-01-03 16:51:23 +02:00
committed by Alexander Kryklia
parent 1afaec6f61
commit f283df9022
3 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/static/js/capa/drag_and_drop/config_parser.js
View File

@@ -12,8 +12,6 @@ define(['logme'], function (logme) {
returnStatus = true;
logme('imageDir', imageDir);
state.config = {
'imageDir': '/static/' + imageDir + '/images',
'draggables': [],

2
common/static/js/capa/drag_and_drop/draggables.js
View File

@@ -151,8 +151,6 @@ define(['logme', 'update_input'], function (logme, updateInput) {
// icon. All the existing code will work, and the user will
// see a label instead of an icon.
if (obj.label.length > 0) {
logme('We have a label length > 0.');
draggableObj.iconEl = $(
'<div ' +
'style=" ' +

19
common/static/js/capa/drag_and_drop/update_input.js
View File

@@ -54,8 +54,6 @@ define(['logme'], function (logme) {
inputEl = $('#input_' + state.problemId);
inputEl.val(stateStr);
logme(inputEl.val());
return;
// Check if input has an answer from server. If yes, then position
@@ -81,9 +79,6 @@ define(['logme'], function (logme) {
offset = 1;
}
logme('!!!!!!!!!!!!!!!! answer');
logme(answer);
if (
((typeof answer.use_targets === 'boolean') && (answer.use_targets === true)) ||
((typeof answer.use_targets === 'string') && (answer.use_targets === 'true'))
@@ -113,8 +108,6 @@ define(['logme'], function (logme) {
return;
}
logme('use_targets = false; draggableId: ' + draggableId);
draggable.setInContainer(false);
draggable.containerEl.hide();
@@ -144,6 +137,9 @@ define(['logme'], function (logme) {
draggable.setOnTarget(target);
target.draggable.push(draggableId);
state.numDraggablesInSlider -= 1;
state.updateArrowOpacity();
}
}(draggableId, draggable, targetId, target));
}
@@ -166,13 +162,10 @@ define(['logme'], function (logme) {
function moveDraggableToBaseImage() {
if (draggable.hasLoaded === false) {
logme('draggable.hasLoaded === false');
setTimeout(moveDraggableToBaseImage, 50);
return;
}
logme('use_targets = false; draggableId: ' + draggableId);
draggable.setInContainer(false);
draggable.containerEl.hide();
@@ -202,6 +195,9 @@ define(['logme'], function (logme) {
draggable.x = answer.draggables[c1][draggableId][0];
draggable.y = answer.draggables[c1][draggableId][1];
state.numDraggablesInSlider -= 1;
state.updateArrowOpacity();
}
}(c1, draggableId, draggable));
}
@@ -211,9 +207,6 @@ define(['logme'], function (logme) {
return;
}
state.numDraggablesInSlider -= 1;
state.updateArrowOpacity();
}
return;