From 7b351b7f2455d5c0e6e46c632c4ba59a54dea987 Mon Sep 17 00:00:00 2001 From: robink Date: Fri, 29 Jan 2010 15:26:58 +0100 Subject: [PATCH] TAP5-994 updated field autofocus script initialization --- .../tapestry5/internal/services/RenderSupportImpl.java | 2 +- .../src/main/resources/org/apache/tapestry5/tapestry.js | 3 +++ .../tapestry5/internal/services/RenderSupportImplTest.java | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderSupportImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderSupportImpl.java index 9869c36a71..fc3f25607f 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderSupportImpl.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderSupportImpl.java @@ -212,7 +212,7 @@ public void commit() { if (focusFieldId != null) { - addScript("$('%s').activate();", focusFieldId); + addInitFunctionInvocation("activate", focusFieldId); } if (init.length() > 0) diff --git a/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js b/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js index 1db7d2174c..c96cbe5ec9 100644 --- a/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js +++ b/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js @@ -697,6 +697,9 @@ Element.addMethods([ /** Container of functions that may be invoked by the Tapestry.init() function. */ Tapestry.Initializer = { + activate: function(element){ + $(element).activate(); + }, ajaxFormLoop : function(spec) { diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderSupportImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderSupportImplTest.java index 3db1bf6ef1..50090e00b5 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderSupportImplTest.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderSupportImplTest.java @@ -277,7 +277,7 @@ public void field_focus() { DocumentLinker linker = mockDocumentLinker(); - linker.addScript("$('foo').activate();"); + linker.addScript("Tapestry.init({\"activate\":[\"foo\"]});"); replay(); @@ -295,7 +295,7 @@ public void first_focus_field_at_priority_wins() { DocumentLinker linker = mockDocumentLinker(); - linker.addScript("$('foo').activate();"); + linker.addScript("Tapestry.init({\"activate\":[\"foo\"]});"); replay(); @@ -314,7 +314,7 @@ public void higher_priority_wins_focus() { DocumentLinker linker = mockDocumentLinker(); - linker.addScript("$('bar').activate();"); + linker.addScript("Tapestry.init({\"activate\":[\"bar\"]});"); replay();