[mapguide-commits] r9376 - in branches/3.1/MgDev: . Web/src/viewerfiles

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-04-01 06:38:45 -0700 (Sun, 01 Apr 2018)
New Revision: 9376

Modified:
   branches/3.1/MgDev/
   branches/3.1/MgDev/Web/src/viewerfiles/
   branches/3.1/MgDev/Web/src/viewerfiles/ajaxmappane.templ
Log:
Merged revision(s) 9375 from trunk/MgDev:
Prevent clicks from tooltip content from falling through, triggering normal click handling (eg. Selection).

Fixes #2779
........


Index: branches/3.1/MgDev
===================================================================
--- branches/3.1/MgDev	2018-04-01 13:32:48 UTC (rev 9375)
+++ branches/3.1/MgDev	2018-04-01 13:38:45 UTC (rev 9376)

Property changes on: branches/3.1/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
## -15,4 +15,4 ##
 /sandbox/jng/tiling:8174-8208
 /sandbox/jng/v30:8212-8227
 /sandbox/rfc94:5099-5163
-/trunk/MgDev:8955-8956,8969,8980-8981,8986,8996,9000,9004-9006,9010,9018-9021,9034,9038,9042,9094,9106-9107,9147,9339-9343,9353,9360,9363,9369
\ No newline at end of property
+/trunk/MgDev:8955-8956,8969,8980-8981,8986,8996,9000,9004-9006,9010,9018-9021,9034,9038,9042,9094,9106-9107,9147,9339-9343,9353,9360,9363,9369,9375
\ No newline at end of property
Index: branches/3.1/MgDev/Web/src/viewerfiles
===================================================================
--- branches/3.1/MgDev/Web/src/viewerfiles	2018-04-01 13:32:48 UTC (rev 9375)
+++ branches/3.1/MgDev/Web/src/viewerfiles	2018-04-01 13:38:45 UTC (rev 9376)

Property changes on: branches/3.1/MgDev/Web/src/viewerfiles
___________________________________________________________________
Modified: svn:mergeinfo
## -5,4 +5,4 ##
 /sandbox/adsk/3.2o.AIMS/Web/src/viewerfiles:9136-9139
 /sandbox/jng/createruntimemap/Web/src/viewerfiles:7486-7555
 /sandbox/jng/v30/Web/src/viewerfiles:8226-8227
-/trunk/MgDev/Web/src/viewerfiles:9034,9339-9343
\ No newline at end of property
+/trunk/MgDev/Web/src/viewerfiles:9034,9339-9343,9375
\ No newline at end of property
Modified: branches/3.1/MgDev/Web/src/viewerfiles/ajaxmappane.templ
===================================================================
--- branches/3.1/MgDev/Web/src/viewerfiles/ajaxmappane.templ	2018-04-01 13:32:48 UTC (rev 9375)
+++ branches/3.1/MgDev/Web/src/viewerfiles/ajaxmappane.templ	2018-04-01 13:38:45 UTC (rev 9376)
@@ -893,6 +893,17 @@
 
 function OnMouseDown(e)
 {
+    //Check if this event originated from the tooltip (or child within)
+    var tgt = msie ? e.srcElement: e.target;
+    while(tgt && tgt.tagName != "BODY")
+    {
+        if(tgt.id == "hlTip") 
+        {
+            return true;
+        }
+        tgt = tgt.parentNode;
+    }
+
     if(!PopupMouseDown(e))
     {
         hidePopup(tbMenu);