myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1430183 - in /myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main: java/org/apache/myfaces/tobago/example/test/ webapp/WEB-INF/ webapp/test/popup/
Date Tue, 08 Jan 2013 09:05:58 GMT
Author: lofwyr
Date: Tue Jan  8 09:05:58 2013
New Revision: 1430183

URL: http://svn.apache.org/viewvc?rev=1430183&view=rev
Log:
In the current trunk the popup will not be closed, in case of AJAX

Added:
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/PopupData.java
      - copied, changed from r1430155, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/PopupModalAttribute.java
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-close-after-submit-and-ajax.selenium.html
      - copied, changed from r1430155, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-bug-tobago-1091.selenium.html
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-close-after-submit-and-ajax.xhtml
      - copied, changed from r1430155, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-bug-tobago-1091.xhtml
Modified:
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml

Copied: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/PopupData.java
(from r1430155, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/PopupModalAttribute.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/PopupData.java?p2=myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/PopupData.java&p1=myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/PopupModalAttribute.java&r1=1430155&r2=1430183&rev=1430183&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/PopupModalAttribute.java
(original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/PopupData.java
Tue Jan  8 09:05:58 2013
@@ -19,13 +19,15 @@
 
 package org.apache.myfaces.tobago.example.test;
 
-public class PopupModalAttribute {
+public class PopupData {
 
-  public boolean isAlwaysTrue() {
-    return true;
+  private String value;
+
+  public String getValue() {
+    return value;
   }
 
-  public boolean isAlwaysFalse() {
-    return false;
+  public void setValue(String value) {
+    this.value = value;
   }
 }

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml?rev=1430183&r1=1430182&r2=1430183&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
(original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
Tue Jan  8 09:05:58 2013
@@ -156,6 +156,12 @@
   </managed-bean>
 
   <managed-bean>
+    <managed-bean-name>popupData</managed-bean-name>
+    <managed-bean-class>org.apache.myfaces.tobago.example.test.PopupData</managed-bean-class>
+    <managed-bean-scope>request</managed-bean-scope>
+  </managed-bean>
+
+  <managed-bean>
     <managed-bean-name>progress</managed-bean-name>
     <managed-bean-class>org.apache.myfaces.tobago.example.test.Progress</managed-bean-class>
     <managed-bean-scope>session</managed-bean-scope>

Copied: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-close-after-submit-and-ajax.selenium.html
(from r1430155, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-bug-tobago-1091.selenium.html)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-close-after-submit-and-ajax.selenium.html?p2=myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-close-after-submit-and-ajax.selenium.html&p1=myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-bug-tobago-1091.selenium.html&r1=1430155&r2=1430183&rev=1430183&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-bug-tobago-1091.selenium.html
(original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-close-after-submit-and-ajax.selenium.html
Tue Jan  8 09:05:58 2013
@@ -29,13 +29,13 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/faces/test/popup/popup-bug-tobago-1091.xhtml</td>
+	<td>/faces/test/popup/popup-close-after-submit-and-ajax.xhtml</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyValue</td>
-	<td>id=page:check</td>
-	<td>on</td>
+	<td>id=page:readonly</td>
+	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -43,14 +43,24 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAndWait</td>
+	<td>type</td>
+	<td>id=page:popup:in</td>
+	<td>foo bar</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>id=page:popup:close</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForElementNotPresent</td>
 	<td>id=page:popup:close</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyValue</td>
-	<td>id=page:check</td>
-	<td>on</td>
+	<td>id=page:readonly</td>
+	<td>foo bar</td>
 </tr>
 </tbody></table>
 </body>

Copied: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-close-after-submit-and-ajax.xhtml
(from r1430155, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-bug-tobago-1091.xhtml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-close-after-submit-and-ajax.xhtml?p2=myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-close-after-submit-and-ajax.xhtml&p1=myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-bug-tobago-1091.xhtml&r1=1430155&r2=1430183&rev=1430183&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-bug-tobago-1091.xhtml
(original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-close-after-submit-and-ajax.xhtml
Tue Jan  8 09:05:58 2013
@@ -19,28 +19,26 @@
 <f:view
     xmlns:tc="http://myfaces.apache.org/tobago/component"
     xmlns:tx="http://myfaces.apache.org/tobago/extension"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
     xmlns:f="http://java.sun.com/jsf/core">
 
   <tc:page width="800px" height="300px" id="page">
 
-    <tc:box label="TOBAGO-1091">
+    <tc:box label="Popup close after submit and AJAX" id="global">
       <f:facet name="layout">
-        <tc:gridLayout rows="auto;*;auto;auto;auto"/>
+        <tc:gridLayout rows="*;auto;auto"/>
       </f:facet>
-      <tc:link
-          label="Bug-Tracking: TOBAGO-1091" link="https://issues.apache.org/jira/browse/TOBAGO-1091"/>
-      <tc:out escape="false" value="Close popup with defaultCommand uncheckes a checkbox
on main page.
+      <tc:out escape="false" value="Test: Close popup partially after the submit.
       &lt;br/>Checklist:
       &lt;ol>
-      &lt;li>Check: checkbox is checked&lt;/li>
-      &lt;li>Click on the open button&lt;/li>
-      &lt;li>Click on the close button&lt;/li>
-      &lt;li>Check: checkbox is checked&lt;/li>
+      &lt;li>Check the Readonly Value&lt;/li>
+      &lt;li>Click on the OPEN button&lt;/li>
+      &lt;li>Edit the value in the popup&lt;/li>
+      &lt;li>Click on the SAVE button&lt;/li>
+      &lt;li>Check if popup is closed (&lt;b>fails in the moment!!! The popup
wouldn't close&lt;/b>)&lt;/li>
+      &lt;li>Check if the readonly value has been changed&lt;/li>
       &lt;/ol>"/>
 
-      <tx:in label="Input" value="test" fieldId="in"/>
-      <tx:selectBooleanCheckbox label="Checkbox" value="true" fieldId="check"/>
+      <tx:in label="Readonly Value" value="#{popupData.value}" readonly="true" fieldId="readonly"/>
 
       <tc:panel>
         <f:facet name="layout">
@@ -48,13 +46,13 @@
         </f:facet>
         <tc:button label="Open Popup" id="open">
           <f:facet name="popup">
-            <tc:popup width="100px" height="100px" id="popup">
+            <tc:popup width="200px" height="100px" id="popup">
               <tc:box label="Popup" id="box">
                 <f:facet name="layout">
                   <tc:gridLayout rows="*;auto"/>
                 </f:facet>
-                <tc:panel/>
-                <tc:button label="Close" id="close" defaultCommand="true">
+                <tx:in label="Edit Value" value="#{popupData.value}" fieldId="in"/>
+                <tc:button label="Save and Close" id="close" renderedPartially=":page:global">
                   <tc:attribute name="popupClose" value="afterSubmit"/>
                 </tc:button>
               </tc:box>



Mime
View raw message