You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2012/02/14 10:47:56 UTC
svn commit: r1243852 - in /myfaces/tobago/trunk:
tobago-example/tobago-example-test/src/main/webapp/tc/popup/
tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/popup/
tobago-theme/tobago-theme-standard/src/main/...
Author: lofwyr
Date: Tue Feb 14 09:47:56 2012
New Revision: 1243852
URL: http://svn.apache.org/viewvc?rev=1243852&view=rev
Log:
TOBAGO-1091: Closing a Popup with defaultCommand="true" will flush checkboxes on the page
- the code to unlock the fields on the main page should be called in the "onsubmit" and not in the "submitAction" method, to ensure this also works with default commands.
Added:
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/popup/popup-bug-tobago-1091.xhtml
- copied, changed from r1241874, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/popup/z-index.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/popup/
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/popup/BugTobago1091SeleniumTest.java
Modified:
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
Copied: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/popup/popup-bug-tobago-1091.xhtml (from r1241874, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/popup/z-index.xhtml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/popup/popup-bug-tobago-1091.xhtml?p2=myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/popup/popup-bug-tobago-1091.xhtml&p1=myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/popup/z-index.xhtml&r1=1241874&r2=1243852&rev=1243852&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/popup/z-index.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/popup/popup-bug-tobago-1091.xhtml Tue Feb 14 09:47:56 2012
@@ -22,369 +22,46 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core">
-<tc:page width="800px" height="600px" id="page">
-<f:facet name="menuBar">
-<tc:menuBar>
-<tc:menu label="space -> space -> space">
-</tc:menu>
+ <tc:page width="800px" height="300px" id="page">
-<tc:menu label="Help">
-<tc:menu label="Help 1">
- <tc:menu label="Help 1 1">
- </tc:menu>
- <tc:menuSeparator/>
- <tc:menu label="Help 1 2">
- </tc:menu>
- <tc:menu label="Help 1 3">
- </tc:menu>
- <tc:menu label="Help 1 4">
- </tc:menu>
- <tc:menuSeparator/>
- <tc:menu label="Help 1 5">
- </tc:menu>
- <tc:menu label="Help 1 6">
- </tc:menu>
- <tc:menu label="Help 1 7">
- </tc:menu>
- <tc:menuSeparator/>
- <tc:menu label="Help 1 8">
- </tc:menu>
- <tc:menu label="Help 1 9">
- </tc:menu>
- <tc:menu label="Help 1 10">
- </tc:menu>
-</tc:menu>
-<tc:menu label="Help 2">
- <tc:menu label="Help 2 1">
- </tc:menu>
- <tc:menu label="Help 2 2">
- </tc:menu>
- <tc:menu label="Help 2 3">
- </tc:menu>
- <tc:menu label="Help 2 4">
- </tc:menu>
- <tc:menu label="Help 2 5">
- </tc:menu>
- <tc:menu label="Help 2 6">
- </tc:menu>
- <tc:menu label="Help 2 7">
- </tc:menu>
- <tc:menu label="Help 2 8">
- </tc:menu>
- <tc:menu label="Help 2 9">
- </tc:menu>
- <tc:menu label="Help 2 10">
- </tc:menu>
-</tc:menu>
-<tc:menu label="Help 3">
- <tc:menu label="Help 3 1">
- </tc:menu>
- <tc:menu label="Help 3 2">
- </tc:menu>
- <tc:menu label="Help 3 3">
- </tc:menu>
- <tc:menu label="Help 3 4">
- </tc:menu>
- <tc:menu label="Help 3 5">
- </tc:menu>
- <tc:menu label="Help 3 6">
- </tc:menu>
- <tc:menu label="Help 3 7">
- </tc:menu>
- <tc:menu label="Help 3 8">
- </tc:menu>
- <tc:menu label="Help 3 9">
- </tc:menu>
- <tc:menu label="Help 3 10">
- </tc:menu>
-</tc:menu>
-<tc:menu label="Help 4">
- <tc:menu label="Help 4 1">
- </tc:menu>
- <tc:menu label="Help 4 2">
- </tc:menu>
- <tc:menu label="Help 4 3">
- </tc:menu>
- <tc:menu label="Help 4 4">
- </tc:menu>
- <tc:menu label="Help 4 5">
- </tc:menu>
- <tc:menu label="Help 4 6">
- </tc:menu>
- <tc:menu label="Help 4 7">
- </tc:menu>
- <tc:menu label="Help 4 8">
- </tc:menu>
- <tc:menu label="Help 4 9">
- </tc:menu>
- <tc:menu label="Help 4 10">
- </tc:menu>
-</tc:menu>
-<tc:menu label="Help 5">
- <tc:menu label="Help 5 1">
- </tc:menu>
- <tc:menu label="Help 5 2">
- </tc:menu>
- <tc:menu label="Help 5 3">
- </tc:menu>
- <tc:menu label="Help 5 4">
- </tc:menu>
- <tc:menu label="Help 5 5">
- </tc:menu>
- <tc:menu label="Help 5 6">
- </tc:menu>
- <tc:menu label="Help 5 7">
- </tc:menu>
- <tc:menu label="Help 5 8">
- </tc:menu>
- <tc:menu label="Help 5 9">
- </tc:menu>
- <tc:menu label="Help 5 10">
- </tc:menu>
-</tc:menu>
-<tc:menu label="Help 6">
- <tc:menu label="Help 6 1">
- </tc:menu>
- <tc:menu label="Help 6 2">
- </tc:menu>
- <tc:menu label="Help 6 3">
- </tc:menu>
- <tc:menu label="Help 6 4">
- </tc:menu>
- <tc:menu label="Help 6 5">
- </tc:menu>
- <tc:menu label="Help 6 6">
- </tc:menu>
- <tc:menu label="Help 6 7">
- </tc:menu>
- <tc:menu label="Help 6 8">
- </tc:menu>
- <tc:menu label="Help 6 9">
- </tc:menu>
- <tc:menu label="Help 6 10">
- </tc:menu>
-</tc:menu>
-<tc:menu label="Help 7">
- <tc:menu label="Help 7 1">
- </tc:menu>
- <tc:menu label="Help 7 2">
- </tc:menu>
- <tc:menu label="Help 7 3">
- </tc:menu>
- <tc:menu label="Help 7 4">
- </tc:menu>
- <tc:menu label="Help 7 5">
- </tc:menu>
- <tc:menu label="Help 7 6">
- </tc:menu>
- <tc:menu label="Help 7 7">
- </tc:menu>
- <tc:menu label="Help 7 8">
- </tc:menu>
- <tc:menu label="Help 7 9">
- </tc:menu>
- <tc:menu label="Help 7 10">
- </tc:menu>
-</tc:menu>
-<tc:menu label="Help 8">
- <tc:menu label="Help 8 1">
- </tc:menu>
- <tc:menu label="Help 8 2">
- </tc:menu>
- <tc:menu label="Help 8 3">
- </tc:menu>
- <tc:menu label="Help 8 4">
- </tc:menu>
- <tc:menu label="Help 8 5">
- </tc:menu>
- <tc:menu label="Help 8 6">
- </tc:menu>
- <tc:menu label="Help 8 7">
- </tc:menu>
- <tc:menu label="Help 8 8">
- </tc:menu>
- <tc:menu label="Help 8 9">
- </tc:menu>
- <tc:menu label="Help 8 10">
- </tc:menu>
-</tc:menu>
-<tc:menu label="Help 9">
- <tc:menu label="Help 9 1">
- </tc:menu>
- <tc:menu label="Help 9 2">
- </tc:menu>
- <tc:menu label="Help 9 3">
- </tc:menu>
- <tc:menu label="Help 9 4">
- </tc:menu>
- <tc:menu label="Help 9 5">
- </tc:menu>
- <tc:menu label="Help 9 6">
- </tc:menu>
- <tc:menu label="Help 9 7">
- </tc:menu>
- <tc:menu label="Help 9 8">
- </tc:menu>
- <tc:menu label="Help 9 9">
- </tc:menu>
- <tc:menu label="Help 9 10">
- </tc:menu>
-</tc:menu>
-<tc:menu label="Help 10">
- <tc:menu label="Help 10 1">
- </tc:menu>
- <tc:menu label="Help 10 2">
- </tc:menu>
- <tc:menu label="Help 10 3">
- </tc:menu>
- <tc:menu label="Help 10 4">
- </tc:menu>
- <tc:menu label="Help 10 5">
- </tc:menu>
- <tc:menu label="Help 10 6">
- </tc:menu>
- <tc:menu label="Help 10 7">
- </tc:menu>
- <tc:menu label="Help 10 8">
- </tc:menu>
- <tc:menu label="Help 10 9">
- </tc:menu>
- <tc:menu label="Help 10 10">
- </tc:menu>
-</tc:menu>
-</tc:menu>
-</tc:menuBar>
-
-</f:facet>
+ <tc:box label="TOBAGO-1091">
+ <f:facet name="layout">
+ <tc:gridLayout rows="auto;*;auto;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.
+ <br/>Checklist:
+ <ol>
+ <li>Check: checkbox is checked</li>
+ <li>Click on the open button</li>
+ <li>Click on the close button</li>
+ <li>Check: checkbox is checked</li>
+ </ol>"/>
-<tc:box label="Page (z-index = 0)">
- <f:facet name="layout">
- <tc:gridLayout rows="60px;auto;auto;*;auto;auto"/>
- </f:facet>
- <tc:out
- value="This page is to check, if the layered presentation is corret. It will be usually defined by setting
- the z-index in CSS or by the order of rendering in the document. The footer and header of the sheet
- also have the z-index set in the common renderer."/>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="*;4*"/>
- </f:facet>
+ <tx:in label="Input" value="test" fieldId="in"/>
+ <tx:selectBooleanCheckbox label="Checkbox" value="true" fieldId="check"/>
- <tc:link label="Link to Apache" link="http://www.apache.org/"/>
- <tx:date label="Date">
- <f:convertDateTime pattern="dd/MM/yyyy"/>
- </tx:date>
- </tc:panel>
- <tc:selectOneChoice>
- <tc:selectItem itemLabel="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" itemValue="A"/>
- <tc:selectItem itemLabel="BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" itemValue="B"/>
- <tc:selectItem itemLabel="CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC" itemValue="C"/>
- </tc:selectOneChoice>
- <tc:sheet var="v1" columns="*;*;*" showRowRange="left" showPageRange="right" showDirectLinks="center">
- <tc:column label="Column 1"/>
- <tc:column label="Column 2"/>
- <tc:column label="Column 3"/>
- </tc:sheet>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="*;*"/>
- </f:facet>
- <tx:selectBooleanCheckbox label="1st Popup Modal" value="#{zIndex.modal1}" id="modal1st"/>
- <tc:cell/>
- <tx:selectBooleanCheckbox label="2nd Popup Modal" value="#{zIndex.modal2}"/>
- <tc:cell/>
- </tc:panel>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="auto;auto;auto;*"/>
- </f:facet>
- <tc:button label="Open Popup">
- <f:facet name="popup">
- <tc:popup width="600px" height="470px" left="100px" top="100px" id="popup-1" modal="#{zIndex.modal1}">
- <tc:box label="Popup (z-index = 1 (TODO))" id="box-1">
- <f:facet name="layout">
- <tc:gridLayout rows="auto;auto;*;auto"/>
- </f:facet>
- <tx:date label="Date">
- <f:convertDateTime pattern="dd/MM/yyyy"/>
- </tx:date>
- <tc:selectOneChoice>
- <tc:selectItem itemLabel="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" itemValue="A"/>
- <tc:selectItem itemLabel="BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" itemValue="B"/>
- <tc:selectItem itemLabel="CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC" itemValue="C"/>
- </tc:selectOneChoice>
- <tc:sheet var="v1" columns="*;*;*" showRowRange="left" showPageRange="right" showDirectLinks="center">
- <tc:column label="Column 1"/>
- <tc:column label="Column 2"/>
- <tc:column label="Column 3"/>
- </tc:sheet>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="*;*;*;*"/>
- </f:facet>
- <tc:button label="Open Sub Popup">
- <f:facet name="popup">
- <tc:popup width="400px" height="500px" left="200px" top="50px" id="popup-2" modal="#{zIndex.modal2}">
- <tc:box label="Popup (z-index = 2 (TODO))" id="box-2">
- <f:facet name="layout">
- <tc:gridLayout rows="auto;auto;*;auto"/>
- </f:facet>
- <tx:date label="Date">
- <f:convertDateTime pattern="dd/MM/yyyy"/>
- </tx:date>
- <tc:selectOneChoice>
- <tc:selectItem itemLabel="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" itemValue="A"/>
- <tc:selectItem itemLabel="BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" itemValue="B"/>
- <tc:selectItem itemLabel="CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC" itemValue="C"/>
- </tc:selectOneChoice>
- <tc:sheet var="v1" columns="*;*;*" showRowRange="left" showPageRange="right"
- showDirectLinks="center">
- <tc:column label="Column 1"/>
- <tc:column label="Column 2"/>
- <tc:column label="Column 3"/>
- </tc:sheet>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="*;*;*"/>
- </f:facet>
- <tc:button label="Cancel">
- <tc:attribute name="popupClose" value="immediate"/>
- </tc:button>
- <tc:button label="Redisplay">
- <tc:attribute name="renderedPartially" value="box-2"/>
- </tc:button>
- <tc:button label="Ok">
- <tc:attribute name="popupClose" value="afterSubmit"/>
- </tc:button>
- </tc:panel>
- </tc:box>
- </tc:popup>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="auto;*"/>
+ </f:facet>
+ <tc:button label="Open Popup" id="open">
+ <f:facet name="popup">
+ <tc:popup width="100px" height="100px" id="popup">
+ <tc:box label="Popup" id="box">
+ <f:facet name="layout">
+ <tc:gridLayout rows="*;auto"/>
</f:facet>
- </tc:button>
- <tc:button label="Open Popup (AJAX)">
- <tc:attribute name="renderedPartially" value="popup-2"/>
- <tc:popupReference for="popup-2"/>
- </tc:button>
- <tc:button label="Cancel">
- <tc:attribute name="popupClose" value="immediate"/>
- </tc:button>
- <tc:button label="Redisplay">
- <tc:attribute name="renderedPartially" value="box-1"/>
- </tc:button>
- <tc:button label="Ok">
- <tc:attribute name="popupClose" value="afterSubmit"/>
- </tc:button>
- </tc:panel>
- </tc:box>
- </tc:popup>
- </f:facet>
- </tc:button>
- <tc:button label="Open Popup (AJAX)">
- <tc:attribute name="renderedPartially" value="popup-1"/>
- <tc:popupReference for="popup-1"/>
- </tc:button>
- <tc:button label="Update"/>
- </tc:panel>
-</tc:box>
-</tc:page>
+ <tc:panel/>
+ <tc:button label="Close" id="close" defaultCommand="true">
+ <tc:attribute name="popupClose" value="afterSubmit"/>
+ </tc:button>
+ </tc:box>
+ </tc:popup>
+ </f:facet>
+ </tc:button>
+ </tc:panel>
+ </tc:box>
+ </tc:page>
</f:view>
Added: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/popup/BugTobago1091SeleniumTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/popup/BugTobago1091SeleniumTest.java?rev=1243852&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/popup/BugTobago1091SeleniumTest.java (added)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/popup/BugTobago1091SeleniumTest.java Tue Feb 14 09:47:56 2012
@@ -0,0 +1,52 @@
+package org.apache.myfaces.tobago.example.test.tc.popup;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.myfaces.tobago.example.test.MultiSuffixSeleniumTest;
+import org.apache.myfaces.tobago.util.Parameterized;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(Parameterized.class)
+public class BugTobago1091SeleniumTest extends MultiSuffixSeleniumTest {
+
+ public BugTobago1091SeleniumTest(String suffix) {
+ super(suffix);
+ }
+
+ @Test
+ public void testWithoutModel() throws InterruptedException {
+
+ // load page
+ open("/tc/popup/popup-bug-tobago-1091.");
+ Assert.assertEquals(
+ "Checkbox should be checked!", "true", getSelenium().getAttribute("page:check@checked"));
+
+ // click on open popup
+ getSelenium().click("page:open");
+ getSelenium().waitForPageToLoad("5000");
+
+ // click on open popup
+ getSelenium().click("page:popup:close");
+ getSelenium().waitForPageToLoad("5000");
+
+ Assert.assertEquals(
+ "Checkbox should be checked!", "true", getSelenium().getAttribute("page:check@checked"));
+ }
+}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js?rev=1243852&r1=1243851&r2=1243852&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js Tue Feb 14 09:47:56 2012
@@ -328,7 +328,11 @@ var Tobago = {
var clientDimension = this.createInput('hidden', this.page.id + this.SUB_COMPONENT_SEP + 'form-clientDimension');
clientDimension.value = jQuery("body").width() + ';' + jQuery("body").height();
this.form.appendChild(clientDimension);
+
+ Tobago.Popup.unlockBehind();
+
Tobago.onBeforeUnload();
+
return true;
},
@@ -548,8 +552,6 @@ var Tobago = {
Tobago.setActionPosition(source);
- Tobago.Popup.unlockBehind();
-
Tobago.Transport.request(function() {
if (!this.isSubmit) {
this.isSubmit = true;