From f9169613fc80f176394edf22db422aa34253150f Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Wed, 26 Dec 2012 15:54:15 +0200
Subject: [PATCH] Making JS work with the new XML format.

---
 .../{target_container.js => base_image.js}    |  6 ++---
 .../js/capa/drag_and_drop/config_parser.js    | 24 +++++++++----------
 .../js/capa/drag_and_drop/draggables.js       |  4 ++--
 common/static/js/capa/drag_and_drop/main.js   |  6 ++---
 .../js/capa/drag_and_drop/update_input.js     |  1 -
 5 files changed, 20 insertions(+), 21 deletions(-)
 rename common/static/js/capa/drag_and_drop/{target_container.js => base_image.js} (96%)

diff --git a/common/static/js/capa/drag_and_drop/target_container.js b/common/static/js/capa/drag_and_drop/base_image.js
similarity index 96%
rename from common/static/js/capa/drag_and_drop/target_container.js
rename to common/static/js/capa/drag_and_drop/base_image.js
index b3294a2574..9fa5ef6f52 100644
--- a/common/static/js/capa/drag_and_drop/target_container.js
+++ b/common/static/js/capa/drag_and_drop/base_image.js
@@ -5,12 +5,12 @@
 (function (requirejs, require, define) {
 
 define(['logme'], function (logme) {
-    return TargetContainer;
+    return BaseImage;
 
-    function TargetContainer(state) {
+    function BaseImage(state) {
         var targetImgSrc, targetElContainer, mouseMoveDiv;
 
-        targetImgSrc = state.config.imageDir + '/' + state.config.target_container;
+        targetImgSrc = state.config.imageDir + '/' + state.config.base_image;
 
         targetElContainer = $(
             '<div ' +
diff --git a/common/static/js/capa/drag_and_drop/config_parser.js b/common/static/js/capa/drag_and_drop/config_parser.js
index fd38081de1..58f6114009 100644
--- a/common/static/js/capa/drag_and_drop/config_parser.js
+++ b/common/static/js/capa/drag_and_drop/config_parser.js
@@ -14,33 +14,33 @@ define(['logme'], function (logme) {
 
         state.config = {
             'imageDir': '/static/' + imageDir + '/images',
-            'draggable': [],
+            'draggables': [],
             'targets': [],
-            'target_container': ''
+            'base_image': ''
         };
 
-        if ($.isArray(config.draggable) === true) {
+        if ($.isArray(config.draggables) === true) {
             (function (i) {
-                while (i < config.draggable.length) {
-                    if (processDraggable(config.draggable[i]) !== true) {
+                while (i < config.draggables.length) {
+                    if (processDraggable(config.draggables[i]) !== true) {
                         returnStatus = false;
                     }
                     i += 1;
                 }
             }(0));
-        } else if ($.isPlainObject(config.draggable) === true) {
-            if (processDraggable(config.draggable) !== true) {
+        } else if ($.isPlainObject(config.draggables) === true) {
+            if (processDraggable(config.draggables) !== true) {
                 returnStatus = false;
             }
         } else {
-            logme('ERROR: The type of config.draggable is no supported.');
+            logme('ERROR: The type of config.draggables is no supported.');
             returnStatus = false;
         }
 
-        if (typeof config.target_container === 'string') {
-            state.config.target_container = config.target_container;
+        if (typeof config.base_image === 'string') {
+            state.config.base_image = config.base_image;
         } else {
-            logme('ERROR: Property config.target_container is not of type "string".');
+            logme('ERROR: Property config.base_image is not of type "string".');
             returnStatus = false;
         }
 
@@ -104,7 +104,7 @@ define(['logme'], function (logme) {
             if (!attrIsString(obj, 'icon')) { return false; }
             if (!attrIsString(obj, 'label')) { return false; }
 
-            state.config.draggable.push(obj);
+            state.config.draggables.push(obj);
 
             true;
         }
diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index 8aafb200b2..bb6b52a7a4 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -14,8 +14,8 @@ define(['logme', 'update_input'], function (logme, updateInput) {
         state.draggables = [];
 
         (function (i) {
-            while (i < state.config.draggable.length) {
-                processDraggable(state.config.draggable[i], i + 1);
+            while (i < state.config.draggables.length) {
+                processDraggable(state.config.draggables[i], i + 1);
                 i += 1;
             }
         }(0));
diff --git a/common/static/js/capa/drag_and_drop/main.js b/common/static/js/capa/drag_and_drop/main.js
index 103a149c6a..7a18eacd93 100644
--- a/common/static/js/capa/drag_and_drop/main.js
+++ b/common/static/js/capa/drag_and_drop/main.js
@@ -5,8 +5,8 @@
 (function (requirejs, require, define) {
 
 define(
-    ['logme', 'state', 'config_parser', 'container', 'target_container', 'scroller', 'draggables', 'targets'],
-    function (logme, State, configParser, Container, TargetContainer, Scroller, Draggables, Targets) {
+    ['logme', 'state', 'config_parser', 'container', 'base_image', 'scroller', 'draggables', 'targets'],
+    function (logme, State, configParser, Container, BaseImage, Scroller, Draggables, Targets) {
     return Main;
 
     function Main() {
@@ -57,7 +57,7 @@ define(
         }
 
         Container(state);
-        TargetContainer(state);
+        BaseImage(state);
         Scroller(state);
         Draggables(state);
         Targets(state);
diff --git a/common/static/js/capa/drag_and_drop/update_input.js b/common/static/js/capa/drag_and_drop/update_input.js
index 72db2b7849..9898d3b3c9 100644
--- a/common/static/js/capa/drag_and_drop/update_input.js
+++ b/common/static/js/capa/drag_and_drop/update_input.js
@@ -47,7 +47,6 @@ define(['logme'], function (logme) {
 
         inputEl = $('#input_' + state.problemId);
         inputEl.val(stateStr);
-        logme(inputEl.val());
     }
 
 });