MDL-47494 ddmarker: OU-2489 Using js instead of styling to position m…

…arkers correctly on home
moodle · Dec 2, 2011 · ac9c8df · ac9c8df
1 parent 53c8848
commit ac9c8df
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 23 deletions.
diff --git a/question/type/ddmarker/styles.css b/question/type/ddmarker/styles.css
@@ -7,25 +7,10 @@
     border: 1px solid #000000;
 }
 
-.que.ddmarker .draghome, form.mform fieldset#previewareaheader .draghome {
+.que.ddmarker .draghome img, .que.ddmarker .draghome span {
     visibility : hidden;
 }
 
-.que.ddmarker div.draghome, form.mform fieldset#previewareaheader div.draghome {
-    border: 1px dashed black;
-    cursor: move;
-    background-color: #B0C4DE;
-    display: -moz-inline-stack;
-    display:inline-block;
-    height: auto;
-    width: auto;
-    zoom: 1;
-    *display: inline;
-}
-.que.ddmarker .dragitems .dragitem,
-.que.ddmarker .dragitems .draghome {
-    vertical-align: top;
-}
 .que.ddmarker .dragitems .dragitem {
     cursor: move;
     position: absolute;
@@ -35,7 +20,7 @@
     margin : 10px;
 }
 .que.ddmarker .dragitems {
-    margin-top : 20px;
+    margin-top : 10px;
 }
 .que.ddmarker .dragitems.readonly .dragitem {
     cursor: auto;
@@ -63,8 +48,6 @@ form.mform fieldset#previewareaheader div.markertexts span.markertext {
     padding: 5px;
     display: -moz-inline-stack;
     display:inline-block;
-    height: auto;
-    width: auto;
     zoom: 1;
     *display: inline;
     -moz-border-radius: 10px;

diff --git a/question/type/ddmarker/yui/dd/dd.js b/question/type/ddmarker/yui/dd/dd.js
@@ -451,18 +451,21 @@ YUI.add('moodle-qtype_ddmarker-dd', function(Y) {
             var infinite = input.hasClass('infinite');
             var dragging = (null !== this.doc.drag_item_being_dragged(choiceno));
             var coords = [];
-            var dragitemhome = this.doc.drag_item_home(choiceno);
             if (fv !== '') {
                 var coordsstrings = fv.split(';');
                 for (var i=0; i<coordsstrings.length; i++) {
                     coords[coords.length] = this.convert_to_window_xy(coordsstrings[i].split(','));
                 }
             }
             if (infinite || (!dragging && fv === '')) {
-                coords[coords.length] = dragitemhome.getXY();
+                coords[coords.length] = this.drag_home_xy(choiceno);
             }
             return coords;
         },
+        drag_home_xy : function (choiceno) {
+            var dragitemhome = this.doc.drag_item_home(choiceno);
+            return [dragitemhome.getX(), dragitemhome.get('parentNode').getY()];
+        },
         get_choiceno_for_node : function(node) {
             return +this.doc.get_classname_numeric_suffix(node, 'choice');
         },
@@ -495,9 +498,8 @@ YUI.add('moodle-qtype_ddmarker-dd', function(Y) {
             if (xy !== null) {
                 xy = this.constrain_to_bgimg(xy);
             } else {
-                xy = this.doc.drag_item_home(choiceno).getXY();
+                xy = this.drag_home_xy(choiceno);
             }
-            console.log(e.direction, xy);
             e.preventDefault();
             dragitem.setXY(xy);
             this.save_all_xy_for_choice(choiceno, null);