Merge pull request #31 from RunestoneInteractive/master

grabbing latest from master

Author: riknos314

runestone/dragndrop/css/dragndrop.css

@@ -1,7 +1,8 @@
 .draggable {
     margin-left: 2%;
     margin-top: 5px;
-    display:inline-block;
+    display:inline;
+    float:left;
 	text-align: left;
 	vertical-align: top;
     background-color: #efefff;
@@ -10,7 +11,7 @@
     padding-bottom: 10px;
     min-width: 48%;
     max-width: 48%;
-    border: 1px solid #efefff;;
+    border: 1px solid #efefff;
     box-sizing: border-box;
 }
 .drag-button {

runestone/dragndrop/js/dragndrop.js

@@ -82,14 +82,18 @@ DragNDrop.prototype.createNewElements = function () {
     $(this.containerDiv).text(this.question);
     this.containerDiv.appendChild(document.createElement("br"));
 
+    this.dragDropWrapDiv = document.createElement("div");   // Holds the draggables/dropzones, prevents feedback from bleeding in
+    $(this.dragDropWrapDiv).css("display", "block");
+    this.containerDiv.appendChild(this.dragDropWrapDiv);
+
     this.draggableDiv = document.createElement("div");
     $(this.draggableDiv).addClass("draggable dragzone");
     this.addDragDivListeners();
 
     this.dropZoneDiv = document.createElement("div");
     $(this.dropZoneDiv).addClass("draggable");
-    this.containerDiv.appendChild(this.draggableDiv);
-    this.containerDiv.appendChild(this.dropZoneDiv);
+    this.dragDropWrapDiv.appendChild(this.draggableDiv);
+    this.dragDropWrapDiv.appendChild(this.dropZoneDiv);
 
     this.createButtons();
     this.checkLocalStorage();
@@ -100,8 +104,12 @@ DragNDrop.prototype.createNewElements = function () {
     if (!this.hasStoredDropzones) {
         this.minheight = $(this.draggableDiv).height();
     }
-
     this.draggableDiv.style.minHeight = this.minheight.toString() + "px";
+    if ($(this.dropZoneDiv).height() > this.minheight) {
+        this.dragDropWrapDiv.style.minHeight = $(this.dropZoneDiv).height().toString() + "px";
+    } else {
+        this.dragDropWrapDiv.style.minHeight = this.minheight.toString() + "px";
+    }
 };
 
 DragNDrop.prototype.addDragDivListeners = function () {
@@ -368,7 +376,8 @@ DragNDrop.prototype.checkLocalStorage = function () {
 =================================*/
 $(document).ready(function () {
     $("[data-component=dragndrop]").each(function (index) {
-        ddList[this.id] = new DragNDrop({"orig": this});
+        if ($(this.parentNode).data("component") !== "timedAssessment") { // If this element exists within a timed component, don't render it here
+            ddList[this.id] = new DragNDrop({"orig": this});
+        }
     });
-
 });