Changeset 30461

Timestamp:

2016-04-03T23:04:49+12:00 (8 years ago)

Author:

davidb

Message:

Goto form added in. More careful control of padding of elmements. Post-it mouse events restricted to be on 'thispage'. More careful conversion of CGI params to be numeric in JavaScript, where needed.

Location:

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

Files:

• annotate-main.js (modified) (4 diffs)
• annotate.js (modified) (4 diffs)
• musicstand-main.js (modified) (11 diffs)
• musicstand.js (modified) (1 diff)

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

@@ -19 +19 @@
     coord_div.innerHTML = mouseX + ", " + mouseY;
 
-
-     //get container padding using Dom's getStyle():
+    var containerRegion = YAHOO.util.Dom.getRegion("thispage");
+    var containerXL = containerRegion.left;
+    var containerXR = containerRegion.right;
+    var containerYT = containerRegion.top;
+    var containerYB = containerRegion.bottom;
+        
+    if (((mouseX < containerXL) || (mouseX > containerXR))
+    || ((mouseY < containerYT) || (mouseY > containerYB))) {
+    return; // outside of page image, so no post-it moving or resizing to do
+    }
+
     var containerPaddingX = parseInt(YAHOO.util.Dom.getStyle("thispage","padding-left"), 10);
     var containerPaddingY = parseInt(YAHOO.util.Dom.getStyle("thispage","padding-top"), 10);
+
+    
+     //get container padding using Dom's getStyle():
     //var newWidth = clickX - containerX - containerPaddingX;
     //var newHeight = clickY - containerY - containerPaddingY;
@@ -205 +217 @@
 function keyPress(e)
 {
-    if (e.keyID == "Escape") { 
-       musicStand.cancelPageAnim();
+    console.log("keyPress: keyCode = " + e.keyCode);
+    
+    if (e.keyCode == 27) /* escape pressed */ {
+    de.cursor.setCursor(null);
+    musicStand.cancelPageAnim();
     }
 
@@ -215 +230 @@
 
     if (cursorInfo==null) {
-        newAnnotation = true;
+
+    var containerX = YAHOO.util.Dom.getX("thispage");
+    var containerY = YAHOO.util.Dom.getY("thispage");
+
+    //var containerPaddingX = parseInt(YAHOO.util.Dom.getStyle("thispage","padding-left"), 10);
+    //var containerPaddingY = parseInt(YAHOO.util.Dom.getStyle("thispage","padding-top"), 10);
+
+    var containerRegion = YAHOO.util.Dom.getRegion("thispage");
+    var containerXL = containerRegion.left;
+    var containerXR = containerRegion.right;
+    var containerYT = containerRegion.top;
+    var containerYB = containerRegion.bottom;
+    
+    
+    if (   ((mouseX >= containerXL) && (mouseX <= containerXR))
+        && ((mouseY >= containerYT) && (mouseY <= containerYB))) {
+            newAnnotation = true;
+    }
     }
     else if (expeditee) {
@@ -242 +274 @@
 
     if (newAnnotation) {
-      // control/shift being down marks beginning key accelerators such 
-      // as ctrl-r or similar
-      // => ignore here, but let it bubble up further
-
-    var isAccelDown = de.events.Keyboard.isAcceleratorDown(e);
+    // control/shift being down marks beginning of short-cut keys,
+    // such as Ctrl-r or similar
+    // => ignore here, but let it bubble up further
+
+    var isAccelDown = de.events.Keyboard.isAcceleratorDown(e); // meta-key on mac, control-key on rest of OSes
     var isShiftDown = e.shiftKey;
-    //console.log("**** is accel down: " + isAccelDown);
-    //console.log("**** is shift down: " + isShiftDown);
-    //if (e.isAccelDown() || e.isShiftDown()) { return true; }
     if (isAccelDown || isShiftDown) { return true; }
 
-      if (e.keyID == "Escape") { 
-          // deactivate cursor !!!???????
-          de.cursor.setCursor(null);
-          return true; 
-      }
-
-      console.log("*** mouse: ("+mouseX+","+mouseY+")");
-    
-      var newAI = annotate.createAnnotation(mouseX-8,mouseY-14,null,"20","&nbsp;");
-
-      var annotateCanvasElem = document.getElementById("annotateCanvas");
-      annotateCanvasElem.appendChild(newAI);
-
-      var editableElems = getElementsByClass("editable-",newAI);
-      var editableElem = editableElems[0];
-
-      //var startCursor = de.cursor.createCursor(editableElem.firstChild,0,false);
-      var startCursor = de.cursor.createCursorDesc(editableElem.firstChild,0,false);
-      de.cursor.setCursor(startCursor);
-
+    if (e.keyCode == 27) /* escape pressed */ {
+        de.cursor.setCursor(null);
+        return true;
+    }
+    
+    console.log("*** mouse: ("+mouseX+","+mouseY+")");
+    var containerX = YAHOO.util.Dom.getX("thispage");
+    var containerY = YAHOO.util.Dom.getY("thispage");
+    var localMouseX = mouseX - containerX;
+    var localMouseY = mouseY - containerY;
+    
+    //var newAI = annotate.createAnnotation(mouseX-8,mouseY-14,null,"20","&nbsp;");
+    var newAI = annotate.createAnnotation(localMouseX-4,localMouseY-6,null,"20","&nbsp;");
+        
+    var annotateCanvasElem = document.getElementById("annotateCanvas");
+    annotateCanvasElem.appendChild(newAI);
+    
+    var editableElems = getElementsByClass("editable-",newAI);
+    var editableElem = editableElems[0];
+    
+    //var startCursor = de.cursor.createCursor(editableElem.firstChild,0,false);
+    var startCursor = de.cursor.createCursorDesc(editableElem.firstChild,0,false);
+    de.cursor.setCursor(startCursor);
+    
     }
      

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

@@ -142 +142 @@
 
   this.saveAnnotation = function(annotateWrapper,editedElem) 
-  {
+    {
+    console.log("**** terminating saveAnnotation() as gsapi not ported");
+    return;
+    
        var docoid = editedElem.getAttribute("docoid");
         
@@ -206 +209 @@
 
   this.loadAnnotation = function(docoid,metapos)
-  {
+    {
+    console.log("**** terminating loadAnnotation() as gsapi not ported");
+    return;
+    
       var annotationMetaname = "annotation";
       var rectposMetaname    = "rectpos";
@@ -240 +246 @@
 
   this.loadAnnotations = function(docoid)
-  {
+    {
+    console.log("*** terminating loadAnnotations() as gsapi not ported");
+    return;
+    
       numAnnotations = 0;
       
@@ -293 +302 @@
       }
 
-      gsapi.removeDocumentMetadata(docoid,annotationMetaname,removeMetapos);
-      gsapi.removeDocumentMetadata(docoid,rectposMetaname,removeMetapos);
+      console.log("*** removeAnnotation(): supressing removeDocumentMetadata() as gsapi not ported");
+      
+      //gsapi.removeDocumentMetadata(docoid,annotationMetaname,removeMetapos);
+      //gsapi.removeDocumentMetadata(docoid,rectposMetaname,removeMetapos);
       numAnnotations--;
-      gsapi.setLiveMetadata(docoid,numAnnotationsMetaname,numAnnotations);
+      //gsapi.setLiveMetadata(docoid,numAnnotationsMetaname,numAnnotations);
   }
 }

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

@@ -2 +2 @@
 var cgiGotoPage; 
 if (gs.cgiParams["gp"]) {
-    cgiGotoPage = gs.cgiParams["gp"];
+    cgiGotoPage = Number(gs.cgiParams["gp"]);
 }
 else {
@@ -9 +9 @@
 
 var expeditee; 
-if (gs.cgiParams["expeditee"]) {
+if (gs.cgiParams["expeditee"] == "1") {
     expeditee = true;
 }
@@ -19 +19 @@
 var musicStand 
     = new MusicStand(httpdocument, gs.cgiParams["c"], gs.cgiParams["d"], gs.documentMetadata["assocfilepath"],
-             gs.cgiParams["numPages"], cgiGotoPage, 
-             gs.cgiParams["pageWidth"], gs.cgiParams["pageHeight"],
-             gs.cgiParams["scaleFactor"]);
+             Number(gs.cgiParams["numPages"]), cgiGotoPage, 
+             Number(gs.cgiParams["pageWidth"]), Number(gs.cgiParams["pageHeight"]),
+             Number(gs.cgiParams["scaleFactor"]));
 
 musicStand.setStyleColors(gs.variables["postitBgCol"],gs.variables["postitSelCol"]);
@@ -42 +42 @@
       } 
       catch(err) {
-      alert("Failed to initialise: " + err.message);
+      alert("musicstand-main.js: Failed to initialise: " + err.message);
       }
 });
@@ -96 +96 @@
   var thisImg = document.createElement('img');
   thisImg.onload = function (evt) {
-      //var annotateCanvasElem = document.getElementById("annotateCanvas");
-      //annotateCanvasElem.style.display = "none";
-
-      //annotate.loadAnnotations(musicStand.getDocOID());
+      var annotateCanvasElem = document.getElementById("annotateCanvas");
+      annotateCanvasElem.style.display = "none";
+
+      annotate.loadAnnotations(musicStand.getDocOID());
 
       var thisLoading = document.getElementById("loading");
@@ -108 +108 @@
       thisPageImg.src = thisImg.src;
 
-      //annotateCanvasElem.style.display = "block";
+      annotateCanvasElem.style.display = "block";
   }
 
-  // alert("url = " + thisPageUrl);
+  //alert("**** thisPageUrl = " + thisPageUrl);
 
   thisImg.src = thisPageUrl;
@@ -120 +120 @@
   var nextPageUrl = musicStand.httpnextanim(gs.cgiParams["pagePrefix"],gs.cgiParams["pageSuffix"],musicStand.getPageNum()+1);
 
-  var nextImg = document.createElement('img');
-  //nextImg.onload = function (evt) {
-  //nextPageImg.onload = function (evt) {
-  //    
-  //}
+  //var nextImg = document.createElement('img');
+  ////nextImg.onload = function (evt) {
+  ////nextPageImg.onload = function (evt) {
+  ////    
+  ////}
   nextPageImg.src = nextPageUrl;
 
+    if (musicStand.getPageNum()>1) {
+    // setup previous page, as page-1
+    var prevPageImg = document.getElementById("prevpageimg");
+    var prevPageUrl = musicStand.httpprevanim(gs.cgiParams["pagePrefix"],gs.cgiParams["pageSuffix"],musicStand.getPageNum()-1);
+
+    //var prevImg = document.createElement('img');
+    prevPageImg.src = prevPageUrl;
+    }
+    
   // some browsers clear clip rectangle with new image => set it to what we need
   var nextpagediv = document.getElementById("nextpagediv");
@@ -143 +152 @@
 
 
-  var thispage = document.getElementById("thispage");
+    var thispage = document.getElementById("thispage");
 
   //YAHOO.util.Event.addListener("thispage", 'mouseover', trackMouse);
@@ -158 +167 @@
     //de.events.addHandler(document,"keypress",keyPress);
     de.events.addHandler(document,"keystroke",keyPress);
+
+    //de.events.addHandler(thispage,"keystroke",keyPress);
+
+    //thispage.addEventListener("keydown", keyPress);
+    //thispage.addEventListener("keypress", keyPress);
+
+
+    //var gotoNavBar = document.getElementById("gotoNavBar");
+    //gotoNavBar.addEventListener("keydown", keyPress);
+    //gotoNavBar.addEventListener("keypress", keyPress);
+
+    //$('#gotoNavBar').bind('keydown',keyPress);
+    //$('#gotoNavBar').focus();
+             
+    
+    //YAHOO.util.Event.addListener("thispage", 'keydown', keyPress);
+    
 }
 
@@ -217 +243 @@
     var trackbelow = document.getElementById('slidertrackbelow');
     trackbelow.style.top = speedBreak + "px";
-    trackbelow.style.height = (gs.cgiParams["pageHeight"] - speedBreak) + "px";
+    trackbelow.style.height = (Number(gs.cgiParams["pageHeight"]) - speedBreak) + "px";
 
     }
@@ -268 +294 @@
     var trackbelow = document.getElementById('slidertrackbelow');
     trackbelow.style.top = speedBreak + "px";
-    trackbelow.style.height = (gs.cgiParams["pageHeight"] - speedBreak) + "px";
-}
-
+    trackbelow.style.height = (Number(gs.cgiParams["pageHeight"]) - speedBreak) + "px";
+}
+

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

@@ -344 +344 @@
   }
 
+
+  httpprevanimPrivate = function(pagePrefix,pageSuffix,prevPageNum)
+  {
+    var imgserver = imageserverURL();
+
+    var screenWidth = screen.width;
+    var screenHeight = screen.height;
+
+    prevPageNum--; // filenames use values one less that pageNum
+
+    var url = imgserver + "?a=fit-screen"
+    url += "&c="+collect;
+    url += "&site="+site;
+    url += "&pageWidth="+pageXDim;
+    url += "&pageHeight="+pageYDim;
+    url += "&assocDir=" + assocDir;
+    url += "&assocFile=" + pagePrefix;
+
+
+    if (totalPageCount>1) {
+      url += "-" + prevPageNum;
+    }
+    url += pageSuffix;
+
+    if (orientation == "landscape") {
+        url += "&orientation=landscape";
+    }
+
+    return url;
+  }
+
+  this.httpprevanim = function(pagePrefix,pageSuffix,prevPageNum)
+  {
+      return httpprevanimPrivate(pagePrefix,pageSuffix,prevPageNum);
+  }
+
+
+    
   nextPageAnimPrivate = function(pagePrefix,pageSuffix) 
   {