xmblackberry-devel

[Rick S. <rw...@us...>]

Update of /cvsroot/xmblackberry/XmBlackBerry/WebApps/golf/html
In directory vz-cvs-3.sog:/tmp/cvs-serv32325/html

Modified Files:
	golf 
Log Message:
Only do the cursor distance calculations after a timeout, less jerky
on the blackberry.
Only show the pan and zoom controls if the automatic map updates are
disabled.


Index: golf
===================================================================
RCS file: /cvsroot/xmblackberry/XmBlackBerry/WebApps/golf/html/golf,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** golf	9 Apr 2011 11:56:09 -0000	1.30
--- golf	10 Apr 2011 11:31:50 -0000	1.31
***************
*** 342,345 ****
--- 342,347 ----
      	this.currentPar = document.getElementById("CurrentPar");
      	this.currentDistance = document.getElementById("CurrentDistance");
+     	this.displayCursorTimer = null;
+     	this.lastCursorEvent = null;
      	this.teeLat = document.getElementById("TeeLat");
      	this.teeLon = document.getElementById("TeeLon");
***************
*** 744,748 ****
  		mapOptions.center = myLocation;
  		mapOptions.mapTypeId = google.maps.MapTypeId.SATELLITE;
! 		//mapOptions.navigationControlOptions = {style: google.maps.NavigationControlStyle.DEFAULT};
  		if (window.blackberry)
  		{
--- 746,750 ----
  		mapOptions.center = myLocation;
  		mapOptions.mapTypeId = google.maps.MapTypeId.SATELLITE;
! 		mapOptions.streetViewControl = false;
  		if (window.blackberry)
  		{
***************
*** 752,758 ****
  		    mapOptions.keyboardShortcuts = false;
  		    mapOptions.mapTypeControl = false;
! 		    mapOptions.panControl = true;
! 		    //mapOptions.navigationControl = false;
! 		    mapOptions.zoomControl = true;
  		    mapOptions.scrollwheel = false;
  		    mapOptions.zoom = 16;
--- 754,767 ----
  		    mapOptions.keyboardShortcuts = false;
  		    mapOptions.mapTypeControl = false;
! 		    if (this.mapDisable.checked)
! 		    {
! 			mapOptions.panControl = true;
! 			mapOptions.zoomControl = true;
! 		    }
! 		    else
! 		    {
! 			mapOptions.panControl = false;
! 			mapOptions.zoomControl = false;
! 		    }
  		    mapOptions.scrollwheel = false;
  		    mapOptions.zoom = 16;
***************
*** 773,776 ****
--- 782,795 ----
  		    this.mapCanvas.parentNode.width = window.innerWidth - (2 * this.mapCanvas.clientX);
  		    this.mapCanvas.parentNode.height = window.innerHeight - this.mapCanvas.clientY - this.mapCanvas.parentNode.offsetParent.offsetHeight;
+ 		    if (this.mapDisable.checked)
+ 		    {
+ 			mapOptions.panControl = true;
+ 			mapOptions.zoomControl = true;
+ 		    }
+ 		    else
+ 		    {
+ 			mapOptions.panControl = false;
+ 			mapOptions.zoomControl = false;
+ 		    }
  		    //filler.parentNode.height = 320;
  		    //this.mapCanvas.parentNode.width = 426;
***************
*** 1094,1099 ****
--- 1113,1133 ----
  	if (! game.mapDisable.checked)
  	{
+ 	    game.lastCursorEvent = evt;
+ 	    if (game.displayCursorTimer)
+ 	    {
+ 		clearTimeout(game.displayCursorTimer);
+ 	    }
+ 	    game.displayCursorTimer = setTimeout(cursorDistanceCallback, 100);
+ 	}
+     }
+ 
+     function cursorDistanceCallback()
+     {
+ 	if (! game.mapDisable.checked && game.lastCursorEvent)
+ 	{
  	var hole;
+ 	var evt = game.lastCursorEvent;
  
+ 	    game.lastCursorEvent = null;
  	    hole = game.getCurrentHole();
  	    if (game.courseList.holes && game.courseList.holes[hole])
***************
*** 2662,2665 ****
--- 2696,2716 ----
      }
  
+     function updateMapDisable(toggle)
+     {
+     var options = new Object();
+ 
+ 	if (toggle.checked)
+ 	{
+ 	    options.panControl = true;
+ 	    options.zoomControl = true;
+ 	}
+ 	else
+ 	{
+ 	    options.panControl = false;
+ 	    options.zoomControl = false;
+ 	}
+ 	game.map.setOptions(options);
+     }
+ 
      function load()
      {
***************
*** 2942,2946 ****
  				<tr align="left">
  				    <td style="white-space: nowrap">
! 					<input id="mapDisable" checked="checked" type="checkbox" /><label for="mapDisable">Disable map updates</label>
  				    </td>
  				    <td style="white-space: nowrap">
--- 2993,2997 ----
  				<tr align="left">
  				    <td style="white-space: nowrap">
! 					<input id="mapDisable" checked="checked" type="checkbox" onclick="updateMapDisable(this)" /><label for="mapDisable">Disable map updates</label>
  				    </td>
  				    <td style="white-space: nowrap">