[interchange-cvs] interchange - heins modified dist/lib/UI/ContentEditor.pm

[interchange-core@interchange.redhat.com]

User:      heins
Date:      2002-02-16 19:24:45 GMT
Modified:  dist/lib/UI ContentEditor.pm
Log:
	* Don't require comp-name="[control component blah]" in component,
	  for efficiency (no additional parsing in arg).

Revision  Changes    Path
2.2       +5 -2      interchange/dist/lib/UI/ContentEditor.pm


rev 2.2, prev_rev 2.1
Index: ContentEditor.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/dist/lib/UI/ContentEditor.pm,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- ContentEditor.pm	16 Feb 2002 09:39:10 -0000	2.1
+++ ContentEditor.pm	16 Feb 2002 19:24:45 -0000	2.2
@@ -2,7 +2,7 @@
 #
 # UI::ContentEditor - Interchange page/component edit
 # 
-# $Id: ContentEditor.pm,v 2.1 2002/02/16 09:39:10 mheins Exp $
+# $Id: ContentEditor.pm,v 2.2 2002/02/16 19:24:45 mheins Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -23,7 +23,7 @@
 
 package UI::ContentEditor;
 
-$VERSION = substr(q$Revision: 2.1 $, 10);
+$VERSION = substr(q$Revision: 2.2 $, 10);
 $DEBUG = 0;
 
 use POSIX qw/strftime/;
@@ -224,10 +224,13 @@
 				 	(.*?)
 					\]  \s*  \[control\]
 				 |
-				 	\[ component \s+  (.*?) comp(?:[-_]name|onent) \s*=\s*["']\s*
+				 	\[ component \s+ 
+					(?:
+						(.*?) comp(?:[-_]name|onent) \s*=\s*["']\s*
 						(?:\[control \s+ component \s+ )?
 							(\w+)
 						\]? \s* ['"]
+					)?
 					(.*?)
 					\]
 				 )