You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2009/02/17 18:56:54 UTC

svn commit: r745173 - in /myfaces/trinidad/trunk/trinidad-impl/src: main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/

Author: matzew
Date: Tue Feb 17 17:56:53 2009
New Revision: 745173

URL: http://svn.apache.org/viewvc?rev=745173&view=rev
Log:
TRINIDAD-1400 - Trinidad's inputText (maxLength) doesn't work correct for the "paste" event 

added getOnpaste() handle, which will render the "_checkLength" function (if needed) for the
onpaste attribute. updated golden files to reflect the new rendered attribute

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java
    myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimal-golden.xml
    myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalIE-golden.xml
    myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalIERtl-golden.xml
    myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalInacc-golden.xml
    myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalPPC-golden.xml
    myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalSaf-golden.xml
    myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalScrRdr-golden.xml

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java?rev=745173&r1=745172&r2=745173&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java Tue Feb 17 17:56:53 2009
@@ -295,6 +295,7 @@
 
     ResponseWriter rw = context.getResponseWriter();
     rw.writeAttribute("onselect", getOnselect(bean), "onselect");
+    rw.writeAttribute("onpaste", getOnpaste(bean), "onpaste");
   }
 
   @Override
@@ -610,6 +611,23 @@
     return onchange;
   }
 
+  protected String getOnpaste(
+    FacesBean bean
+    )
+  {
+    String onpaste = null;
+    if (isTextArea(bean))
+    {
+      Number maximumLength = getMaximumLength(bean);
+      if(maximumLength != null && maximumLength.intValue()> 0)
+      {
+        onpaste = _getMaxLengthFunction(null,
+                                        maximumLength.intValue());
+      }
+    }
+    return onpaste;
+  }
+
   protected String getOnselect(
     FacesBean bean
     )

Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimal-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimal-golden.xml?rev=745173&r1=745172&r2=745173&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimal-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimal-golden.xml Tue Feb 17 17:56:53 2009
@@ -198,6 +198,7 @@
                  name="mainId"
                  onchange="return _checkLength(this,4,event)"
                  onkeyup="return _checkLength(this,4,event)"
+                 onpaste="return _checkLength(this,4,event)"
                  rows="5"
                 >
               Text

Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalIE-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalIE-golden.xml?rev=745173&r1=745172&r2=745173&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalIE-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalIE-golden.xml Tue Feb 17 17:56:53 2009
@@ -198,6 +198,7 @@
                  name="mainId"
                  onchange="return _checkLength(this,4,event)"
                  onkeyup="return _checkLength(this,4,event)"
+                 onpaste="return _checkLength(this,4,event)"
                  rows="5"
                 >
               Text

Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalIERtl-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalIERtl-golden.xml?rev=745173&r1=745172&r2=745173&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalIERtl-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalIERtl-golden.xml Tue Feb 17 17:56:53 2009
@@ -198,6 +198,7 @@
                  name="mainId"
                  onchange="return _checkLength(this,4,event)"
                  onkeyup="return _checkLength(this,4,event)"
+                 onpaste="return _checkLength(this,4,event)"
                  rows="5"
                 >
               Text

Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalInacc-golden.xml?rev=745173&r1=745172&r2=745173&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalInacc-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalInacc-golden.xml Tue Feb 17 17:56:53 2009
@@ -193,6 +193,7 @@
                  name="mainId"
                  onchange="return _checkLength(this,4,event)"
                  onkeyup="return _checkLength(this,4,event)"
+                 onpaste="return _checkLength(this,4,event)"
                  rows="5"
                 >
               Text

Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalPPC-golden.xml?rev=745173&r1=745172&r2=745173&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalPPC-golden.xml Tue Feb 17 17:56:53 2009
@@ -235,6 +235,7 @@
                  name="mainId"
                  onchange="return _checkLength(this,4,event)"
                  onkeyup="return _checkLength(this,4,event)"
+                 onpaste="return _checkLength(this,4,event)"
                  rows="5"
                 >
               Text

Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalSaf-golden.xml?rev=745173&r1=745172&r2=745173&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalSaf-golden.xml Tue Feb 17 17:56:53 2009
@@ -198,6 +198,7 @@
                  name="mainId"
                  onchange="return _checkLength(this,4,event)"
                  onkeyup="return _checkLength(this,4,event)"
+                 onpaste="return _checkLength(this,4,event)"
                  rows="5"
                 >
               Text

Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalScrRdr-golden.xml?rev=745173&r1=745172&r2=745173&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalScrRdr-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-rows-minimalScrRdr-golden.xml Tue Feb 17 17:56:53 2009
@@ -197,6 +197,7 @@
                  name="mainId"
                  onchange="return _checkLength(this,4,event)"
                  onkeyup="return _checkLength(this,4,event)"
+                 onpaste="return _checkLength(this,4,event)"
                  rows="5"
                 >
               Text