From caddd1e32396b328402db7e456346d202ea6fcd0 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Thu, 12 Dec 2013 13:37:47 +0200 Subject: More flexible criteria for using LegacyLocatorStrategy (#13017) Change-Id: I88070e09010de77ac4656df47a308aae635a8328 --- .../src/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java b/client/src/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java index dfd29058cd..cf91d5d4ad 100644 --- a/client/src/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java +++ b/client/src/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java @@ -75,7 +75,7 @@ public class LegacyLocatorStrategy implements LocatorStrategy { private final ApplicationConnection client; private static final RegExp validSyntax = RegExp - .compile("^((\\w+::)?(PID_S\\w+)?)?(/[$_a-zA-Z0-9]+\\[\\d+\\])*/?(#.*)?$"); + .compile("^((\\w+::)?((PID_S)?\\w[-$_a-zA-Z0-9]*)?)?(/[-$_a-zA-Z0-9]+\\[\\d+\\])*/?(#.*)?$"); public LegacyLocatorStrategy(ApplicationConnection clientConnection) { client = clientConnection; -- cgit v1.2.3