Remove dependency on underscore for logic and refactor

drag_and_drop_v2/public/js/drag_and_drop.js

@@ -3,8 +3,6 @@ function DragAndDropBlock(runtime, element) {
         var _fn = {
 
             // DOM Elements
-            $block: $('.xblock--drag-and-drop', element),
-            $app: $('.xblock--drag-and-drop .drag-container', element),
             $ul: $('.xblock--drag-and-drop .items', element),
             $target: $('.xblock--drag-and-drop .target-img', element),
             $feedback: $('.xblock--drag-and-drop .feedback .message', element),
@@ -196,7 +194,7 @@ function DragAndDropBlock(runtime, element) {
                         tpl = _fn.tpl.item(),
                         img_tpl = _fn.tpl.image_item();
 
-                    _.each(items, function(item) {
+                    items.forEach(function(item) {
                         if (item.backgroundImage.length > 0) {
                             list.push(_.template(img_tpl, item));
                         } else {
@@ -232,10 +230,6 @@ function DragAndDropBlock(runtime, element) {
                 }
             },
 
-            test: {
-                completed: 0
-            },
-
             feedback: {
                 // Update DOM with feedback
                 set: function(str) {

drag_and_drop_v2/public/js/drag_and_drop_edit.js

@@ -158,6 +158,12 @@ function DragAndDropEditBlock(runtime, element) {
                         dropdown: '',
                         list: [],
                         obj: [],
+                        getObjByIndex: function(num) {
+                            for (var i = 0; i < _fn.build.form.zone.obj.length; i++) {
+                                if (_fn.build.form.zone.obj[i].index == num)
+                                    return _fn.build.form.zone.obj[i];
+                            }
+                        },
                         add: function(e) {
                             var inputTemplate = _fn.tpl.zoneInput(),
                                 zoneTemplate = _fn.tpl.zoneElement(),
@@ -252,9 +258,7 @@ function DragAndDropEditBlock(runtime, element) {
                             // Listen to form changes and update zone div position
                             $form.on('keyup', '.title', function(e) {
                                     var text = $(e.currentTarget).val(),
-                                        record = _.findWhere(_fn.build.form.zone.obj, {
-                                            index: num
-                                        });
+                                        record = _fn.build.form.zone.getObjByIndex(num);
 
                                     $div.find('p').html(text);
                                     record.title = text;
@@ -264,33 +268,25 @@ function DragAndDropEditBlock(runtime, element) {
                                     }
                                 }).on('keyup', '.width', function(e) {
                                     var width = $(e.currentTarget).val(),
-                                        record = _.findWhere(_fn.build.form.zone.obj, {
-                                            index: num
-                                        });
+                                        record = _fn.build.form.zone.getObjByIndex(num);
 
                                     $div.css('width', width + 'px');
                                     record.width = width;
                                 }).on('keyup', '.height', function(e) {
                                     var height = $(e.currentTarget).val(),
-                                        record = _.findWhere(_fn.build.form.zone.obj, {
-                                            index: num
-                                        });
+                                        record = _fn.build.form.zone.getObjByIndex(num);
 
                                     $div.css('height', height + 'px');
                                     record.height = height;
                                 }).on('keyup', '.x', function(e) {
                                     var x = $(e.currentTarget).val(),
-                                        record = _.findWhere(_fn.build.form.zone.obj, {
-                                            index: num
-                                        });
+                                        record = _fn.build.form.zone.getObjByIndex(num);
 
                                     $div.css('left', x + 'px');
                                     record.x = x;
                                 }).on('keyup', '.y', function(e) {
                                     var y = $(e.currentTarget).val(),
-                                        record = _.findWhere(_fn.build.form.zone.obj, {
-                                            index: num
-                                        });
+                                        record = _fn.build.form.zone.getObjByIndex(num);
 
                                     $div.css('top', y + 'px');
                                     record.y = y;