[mapguide-commits] r8313 - in trunk/MgDev/Web/src: mapviewernet viewerfiles
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Aug 1 01:21:22 PDT 2014
Author: hubu
Date: 2014-08-01 01:21:22 -0700 (Fri, 01 Aug 2014)
New Revision: 8313
Modified:
trunk/MgDev/Web/src/mapviewernet/mapframe.aspx
trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ
trunk/MgDev/Web/src/viewerfiles/browserdetect.js
Log:
#2474: Ajax viewer: support IE10. Submit on behalf of Andy Zhang.
Some functionalities of Ajax viewer don't work well in IE10. The main reason is that element.Text is replaced by element.TextContent? in IE10. We need to change our code accordingly.
Modified: trunk/MgDev/Web/src/mapviewernet/mapframe.aspx
===================================================================
--- trunk/MgDev/Web/src/mapviewernet/mapframe.aspx 2014-07-30 09:29:09 UTC (rev 8312)
+++ trunk/MgDev/Web/src/mapviewernet/mapframe.aspx 2014-08-01 08:21:22 UTC (rev 8313)
@@ -46,7 +46,7 @@
MgLocalizer.SetLocalizedFilesPath(Request.ServerVariables["APPL_PHYSICAL_PATH"] + "..\\localized\\");
infoWidth = showLegend = showProperties = 0;
- hlTgt = hlTgtName = locale = mapDefinition = sessionId = type = "";
+ hlTgt = hlTgtName = locale = mapDefinition = sessionId = "";
GetRequestParameters();
String mapRequest = "";
Modified: trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ
===================================================================
--- trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ 2014-07-30 09:29:09 UTC (rev 8312)
+++ trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ 2014-08-01 08:21:22 UTC (rev 8313)
@@ -3165,8 +3165,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 {
@@ -4206,7 +4206,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");
@@ -4215,10 +4215,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: trunk/MgDev/Web/src/viewerfiles/browserdetect.js
===================================================================
--- trunk/MgDev/Web/src/viewerfiles/browserdetect.js 2014-07-30 09:29:09 UTC (rev 8312)
+++ trunk/MgDev/Web/src/viewerfiles/browserdetect.js 2014-08-01 08:21:22 UTC (rev 8313)
@@ -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;
More information about the mapguide-commits
mailing list