Changeset 30456

Timestamp:

2016-04-02T22:57:40+13:00 (8 years ago)

Author:

davidb

Message:

Changes to work with the newer direct-edit JS script that was put into Greenstone3

Location:

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

Files:

• annotate-main.js (added)
• annotate.js (modified) (3 diffs)
• musicstand-main.js (modified) (3 diffs)

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

@@ -92 +92 @@
       editableElem.setAttribute("metapos",numAnnotations);
 
+      //editableElem.setAttribute("style", "cursor:text;");
+      
       editableElem.style.position     = "relative";
 
@@ -101 +103 @@
       tdTextElem.setAttribute("onmousedown","javascript:return annotateMouseDown(this,event);");
       tdTextElem.setAttribute("onmouseup",  "javascript:return annotateMouseUp(this,event);");
-
+      tdTextElem.setAttribute("style", "cursor:text;");
+      
       var closeElem = document.createElement("div");
-      closeElem.onmouseup=closeAnnotation;
-
+      //closeElem.onmouseup=closeAnnotation;
+      closeElem.setAttribute("onmouseup","javascript:return closeAnnotation(this,event);");
+      closeElem.setAttribute("style", "cursor:default;");
+      
       closeElem.style.position = "absolute";
       closeElem.style.top      = "0px";
@@ -115 +120 @@
       resizeElem.setAttribute("onmouseup",  "javascript:return stopResizeAnnotation(this,event);");
 
+      resizeElem.setAttribute("style", "cursor:default;");
+      
       resizeElem.style.position = "absolute";
       resizeElem.style.bottom   = "0px";

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

@@ -6 +6 @@
 else {
     cgiGotoPage = 1;
+}
+
+var expeditee; 
+if (gs.cgiParams["expeditee"]) {
+    expeditee = true;
+}
+else {
+    expeditee = false;
 }
 
@@ -15 +23 @@
              gs.cgiParams["scaleFactor"]);
 
-musicStand.setStyleColors("_postitbgcol_","_postitselcol_");
+musicStand.setStyleColors(gs.variables["postitBgCol"],gs.variables["postitSelCol"]);
 
 musicStand.setPagePrefix(gs.cgiParams["pagePrefix"]);
 musicStand.setPageSuffix(gs.cgiParams["pageSuffix"]);
 
+var annotate = new Annotate(gs.variables.httpCollectionImages);
+
+if (gs.userInformation && gs.userInformation.username) {
+  musicStand.setUsername(gs.username);
+  annotate.setUsername(gs.username);
+}
+
+//  de.events.addLoadHandler(function()
+
+$(window).load(function(){
+      try {
+      bodyLoaded();                       
+      } 
+      catch(err) {
+      alert("Failed to initialise: " + err.message);
+      }
+});
 
 
@@ -120 +145 @@
   var thispage = document.getElementById("thispage");
 
-  ////YAHOO.util.Event.addListener("thispage", 'mouseover', trackMouse);
-  //// YAHOO.util.Event.addListener(document, 'mousemove', trackMouse);
-
-  //de.events.addMouseMoveHandler(trackMouse);
-
-  //// de.events.prependMouseUpHandler(musicStand.pageMenu);
-
-  ////YAHOO.util.Event.addListener(document, 'keydown', keyPress);
-
-  //de.events.prependKeyPressHandler(keyPress);
+  //YAHOO.util.Event.addListener("thispage", 'mouseover', trackMouse);
+  // YAHOO.util.Event.addListener(document, 'mousemove', trackMouse);
+
+    //de.events.addMouseMoveHandler(trackMouse);
+    de.events.addHandler(document,"mousemove",trackMouse);
+
+  // de.events.prependMouseUpHandler(musicStand.pageMenu);
+
+  //YAHOO.util.Event.addListener(document, 'keydown', keyPress);
+
+    //de.events.prependKeyPressHandler(keyPress);
+    //de.events.addHandler(document,"keypress",keyPress);
+    de.events.addHandler(document,"keystroke",keyPress);
 }