[mapguide-commits] r6781 - branches/2.4/MgDev/Web/src/mapviewernet

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-06-18 06:11:32 -0700 (Mon, 18 Jun 2012)
New Revision: 6781

Modified:
   branches/2.4/MgDev/Web/src/mapviewernet/getselectedfeatures.aspx
Log:
#1780: Fix display of string properties containing line breaks. This for the .net viewer.

Modified: branches/2.4/MgDev/Web/src/mapviewernet/getselectedfeatures.aspx
===================================================================
--- branches/2.4/MgDev/Web/src/mapviewernet/getselectedfeatures.aspx	2012-06-18 12:56:03 UTC (rev 6780)
+++ branches/2.4/MgDev/Web/src/mapviewernet/getselectedfeatures.aspx	2012-06-18 13:11:32 UTC (rev 6781)
@@ -83,6 +83,7 @@
     String sessionId;
     String locale;
     CultureInfo culture;
+    System.Text.RegularExpressions.Regex regex;
 
     static NameValueCollection GetLayerPropertyMappings(MgResourceService resSvc, MgLayerBase layer)
     {
@@ -132,6 +133,7 @@
                 break;
             case MgPropertyType.String:
                 value = JsonEscape(reader.GetString(propName)); //String content is arbitrary
+                value = regex.Replace(value, " ").Trim();
                 break;
             default: //NOT PRESENTABLE IN PROPERTY GRID
                 value = "";
@@ -260,6 +262,7 @@
         locale = GetDefaultLocale();
 
     culture = CultureInfo.GetCultureInfo(locale);
+    regex = new System.Text.RegularExpressions.Regex("\\s+");
 
     //HACK: The default locale (en) resolves to a neutral culture, .net forbids the use of
     //neutral cultures for formatting purposes, so default to InvariantCulture if the resolved