TAP5-994 updated field autofocus script initialization

robink · Jan 29, 2010 · 7b351b7 · 7b351b7
1 parent fed4f94
commit 7b351b7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 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
@@ -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
@@ -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/...stry-core/src/test/java/org/apache/tapestry5/internal/services/RenderSupportImplTest.java b/...stry-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();