Return-Path: X-Original-To: apmail-myfaces-commits-archive@www.apache.org Delivered-To: apmail-myfaces-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8B095DB55 for ; Tue, 8 Jan 2013 09:06:25 +0000 (UTC) Received: (qmail 40371 invoked by uid 500); 8 Jan 2013 09:06:25 -0000 Delivered-To: apmail-myfaces-commits-archive@myfaces.apache.org Received: (qmail 40246 invoked by uid 500); 8 Jan 2013 09:06:24 -0000 Mailing-List: contact commits-help@myfaces.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "MyFaces Development" Delivered-To: mailing list commits@myfaces.apache.org Received: (qmail 40216 invoked by uid 99); 8 Jan 2013 09:06:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Jan 2013 09:06:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Jan 2013 09:06:19 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1651323888EA; Tue, 8 Jan 2013 09:05:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@myfaces.apache.org From: lofwyr@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130108090559.1651323888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ + popupData + org.apache.myfaces.tobago.example.test.PopupData + request + + + progress org.apache.myfaces.tobago.example.test.Progress session 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 @@ open - /faces/test/popup/popup-bug-tobago-1091.xhtml + /faces/test/popup/popup-close-after-submit-and-ajax.xhtml verifyValue - id=page:check - on + id=page:readonly + clickAndWait @@ -43,14 +43,24 @@ - clickAndWait + type + id=page:popup:in + foo bar + + + click + id=page:popup:close + + + + waitForElementNotPresent id=page:popup:close verifyValue - id=page:check - on + id=page:readonly + foo bar 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 @@ - + - + - - - - + @@ -48,13 +46,13 @@ - + - - + +