[open-ils-commits] r14326 - branches/rel_1_6_0/Open-ILS/xul/staff_client/server/patron (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2009-10-09 08:49:46 -0400 (Fri, 09 Oct 2009)
New Revision: 14326

Modified:
   branches/rel_1_6_0/Open-ILS/xul/staff_client/server/patron/ue_config.js
Log:
until a more flexible solution exists, make the default zip regex in the old-school patron editor Canada-friendly by default

Modified: branches/rel_1_6_0/Open-ILS/xul/staff_client/server/patron/ue_config.js
===================================================================
--- branches/rel_1_6_0/Open-ILS/xul/staff_client/server/patron/ue_config.js	2009-10-09 12:49:38 UTC (rev 14325)
+++ branches/rel_1_6_0/Open-ILS/xul/staff_client/server/patron/ue_config.js	2009-10-09 12:49:46 UTC (rev 14326)
@@ -34,7 +34,7 @@
 const phoneRegex	= /^\d{3}-\d{3}-\d{4}(| \S+.*)$/i;
 const nonumRegex	= /^[^\d\s]+[\d]*$/; /* no numbers, no beginning whitespace */
 const dateRegex	= /^\d{4}-\d{2}-\d{2}/;
-const zipRegex		= /^\d{5}(-\d{4}|-?$)/; /* 12345 or 12345-6789 */
+const zipRegex		= /^\d{5}(-\d{4}|-?$)|(^[ABCEGHJKLMNPRSTVXY]{1}\d{1}[A-Z]{1} *\d{1}[A-Z]{1}\d{1}$)/;
 
 var barredAlerted = false;