[mapguide-commits] r5485 - in trunk/MgDev/Web/src: localized
mapviewerjava mapviewernet viewerfiles
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Dec 27 20:48:18 EST 2010
Author: hubu
Date: 2010-12-27 17:48:18 -0800 (Mon, 27 Dec 2010)
New Revision: 5485
Modified:
trunk/MgDev/Web/src/localized/en
trunk/MgDev/Web/src/mapviewerjava/common.jsp
trunk/MgDev/Web/src/mapviewernet/common.aspx
trunk/MgDev/Web/src/viewerfiles/bufferui.templ
Log:
Fixed Ticket: https://trac.osgeo.org/mapguide/ticket/1579
1. Validate the input of "Transparency/Thickness/Distance" in Buffer is numeric in javascript, if no we will alert the user.
2. Validate the string is a numeric string before convert this string to double/int.
Modified: trunk/MgDev/Web/src/localized/en
===================================================================
--- trunk/MgDev/Web/src/localized/en 2010-12-27 07:08:21 UTC (rev 5484)
+++ trunk/MgDev/Web/src/localized/en 2010-12-28 01:48:18 UTC (rev 5485)
@@ -103,6 +103,7 @@
BUFFERERRORNOLAYERNAME = Please enter a layer name.
BUFFERERRORNEGATIVETHICKNESS = Please enter positive or null thickness.
BUFFERERRORNOSELECTION = Please select feature(s) to calculate a buffer around.
+BUFFERINPUTWARNNING = Input should be Numeric!
# ColorPicker
COLORPICKERDLGTITLE = Select a color
Modified: trunk/MgDev/Web/src/mapviewerjava/common.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/common.jsp 2010-12-27 07:08:21 UTC (rev 5484)
+++ trunk/MgDev/Web/src/mapviewerjava/common.jsp 2010-12-28 01:48:18 UTC (rev 5485)
@@ -53,7 +53,10 @@
String strval = GetParameter(request, name);
if(strval.equals(""))
return 0;
- return Integer.parseInt(strval);
+ if(Pattern.matches("^[0-9]*$", strval))
+ return Integer.parseInt(strval);
+ else
+ return 0;
}
double GetDoubleParameter(HttpServletRequest request, String name)
@@ -61,7 +64,10 @@
String strval = GetParameter(request, name);
if(strval.equals(""))
return 0;
- return Double.parseDouble(strval);
+ if(Pattern.matches("^(\d+)([.]{0,1})(\d*)$", strval))
+ return Double.parseDouble(strval);
+ else
+ return 0;
}
double GetLocalizedDoubleParameter(HttpServletRequest request, String name, String locale)
Modified: trunk/MgDev/Web/src/mapviewernet/common.aspx
===================================================================
--- trunk/MgDev/Web/src/mapviewernet/common.aspx 2010-12-27 07:08:21 UTC (rev 5484)
+++ trunk/MgDev/Web/src/mapviewernet/common.aspx 2010-12-28 01:48:18 UTC (rev 5485)
@@ -83,7 +83,10 @@
String strval = GetParameter(parameters, name);
if ("" == strval)
return 0;
- return Convert.ToInt32(strval);
+ if(System.Text.RegularExpressions.Regex.IsMatch(strval,@"^[0-9]*$"))
+ return Convert.ToInt32(strval);
+ else
+ return 0;
}
double GetDoubleParameter(NameValueCollection parameters, String name)
@@ -91,7 +94,10 @@
String strval = GetParameter(parameters, name);
if ("" == strval)
return 0;
- return Convert.ToDouble(strval, NumberFormatInfo.InvariantInfo);
+ if(System.Text.RegularExpressions.Regex.IsMatch(strval,@"^(\d+)([.]{0,1})(\d*)$"))
+ return Convert.ToDouble(strval, NumberFormatInfo.InvariantInfo);
+ else
+ return 0;
}
Modified: trunk/MgDev/Web/src/viewerfiles/bufferui.templ
===================================================================
--- trunk/MgDev/Web/src/viewerfiles/bufferui.templ 2010-12-27 07:08:21 UTC (rev 5484)
+++ trunk/MgDev/Web/src/viewerfiles/bufferui.templ 2010-12-28 01:48:18 UTC (rev 5485)
@@ -219,6 +219,15 @@
mf.GotoHomePage();
}
+function ValidateInput(id)
+{
+ var input = document.getElementById(id);
+ if(isNaN(input.value))
+ {
+ alert("__#BUFFERINPUTWARNNING#__");
+ }
+}
+
</script>
</head>
<body onload="InitDocument()" marginwidth=5 marginheight=5 leftmargin=5 topmargin=5 bottommargin=5 rightmargin=5>
@@ -234,7 +243,7 @@
</td></tr>
<tr><td height="6"></td></tr>
<tr><td >__#BUFFERDISTANCE#__</td></tr>
- <tr><td><input type="edit" name="DISTANCE" id="distance" value="1" size="5" class="Ctrl">
+ <tr><td><input type="edit" name="DISTANCE" id="distance" value="1" size="5" class="Ctrl" onkeyup="ValidateInput('distance')">
<select name="UNITS" class="Ctrl">
<option value="mi" %s>__#DISTANCEMILES#__</option>
<option value="ki" %s>__#DISTANCEKILOMETERS#__</option>
@@ -286,7 +295,7 @@
<input type="button" value="..." style="width: 22px;" onclick="PickColor(1,false,false)" class="Ctrl"></td></tr>
<tr><td height="6"></td></tr>
<tr><td>__#BUFFERTRANSPARENCY#__</td></tr>
- <tr><td><input type="text" name="FORETRANS" size="4" value="50" class="Ctrl"> %%</td></tr>
+ <tr><td><input type="text" id="foretrans" name="FORETRANS" size="4" value="50" class="Ctrl" onkeyup="ValidateInput('foretrans');"> %%</td></tr>
<tr><td height="6"></td></tr>
<tr><td>__#BUFFERBACKGROUNDCOLOR#__</td></tr>
<tr><td><span class="BufferSwatch" id="fbcolorswtach" > __#TRANSPARENT#__ </span>
@@ -317,7 +326,7 @@
<input type="button" value="..." style="width: 22px;" onclick="PickColor(0, false,false)" class="Ctrl"></td></tr>
<tr><td height="6"></td></tr>
<tr><td>__#BUFFERBORDERLINETHICKNESS#__</td></tr>
- <tr><td><input type="edit" name="THICKNESS" id="thickness" value="1" size="10" class="Ctrl"></td></tr>
+ <tr><td><input type="edit" name="THICKNESS" id="thickness" value="1" size="10" class="Ctrl" onkeyup="ValidateInput('thickness')"></td></tr>
<tr><td> </td></tr>
</table>
</td></tr>
More information about the mapguide-commits
mailing list