[mapguide-commits] r8064 - in sandbox/adsk/2.6l/Web/src: mapviewernet viewerfiles

[svn_mapguide at osgeo.org]

Author: hubu
Date: 2014-04-23 01:26:29 -0700 (Wed, 23 Apr 2014)
New Revision: 8064

Modified:
   sandbox/adsk/2.6l/Web/src/mapviewernet/setselection.aspx
   sandbox/adsk/2.6l/Web/src/viewerfiles/ajaxmappane.templ
   sandbox/adsk/2.6l/Web/src/viewerfiles/browserdetect.js
Log:
Submit on behalf of Andy Zhang.
IE 10 support for basic web layout.

Modified: sandbox/adsk/2.6l/Web/src/mapviewernet/setselection.aspx
===================================================================
--- sandbox/adsk/2.6l/Web/src/mapviewernet/setselection.aspx	2014-04-18 17:46:09 UTC (rev 8063)
+++ sandbox/adsk/2.6l/Web/src/mapviewernet/setselection.aspx	2014-04-23 08:26:29 UTC (rev 8064)
@@ -69,7 +69,7 @@
             MgReadOnlyLayerCollection layers = sel.GetLayers();
             if (layers == null || layers.GetCount() != 1)
             {
-                Response.Write("Error: There must be exactly one feature in the set."); ///NOXLATE dbg report only
+                Response.Write("<Error>Error: There must be exactly one feature in the set.</Error>"); ///NOXLATE dbg report only
                 return;
             }
             MgLayer layer = (MgLayer) layers.GetItem(0);
@@ -89,7 +89,7 @@
             features.Close();
             if (featCount != 1)
             {
-                Response.Write("Error: There must be exactly one feature in the set."); ///NOXLATE dbg report only
+                Response.Write("<Error>Error: There must be exactly one feature in the set.</Error>"); ///NOXLATE dbg report only
                 return;
             }
             MgRenderingService renderingSrvc = (MgRenderingService)site.CreateService(MgServiceType.RenderingService);
@@ -101,7 +101,7 @@
     }
     catch (MgException e)
     {
-        Response.Write("\nSetSelection Exception: " + e.GetDetails());
+        Response.Write("<Error>\nSetSelection Exception: " + e.GetDetails() + "</Error>");
     }
 %>
 

Modified: sandbox/adsk/2.6l/Web/src/viewerfiles/ajaxmappane.templ
===================================================================
--- sandbox/adsk/2.6l/Web/src/viewerfiles/ajaxmappane.templ	2014-04-18 17:46:09 UTC (rev 8063)
+++ sandbox/adsk/2.6l/Web/src/viewerfiles/ajaxmappane.templ	2014-04-23 08:26:29 UTC (rev 8064)
@@ -3163,8 +3163,8 @@
             var cntEls = xmlIn.getElementsByTagName("Content");
             var bDataUriSupport = (msie8plus || !msie);
             if (bDataUriSupport && mtEls.length == 1 && cntEls.length == 1) {
-                var mt = msie ? mtEls[0].text : mtEls[0].textContent;
-                var cnt = msie ? cntEls[0].text : cntEls[0].textContent;
+                var mt = (msie && !msie10plus) ? mtEls[0].text : mtEls[0].textContent;
+                var cnt =(msie && !msie10plus) ? cntEls[0].text : cntEls[0].textContent;
                 var dataUri = "data:" + mt + ";base64," + cnt;
                 PutSelectionImageUrl(++ selMapId, dataUri);
             } else {
@@ -4180,7 +4180,7 @@
             var feat = { values: [] };
             var featEl = featEls[j];
             var bounds = featEl.getElementsByTagName("Bounds")[0];
-            var bbox = (msie ? bounds.text : bounds.textContent).split(" ");
+            var bbox = ((msie && !msie10plus) ? bounds.text : bounds.textContent).split(" ");
             feat.zoom = { minx: parseFloat(bbox[0]), miny: parseFloat(bbox[1]), maxx: parseFloat(bbox[2]), maxy: parseFloat(bbox[3]) };
             
             var propEls = featEl.getElementsByTagName("Property");
@@ -4189,10 +4189,10 @@
                 var nameEl = propEls[k].getElementsByTagName("Name")[0];
                 var valueEl = propEls[k].getElementsByTagName("Value");
                 //Name,Value
-                var name = msie ? nameEl.text : nameEl.textContent;
+                var name = (msie && !msie10plus) ? nameEl.text : nameEl.textContent;
                 var value = null;
                 if (valueEl.length == 1)
-                    value = msie ? valueEl[0].text : valueEl[0].textContent;
+                    value = (msie && !msie10plus) ? valueEl[0].text : valueEl[0].textContent;
                 feat.values.push({ name: name, value: value });
             }
             featuresByLayer[layerName].push(feat);

Modified: sandbox/adsk/2.6l/Web/src/viewerfiles/browserdetect.js
===================================================================
--- sandbox/adsk/2.6l/Web/src/viewerfiles/browserdetect.js	2014-04-18 17:46:09 UTC (rev 8063)
+++ sandbox/adsk/2.6l/Web/src/viewerfiles/browserdetect.js	2014-04-23 08:26:29 UTC (rev 8064)
@@ -29,6 +29,7 @@
 var msie7plus = false;
 var msie8plus = false;
 var msie6minus = false;
+var msie10plus = false;
 if(msieIndex != -1)
 {
     msie = true;
@@ -39,11 +40,17 @@
         msie7plus = true;
         msie8plus = false;
     }
-    else if (parseFloat(msieVersion) >= 8)
+    else if (parseFloat(msieVersion) >= 8 &&(parseFloat(msieVersion)) < 10)
     {
         msie7plus = true;
         msie8plus = true;
     }
+    else if (parseFloat(msieVersion) >= 10)
+    {
+        msie7plus = true;
+        msie8plus = true;
+        msie10plus = true;
+    }
     else
     {
         msie6minus = true;