[Suiviobsmer-commits] r506 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages webapp
Author: fdesbois Date: 2010-06-11 12:38:37 +0000 (Fri, 11 Jun 2010) New Revision: 506 Log: Use change event instead of blur (doesn't change behavior) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java trunk/wao-ui/src/main/webapp/Connexion.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java 2010-06-10 17:38:10 UTC (rev 505) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java 2010-06-11 12:38:37 UTC (rev 506) @@ -12,6 +12,7 @@ import org.apache.tapestry5.Link; import org.apache.tapestry5.OptionModel; import org.apache.tapestry5.PersistenceConstants; +import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.SelectModel; import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary; import org.apache.tapestry5.annotations.InjectComponent; @@ -21,6 +22,7 @@ import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.internal.OptionModelImpl; import org.apache.tapestry5.internal.SelectModelImpl; +import org.apache.tapestry5.internal.services.PartialMarkupDocumentLinker; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.json.JSONArray; import org.apache.tapestry5.json.JSONObject; @@ -84,6 +86,9 @@ @Property private SelectModel emptySelectModel = new SelectModelImpl(new OptionModelImpl(null)); + @Inject + private RenderSupport renderSupport; + void onActivate(Object... activationContext) { if (logger.isDebugEnabled()) { logger.debug("Activiation context : " + @@ -113,28 +118,16 @@ return null; } -// /** -// * Empty selectModel to initialize userRole select. By default, Tapestry -// * generate the selectModel with the enum values. -// * -// * @return an empty SelectModel -// */ -// SelectModel getEmptySelectModel() { -// if (emptySelectModel == null) { -// emptySelectModel = new SelectModelImpl(new OptionModelImpl(null)); -// } -// return emptySelectModel; -// } - /** - * ON_BLUR :: Callback method for blur event on Login textfield component. + * ON_CHANGE :: Callback method for blur event on Login textfield component. * Login will be checked to refresh the userRole select using {@link * JSONObject} that contains data for select options to display in javascript. * * @param login User login * @return a JSONObject with userRole select data to refresh in Ajax */ - JSONObject onBlurFromLogin(String login) { + @Log + JSONObject onChangeFromLogin(String login) { JSONObject json = new JSONObject(); if (serviceUser.existLogin(login)) { Modified: trunk/wao-ui/src/main/webapp/Connexion.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Connexion.tml 2010-06-10 17:38:10 UTC (rev 505) +++ trunk/wao-ui/src/main/webapp/Connexion.tml 2010-06-11 12:38:37 UTC (rev 506) @@ -57,7 +57,7 @@ <p><t:label for="login" /> : </p> <p> <input t:type="textfield" t:id="login" t:value="login" - t:mixins="ck/onEvent" t:event="blur" t:onCompleteCallback="refreshUserRoles"/> + t:mixins="ck/onEvent" t:event="change" t:onCompleteCallback="refreshUserRoles"/> <img class="hidden" id="loginValid" src="${asset:context:img/valid-16px.png}" alt="Login valide" title="Login valide" /> <img class="hidden" id="loginInvalid" src="${asset:context:img/invalid-16px.png}" alt="Login invalide" title="Login invalide" /> </p>
participants (1)
-
fdesbois@users.labs.libre-entreprise.org