You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/08/29 04:03:11 UTC

svn commit: r990475 - in /myfaces/tomahawk/trunk/core20/src/test/java/org/apache/myfaces: custom/tree/renderkit/html/HtmlTreeImageCommandLinkRendererTest.java renderkit/html/ext/HtmlLinkRendererTest.java

Author: lu4242
Date: Sun Aug 29 02:03:11 2010
New Revision: 990475

URL: http://svn.apache.org/viewvc?rev=990475&view=rev
Log:
MYFACES-2901 Bundle oamSubmit.js into jsf.js

Modified:
    myfaces/tomahawk/trunk/core20/src/test/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeImageCommandLinkRendererTest.java
    myfaces/tomahawk/trunk/core20/src/test/java/org/apache/myfaces/renderkit/html/ext/HtmlLinkRendererTest.java

Modified: myfaces/tomahawk/trunk/core20/src/test/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeImageCommandLinkRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core20/src/test/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeImageCommandLinkRendererTest.java?rev=990475&r1=990474&r2=990475&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core20/src/test/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeImageCommandLinkRendererTest.java (original)
+++ myfaces/tomahawk/trunk/core20/src/test/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeImageCommandLinkRendererTest.java Sun Aug 29 02:03:11 2010
@@ -66,7 +66,7 @@ public class HtmlTreeImageCommandLinkRen
             new HtmlRenderedAttr("onfocus"), 
             new HtmlRenderedAttr("onblur"),
             //_EventProperties
-            new HtmlRenderedAttr("onclick", "onclick", "return jsf.util.chain(document.getElementById('j_id0'), event,'onclick', 'return oamSubmitForm(\\'linkDummyForm\\',\\'j_id0\\');');"), 
+            new HtmlRenderedAttr("onclick", "onclick", "return jsf.util.chain(document.getElementById('j_id0'), event,'onclick', 'return myfaces.oam.submitForm(\\'linkDummyForm\\',\\'j_id0\\');');"), 
             new HtmlRenderedAttr("ondblclick"), 
             new HtmlRenderedAttr("onkeydown"), 
             new HtmlRenderedAttr("onkeypress"),

Modified: myfaces/tomahawk/trunk/core20/src/test/java/org/apache/myfaces/renderkit/html/ext/HtmlLinkRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core20/src/test/java/org/apache/myfaces/renderkit/html/ext/HtmlLinkRendererTest.java?rev=990475&r1=990474&r2=990475&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core20/src/test/java/org/apache/myfaces/renderkit/html/ext/HtmlLinkRendererTest.java (original)
+++ myfaces/tomahawk/trunk/core20/src/test/java/org/apache/myfaces/renderkit/html/ext/HtmlLinkRendererTest.java Sun Aug 29 02:03:11 2010
@@ -25,6 +25,7 @@ import junit.framework.TestSuite;
 
 import org.apache.myfaces.component.html.ext.HtmlCommandLink;
 import org.apache.myfaces.shared_impl.config.MyfacesConfig;
+import org.apache.myfaces.shared_tomahawk.renderkit.html.util.ResourceUtils;
 import org.apache.myfaces.test.AbstractTomahawkViewControllerTestCase;
 import org.apache.myfaces.test.mock.MockExternalContext;
 import org.apache.myfaces.test.mock.MockHttpServletRequest;
@@ -58,7 +59,6 @@ public class HtmlLinkRendererTest extend
 
         UIForm form = new UIForm();
         form.getChildren().add(link);
-
     }
 
     public void tearDown() throws Exception
@@ -80,7 +80,7 @@ public class HtmlLinkRendererTest extend
             new HtmlRenderedAttr("onfocus"), 
             new HtmlRenderedAttr("onblur"),
             //_EventProperties
-            new HtmlRenderedAttr("onclick", "onclick", "return jsf.util.chain(document.getElementById('j_id0:j_id0'), event,'onclick', 'return oamSubmitForm(\\'j_id0\\',\\'j_id0:j_id0\\');');"), 
+            new HtmlRenderedAttr("onclick", "onclick", "return jsf.util.chain(document.getElementById('j_id0:j_id0'), event,'onclick', 'return myfaces.oam.submitForm(\\'j_id0\\',\\'j_id0:j_id0\\');');"), 
             new HtmlRenderedAttr("ondblclick"), 
             new HtmlRenderedAttr("onkeydown"), 
             new HtmlRenderedAttr("onkeypress"),