Changeset 30460 for main

Timestamp:

2016-04-03T12:01:14+12:00 (8 years ago)

Author:

davidb

Message:

Adjustments to make resize and move posits working in new Greenstone3 environment

Location:

main/trunk/model-sites-dev/mozarts-laptop/collect/digital-music-stand/script

Files:

• annotate-main.js (modified) (5 diffs)
• annotate.js (modified) (1 diff)

main/trunk/model-sites-dev/mozarts-laptop/collect/digital-music-stand/script/annotate-main.js

@@ -23 +23 @@
     var containerPaddingX = parseInt(YAHOO.util.Dom.getStyle("thispage","padding-left"), 10);
     var containerPaddingY = parseInt(YAHOO.util.Dom.getStyle("thispage","padding-top"), 10);
-    var newWidth = clickX - containerX - containerPaddingX;
-    var newHeight = clickY - containerY - containerPaddingY;
+    //var newWidth = clickX - containerX - containerPaddingX;
+    //var newHeight = clickY - containerY - containerPaddingY;
 
 
@@ -36 +36 @@
        var ax_org = parseInt(annotateResizeElem.style.left);
        var ay_org = parseInt(annotateResizeElem.style.top);
-       var ax_dim = mouseX - ax_org +1;
-       var ay_dim = mouseY - ay_org +1;
+       //var ax_dim = mouseX - ax_org +1;
+       //var ay_dim = mouseY - ay_org +1;
+
+       var ax_dim = (clickX - containerX - containerPaddingX) - ax_org +1;
+       var ay_dim = (clickY - containerY - containerPaddingY) - ay_org +1;
 
        if ((ax_dim>16) && (ay_dim>16)) {
@@ -103 +106 @@
     annotateResizeElem = elem.parentNode.parentNode.parentNode.parentNode;
 
-    console.log("*** clearing selection and setting cursor to null!");
+    console.log("*** startRessizeAnnotation(): clearing selection and setting cursor to null!");
     de.selection.clear(); // clear selection
     de.cursor.setCursor(null); // clear focus
@@ -143 +146 @@
     moveXOffset = mouseX - parseInt(annotateMoveElem.style.left);
     moveYOffset = mouseY - parseInt(annotateMoveElem.style.top);
+
+    console.log("*** annotateMouseDown(): clearing selection and setting cursor to null!");
+    de.selection.clear(); // clear selection
+    de.cursor.setCursor(null); // clear focus
 
     return false; // stop selection of page Image
@@ -241 +248 @@
     var isAccelDown = de.events.Keyboard.isAcceleratorDown(e);
     var isShiftDown = e.shiftKey;
-    console.log("**** is accel down: " + isAccelDown);
-    console.log("**** is shift down: " + isShiftDown);
+    //console.log("**** is accel down: " + isAccelDown);
+    //console.log("**** is shift down: " + isShiftDown);
     //if (e.isAccelDown() || e.isShiftDown()) { return true; }
     if (isAccelDown || isShiftDown) { return true; }

main/trunk/model-sites-dev/mozarts-laptop/collect/digital-music-stand/script/annotate.js

@@ -120 +120 @@
       resizeElem.setAttribute("onmouseup",  "javascript:return stopResizeAnnotation(this,event);");
 
-      resizeElem.setAttribute("style", "cursor:default;");
+      resizeElem.setAttribute("style", "cursor:se-resize;");
       
       resizeElem.style.position = "absolute";