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 2017/02/10 10:00:05 UTC
svn commit: r1782444 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/
tobago-example/tobago-example-demo/src/main/webapp/
tobago-example/tobago-example-demo/src/main/webapp/content/20-componen...
Author: lofwyr
Date: Fri Feb 10 10:00:05 2017
New Revision: 1782444
URL: http://svn.apache.org/viewvc?rev=1782444&view=rev
Log:
TOBAGO-1648 <tc:messages> could not be the target for <f:ajax>
* tc:messages are now wrapped by a <div id="idOfMessages"> which can be
referenced by <f:ajax> or <tc:event>
* adjust tests
[developed by hnoeth]
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.test.js
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/00/content-validation.test.js
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/01/validation-jsr303.test.js
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/collapsible-box.test.js
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/collapsible-popup.test.js
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/collapsible-panel.test.js
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/collapsible-section.test.js
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java?rev=1782444&r1=1782443&r2=1782444&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java Fri Feb 10 10:00:05 2017
@@ -20,6 +20,7 @@
package org.apache.myfaces.tobago.internal.renderkit.renderer;
import org.apache.myfaces.tobago.component.UIMessages;
+import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
import org.apache.myfaces.tobago.renderkit.css.Classes;
@@ -30,7 +31,6 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
import org.apache.myfaces.tobago.renderkit.html.HtmlRoleValues;
-import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
@@ -62,10 +62,9 @@ public class MessagesRenderer extends Re
}
final List<UIMessages.Item> messageList = messages.createMessageList(facesContext);
- if (messageList.size() > 0) { // in ie empty span gets a height
- writer.writeStyleAttribute(messages.getStyle());
+ writer.writeStyleAttribute(messages.getStyle());
- // with id
+ // with id
/*String focusId = null;
Iterator clientIds;
if (ComponentUtils.getBooleanAttribute(messages, Attributes.globalOnly)) {
@@ -76,49 +75,49 @@ public class MessagesRenderer extends Re
clientIds = facesContext.getClientIdsWithMessages();
}*/
- writer.startElement(HtmlElements.DIV);
- writer.writeIdAttribute(messages.getClientId(facesContext));
- writer.writeClassAttribute(Classes.create(messages), messages.getCustomClass());
-
- FacesMessage.Severity lastSeverity = null;
- boolean first = true;
-
- for (final UIMessages.Item item : messageList) {
- final FacesMessage message = item.getFacesMessage();
- final FacesMessage.Severity severity = message.getSeverity();
-
- if (!first && lastSeverity != severity) {
- writer.endElement(HtmlElements.DIV);
- }
+ writer.startElement(HtmlElements.DIV);
+ writer.writeIdAttribute(messages.getClientId(facesContext));
+ writer.writeClassAttribute(Classes.create(messages), messages.getCustomClass());
+
+ FacesMessage.Severity lastSeverity = null;
+ boolean first = true;
+
+ for (final UIMessages.Item item : messageList) {
+ final FacesMessage message = item.getFacesMessage();
+ final FacesMessage.Severity severity = message.getSeverity();
- if (first || lastSeverity != severity) {
- writer.startElement(HtmlElements.DIV);
- writer.writeClassAttribute(
- BootstrapClass.ALERT, BootstrapClass.ALERT_DISMISSIBLE, BootstrapClass.alert(severity));
- HtmlRendererUtils.writeDataAttributes(facesContext, writer, messages);
- writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.ALERT.toString(), false);
-
- writer.startElement(HtmlElements.BUTTON);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlButtonTypes.BUTTON);
- writer.writeClassAttribute(BootstrapClass.CLOSE);
- writer.writeAttribute(DataAttributes.DISMISS, "alert", false);
- writer.writeAttribute(Arias.ACTIVEDESCENDANT, "Close", false); // todo: i18n
- writer.startElement(HtmlElements.SPAN);
- writer.writeAttribute(Arias.HIDDEN, Boolean.TRUE.toString(), false);
- writer.writeText("×"); // times
- writer.endElement(HtmlElements.SPAN);
- writer.endElement(HtmlElements.BUTTON);
+ if (!first && lastSeverity != severity) {
+ writer.endElement(HtmlElements.DIV);
+ }
- }
+ if (first || lastSeverity != severity) {
+ writer.startElement(HtmlElements.DIV);
+ writer.writeClassAttribute(
+ BootstrapClass.ALERT, BootstrapClass.ALERT_DISMISSIBLE, BootstrapClass.alert(severity));
+ HtmlRendererUtils.writeDataAttributes(facesContext, writer, messages);
+ writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.ALERT.toString(), false);
+
+ writer.startElement(HtmlElements.BUTTON);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlButtonTypes.BUTTON);
+ writer.writeClassAttribute(BootstrapClass.CLOSE);
+ writer.writeAttribute(DataAttributes.DISMISS, "alert", false);
+ writer.writeAttribute(Arias.ACTIVEDESCENDANT, "Close", false); // todo: i18n
+ writer.startElement(HtmlElements.SPAN);
+ writer.writeAttribute(Arias.HIDDEN, Boolean.TRUE.toString(), false);
+ writer.writeText("×"); // times
+ writer.endElement(HtmlElements.SPAN);
+ writer.endElement(HtmlElements.BUTTON);
+ }
- encodeMessage(writer, messages, message, item.getClientId());
+ encodeMessage(writer, messages, message, item.getClientId());
- lastSeverity = severity;
- first = false;
- }
+ lastSeverity = severity;
+ first = false;
+ }
+ if (messageList.size() > 0) {
writer.endElement(HtmlElements.DIV); // close open tag from for-loop
-
- writer.endElement(HtmlElements.DIV);
+ }
+ writer.endElement(HtmlElements.DIV);
/*
while(clientIds.hasNext()) {
String clientId = (String) clientIds.next();
@@ -132,15 +131,14 @@ public class MessagesRenderer extends Re
ComponentUtils.findPage(facesContext, messages).setFocusId(focusId);
}
*/
- if (messages.getFor() == null) {
- final String id = messages.getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "messagesExists";
- writer.startElement(HtmlElements.INPUT);
- writer.writeAttribute(HtmlAttributes.VALUE, Boolean.TRUE.toString(), false);
- writer.writeAttribute(HtmlAttributes.ID, id, false);
- writer.writeAttribute(HtmlAttributes.NAME, id, false);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN);
- writer.endElement(HtmlElements.INPUT);
- }
+ if (messages.getFor() == null) {
+ final String id = messages.getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "messagesExists";
+ writer.startElement(HtmlElements.INPUT);
+ writer.writeAttribute(HtmlAttributes.VALUE, Boolean.TRUE.toString(), false);
+ writer.writeAttribute(HtmlAttributes.ID, id, false);
+ writer.writeAttribute(HtmlAttributes.NAME, id, false);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN);
+ writer.endElement(HtmlElements.INPUT);
}
}
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.test.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.test.js?rev=1782444&r1=1782443&r2=1782444&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.test.js (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.test.js Fri Feb 10 10:00:05 2017
@@ -38,7 +38,7 @@ QUnit.test("Open 'Client Popup', press '
var $openButton = jQueryFrame("#page\\:mainForm\\:form2\\:open");
var $output = jQueryFrame("#page\\:mainForm\\:form2\\:output span");
var outputValue = $output.text();
- var $messages = jQueryFrame("#page\\:mainForm\\:form2\\:clientPopup\\:messages");
+ var $messages = jQueryFrame("#page\\:mainForm\\:form2\\:clientPopup\\:messages div");
var $inputField = jQueryFrame("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
var $submitButton = jQueryFrame("#page\\:mainForm\\:form2\\:clientPopup\\:submit2");
var $cancelButton = jQueryFrame("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
@@ -73,7 +73,7 @@ QUnit.test("Open 'Client Popup', press '
var $popup = jQueryFrame("#page\\:mainForm\\:form2\\:clientPopup input");
var $openButton = jQueryFrame("#page\\:mainForm\\:form2\\:open");
var $output = jQueryFrame("#page\\:mainForm\\:form2\\:out span");
- var $messages = jQueryFrame("#page\\:mainForm\\:form2\\:clientPopup\\:messages");
+ var $messages = jQueryFrame("#page\\:mainForm\\:form2\\:clientPopup\\:messages div");
var $inputField = jQueryFrame("#page\\:mainForm\\:form2\\:clientPopup\\:in2\\:\\:field");
var $submitButton = jQueryFrame("#page\\:mainForm\\:form2\\:clientPopup\\:submit2");
var $cancelButton = jQueryFrame("#page\\:mainForm\\:form2\\:clientPopup\\:cancel2");
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/00/content-validation.test.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/00/content-validation.test.js?rev=1782444&r1=1782443&r2=1782444&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/00/content-validation.test.js (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/00/content-validation.test.js Fri Feb 10 10:00:05 2017
@@ -19,7 +19,7 @@ QUnit.test("Required: Submit without con
assert.expect(2);
var done = assert.async();
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $textarea = jQueryFrame("#page\\:mainForm\\:required\\:textarea\\:\\:field");
var textareaValue = $textarea.val();
var $submit = jQueryFrame("#page\\:mainForm\\:required\\:submit");
@@ -39,7 +39,7 @@ QUnit.test("Required: Submit with conten
assert.expect(2);
var done = assert.async();
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $textarea = jQueryFrame("#page\\:mainForm\\:required\\:textarea\\:\\:field");
var $submit = jQueryFrame("#page\\:mainForm\\:required\\:submit");
@@ -59,7 +59,7 @@ QUnit.test("Validate Length: Submit sing
assert.expect(1);
var done = assert.async();
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $in = jQueryFrame("#page\\:mainForm\\:validateLength\\:in\\:\\:field");
var $submit = jQueryFrame("#page\\:mainForm\\:validateLength\\:submit");
@@ -77,7 +77,7 @@ QUnit.test("Validate Length: Submit two
assert.expect(1);
var done = assert.async();
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $in = jQueryFrame("#page\\:mainForm\\:validateLength\\:in\\:\\:field");
var $submit = jQueryFrame("#page\\:mainForm\\:validateLength\\:submit");
@@ -95,7 +95,7 @@ QUnit.test("Validate Range: Submit no nu
assert.expect(1);
var done = assert.async();
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $in = jQueryFrame("#page\\:mainForm\\:validateRange\\:in\\:\\:field");
var $submit = jQueryFrame("#page\\:mainForm\\:validateRange\\:submit");
@@ -113,7 +113,7 @@ QUnit.test("Validate Range: Submit numbe
assert.expect(1);
var done = assert.async();
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $in = jQueryFrame("#page\\:mainForm\\:validateRange\\:in\\:\\:field");
var $submit = jQueryFrame("#page\\:mainForm\\:validateRange\\:submit");
@@ -131,7 +131,7 @@ QUnit.test("Validate Range: Submit numbe
assert.expect(1);
var done = assert.async();
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $in = jQueryFrame("#page\\:mainForm\\:validateRange\\:in\\:\\:field");
var $submit = jQueryFrame("#page\\:mainForm\\:validateRange\\:submit");
@@ -149,7 +149,7 @@ QUnit.test("Validate Range: Submit numbe
assert.expect(1);
var done = assert.async();
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $in = jQueryFrame("#page\\:mainForm\\:validateRange\\:in\\:\\:field");
var $submit = jQueryFrame("#page\\:mainForm\\:validateRange\\:submit");
@@ -167,7 +167,7 @@ QUnit.test("Regex Validation: Submit 'T'
assert.expect(1);
var done = assert.async();
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $in = jQueryFrame("#page\\:mainForm\\:regexValidation\\:in\\:\\:field");
var $submit = jQueryFrame("#page\\:mainForm\\:regexValidation\\:submit");
@@ -185,7 +185,7 @@ QUnit.test("Regex Validation: Submit '3'
assert.expect(1);
var done = assert.async();
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $in = jQueryFrame("#page\\:mainForm\\:regexValidation\\:in\\:\\:field");
var $submit = jQueryFrame("#page\\:mainForm\\:regexValidation\\:submit");
@@ -203,7 +203,7 @@ QUnit.test("Regex Validation: Submit 'T3
assert.expect(1);
var done = assert.async();
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $in = jQueryFrame("#page\\:mainForm\\:regexValidation\\:in\\:\\:field");
var $submit = jQueryFrame("#page\\:mainForm\\:regexValidation\\:submit");
@@ -221,7 +221,7 @@ QUnit.test("Custom Validator: Submit rej
assert.expect(1);
var done = assert.async();
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $in = jQueryFrame("#page\\:mainForm\\:customValidator\\:in\\:\\:field");
var $submit = jQueryFrame("#page\\:mainForm\\:customValidator\\:submit");
@@ -239,7 +239,7 @@ QUnit.test("Custom Validator: Submit acc
assert.expect(1);
var done = assert.async();
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $in = jQueryFrame("#page\\:mainForm\\:customValidator\\:in\\:\\:field");
var $submit = jQueryFrame("#page\\:mainForm\\:customValidator\\:submit");
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/01/validation-jsr303.test.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/01/validation-jsr303.test.js?rev=1782444&r1=1782443&r2=1782444&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/01/validation-jsr303.test.js (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/01/validation-jsr303.test.js Fri Feb 10 10:00:05 2017
@@ -19,7 +19,7 @@ QUnit.test("Required: Submit without con
assert.expect(1);
var done = assert.async();
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $in = jQueryFrame("#page\\:mainForm\\:required\\:in\\:\\:field");
var $submit = jQueryFrame("#page\\:mainForm\\:required\\:submit");
@@ -37,7 +37,7 @@ QUnit.test("Required: Submit with conten
assert.expect(1);
var done = assert.async();
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $in = jQueryFrame("#page\\:mainForm\\:required\\:in\\:\\:field");
var $submit = jQueryFrame("#page\\:mainForm\\:required\\:submit");
@@ -55,7 +55,7 @@ QUnit.test("Length: Submit single charac
assert.expect(1);
var done = assert.async();
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $in = jQueryFrame("#page\\:mainForm\\:length\\:in\\:\\:field");
var $submit = jQueryFrame("#page\\:mainForm\\:length\\:submit");
@@ -73,7 +73,7 @@ QUnit.test("Length: Submit three charact
assert.expect(1);
var done = assert.async();
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $in = jQueryFrame("#page\\:mainForm\\:length\\:in\\:\\:field");
var $submit = jQueryFrame("#page\\:mainForm\\:length\\:submit");
@@ -91,7 +91,7 @@ QUnit.test("Length: Submit five characte
assert.expect(1);
var done = assert.async();
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $in = jQueryFrame("#page\\:mainForm\\:length\\:in\\:\\:field");
var $submit = jQueryFrame("#page\\:mainForm\\:length\\:submit");
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/collapsible-box.test.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/collapsible-box.test.js?rev=1782444&r1=1782443&r2=1782444&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/collapsible-box.test.js (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/collapsible-box.test.js Fri Feb 10 10:00:05 2017
@@ -263,7 +263,7 @@ QUnit.test("Client Sided: hide content a
assert.expect(2);
var done = assert.async();
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $show = jQueryFrame("#page\\:mainForm\\:client\\:showNoRequestBox");
var $hide = jQueryFrame("#page\\:mainForm\\:client\\:hideNoRequestBox");
var $box = jQueryFrame("#page\\:mainForm\\:client\\:noRequestBox");
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/collapsible-popup.test.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/collapsible-popup.test.js?rev=1782444&r1=1782443&r2=1782444&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/collapsible-popup.test.js (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/collapsible-popup.test.js Fri Feb 10 10:00:05 2017
@@ -20,7 +20,7 @@ QUnit.test("Simple Popup", function (ass
var done = assert.async(5);
var step = 1;
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $open = jQueryFrame("#page\\:mainForm\\:simple\\:open1");
var $submitOnPage = jQueryFrame("#page\\:mainForm\\:simple\\:submitOnPage1");
var $in = jQueryFrame("#page\\:mainForm\\:simple\\:controllerPopup\\:in1\\:\\:field");
@@ -86,7 +86,7 @@ QUnit.test("Full Server Request", functi
var done = assert.async(5);
var step = 1;
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $open = jQueryFrame("#page\\:mainForm\\:server\\:open2");
var $submitOnPage = jQueryFrame("#page\\:mainForm\\:server\\:submitOnPage2");
var $in = jQueryFrame("#page\\:mainForm\\:server\\:fullServerRequestPopup\\:in2\\:\\:field");
@@ -152,7 +152,7 @@ QUnit.test("Client Sided", function (ass
var done = assert.async(3);
var step = 1;
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $open = jQueryFrame("#page\\:mainForm\\:client\\:open3");
var $submitOnPage = jQueryFrame("#page\\:mainForm\\:client\\:submitOnPage3");
var $popupCollapsed = jQueryFrame("#page\\:mainForm\\:client\\:clientPopup\\:\\:collapse");
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/collapsible-panel.test.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/collapsible-panel.test.js?rev=1782444&r1=1782443&r2=1782444&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/collapsible-panel.test.js (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/collapsible-panel.test.js Fri Feb 10 10:00:05 2017
@@ -20,7 +20,7 @@ QUnit.test("Simple Panel", function (ass
var done = assert.async(5);
var step = 1;
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $show = jQueryFrame("#\\page\\:mainForm\\:simple\\:showSimple");
var $hide = jQueryFrame("#\\page\\:mainForm\\:simple\\:hideSimple");
var $submit = jQueryFrame("#\\page\\:mainForm\\:simple\\:submitSimple");
@@ -101,7 +101,7 @@ QUnit.test("Full Server Request", functi
var done = assert.async(5);
var step = 1;
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $show = jQueryFrame("#\\page\\:mainForm\\:server\\:showServer");
var $hide = jQueryFrame("#\\page\\:mainForm\\:server\\:hideServer");
var $submit = jQueryFrame("#\\page\\:mainForm\\:server\\:submitServer");
@@ -182,7 +182,7 @@ QUnit.test("Client Sided", function (ass
var done = assert.async(3);
var step = 1;
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $show = jQueryFrame("#\\page\\:mainForm\\:client\\:showClient");
var $hide = jQueryFrame("#\\page\\:mainForm\\:client\\:hideClient");
var $submit = jQueryFrame("#\\page\\:mainForm\\:client\\:submitClient");
@@ -248,7 +248,7 @@ QUnit.test("Ajax", function (assert) {
var done = assert.async(5);
var step = 1;
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $show = jQueryFrame("#\\page\\:mainForm\\:ajax\\:showAjax");
var $hide = jQueryFrame("#\\page\\:mainForm\\:ajax\\:hideAjax");
var $submit = jQueryFrame("#\\page\\:mainForm\\:ajax\\:submitAjax");
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/collapsible-section.test.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/collapsible-section.test.js?rev=1782444&r1=1782443&r2=1782444&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/collapsible-section.test.js (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/collapsible-section.test.js Fri Feb 10 10:00:05 2017
@@ -20,7 +20,7 @@ QUnit.test("Simple Panel", function (ass
var done = assert.async(5);
var step = 1;
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $submit = jQueryFrame("#\\page\\:mainForm\\:simple\\:submitSimple");
var $show = jQueryFrame("#\\page\\:mainForm\\:simple\\:showSimple");
var $hide = jQueryFrame("#\\page\\:mainForm\\:simple\\:hideSimple");
@@ -101,7 +101,7 @@ QUnit.test("Full Server Request", functi
var done = assert.async(5);
var step = 1;
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $submit = jQueryFrame("#\\page\\:mainForm\\:server\\:submitServer");
var $show = jQueryFrame("#\\page\\:mainForm\\:server\\:showServer");
var $hide = jQueryFrame("#\\page\\:mainForm\\:server\\:hideServer");
@@ -182,7 +182,7 @@ QUnit.test("Client Sided", function (ass
var done = assert.async(3);
var step = 1;
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $submit = jQueryFrame("#\\page\\:mainForm\\:client\\:submitClient");
var $show = jQueryFrame("#\\page\\:mainForm\\:client\\:showClient");
var $hide = jQueryFrame("#\\page\\:mainForm\\:client\\:hideClient");
@@ -248,7 +248,7 @@ QUnit.test("Ajax", function (assert) {
var done = assert.async(5);
var step = 1;
- var $messages = jQueryFrame("#page\\:messages .tobago-messages");
+ var $messages = jQueryFrame("#page\\:messages.tobago-messages div");
var $submit = jQueryFrame("#\\page\\:mainForm\\:ajax\\:submitAjax");
var $show = jQueryFrame("#\\page\\:mainForm\\:ajax\\:showAjax");
var $hide = jQueryFrame("#\\page\\:mainForm\\:ajax\\:hideAjax");
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml?rev=1782444&r1=1782443&r2=1782444&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml Fri Feb 10 10:00:05 2017
@@ -47,9 +47,8 @@
<tc:flexLayout rows="auto;*">
- <tc:panel id="messages">
- <tc:messages orderBy="severity" rendered="#{!navigationTree.outputPage and !navigationTree.messagesPage}"/>
- </tc:panel>
+ <tc:messages id="messages" orderBy="severity"
+ rendered="#{!navigationTree.outputPage and !navigationTree.messagesPage}"/>
<tc:box label="#{title}" id="content">
<tc:form id="mainForm">