JBoss Rich Faces SVN: r11673 - trunk/docs/userguide/en/src/main/resources/images.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-12-09 12:29:40 -0500 (Tue, 09 Dec 2008)
New Revision: 11673
Added:
trunk/docs/userguide/en/src/main/resources/images/editor3.png
Log:
https://jira.jboss.org/jira/browse/RF-5042
added a creenshot
Added: trunk/docs/userguide/en/src/main/resources/images/editor3.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/userguide/en/src/main/resources/images/editor3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 1 month
JBoss Rich Faces SVN: r11672 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-12-09 12:29:04 -0500 (Tue, 09 Dec 2008)
New Revision: 11672
Modified:
trunk/docs/userguide/en/src/main/docbook/included/editor.xml
Log:
https://jira.jboss.org/jira/browse/RF-5042
added a creenshot
Modified: trunk/docs/userguide/en/src/main/docbook/included/editor.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/editor.xml 2008-12-09 17:23:06 UTC (rev 11671)
+++ trunk/docs/userguide/en/src/main/docbook/included/editor.xml 2008-12-09 17:29:04 UTC (rev 11672)
@@ -1101,9 +1101,20 @@
</section>
<section>
<title>Definition of Custom Style Selectors</title>
+
+ <para>On the screenshot there are CSS selectors that define styles for component elements.</para>
+
+ <figure>
+ <title>Classes names</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/editor3.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
<table>
- <title>Skin parameters redefinition for main text area</title>
+ <title>CSS selectors for the layout of the editor</title>
<tgroup cols="2">
<thead>
16 years, 1 month
JBoss Rich Faces SVN: r11671 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-12-09 12:23:06 -0500 (Tue, 09 Dec 2008)
New Revision: 11671
Modified:
trunk/docs/userguide/en/src/main/docbook/included/editor.xml
Log:
https://jira.jboss.org/jira/browse/RF-5042
added css selectors
Modified: trunk/docs/userguide/en/src/main/docbook/included/editor.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/editor.xml 2008-12-09 17:21:29 UTC (rev 11670)
+++ trunk/docs/userguide/en/src/main/docbook/included/editor.xml 2008-12-09 17:23:06 UTC (rev 11671)
@@ -1114,29 +1114,48 @@
</row>
</thead>
- <tbody>
-
+ <tbody>
<row>
- <entry>generalFamilyFont</entry>
-
- <entry>font-family</entry>
+ <entry>.richfacesSkin table.mceToolbar</entry>
+ <entry></entry>
</row>
-
-
<row>
- <entry>generalTextColor</entry>
-
- <entry>color</entry>
+ <entry>.richfacesSkin .mceButton</entry>
+ <entry></entry>
</row>
-
<row>
- <entry>tableBackgroundColor</entry>
-
- <entry>background</entry>
+ <entry>.richfacesSkin .mceButtonDisabled .mceIcon </entry>
+ <entry></entry>
</row>
+ <row>
+ <entry>.richfacesSkin .mceListBox</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry>.richfacesSkin .mceSeparator</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry>.richfacesSkin .mceIframeContainer</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry>.richfacesSkin table.mceLayout tr.mceLast td</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry>.richfacesSkin table.mceLayout tr.mceFirst td</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry>.richfacesSkin .mceToolbar</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry>.richfacesSkin table.mceLayout</entry>
+ <entry></entry>
+ </row>
-
-
</tbody>
</tgroup>
</table>
16 years, 1 month
JBoss Rich Faces SVN: r11670 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-12-09 12:21:29 -0500 (Tue, 09 Dec 2008)
New Revision: 11670
Modified:
trunk/docs/userguide/en/src/main/docbook/included/editor.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-426
added css selectors
Modified: trunk/docs/userguide/en/src/main/docbook/included/editor.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/editor.xml 2008-12-09 17:10:16 UTC (rev 11669)
+++ trunk/docs/userguide/en/src/main/docbook/included/editor.xml 2008-12-09 17:21:29 UTC (rev 11670)
@@ -715,13 +715,433 @@
</tbody>
</tgroup>
</table>
+
+
+
+
+
+ <table>
+ <title>Skin parameters redefinition for dialog box</title>
+
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry>generalFamilyFont</entry>
+
+ <entry>font-family</entry>
+ </row>
+
+ <row>
+ <entry>generalBackgroundColor</entry>
+
+ <entry>background</entry>
+ </row>
+
+
+
+
+
+
+ </tbody>
+ </tgroup>
+ </table>
+
+
+ <table>
+ <title>Skin parameters redefinition for link in dialog box</title>
+
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+
+ <tbody>
+
+ <row>
+ <entry>generalTextColor</entry>
+
+ <entry>color</entry>
+ </row>
+
+ <row>
+ <entry>hoverLinkColor</entry>
+
+ <entry>color</entry>
+ </row>
+
+
+
+
+
+
+ </tbody>
+ </tgroup>
+ </table>
+
+
+
+
+ <table>
+ <title>Skin parameters redefinition for link in dialog box</title>
+
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+
+ <tbody>
+
+ <row>
+ <entry>generalTextColor</entry>
+
+ <entry>color</entry>
+ </row>
+
+ <row>
+ <entry>hoverLinkColor</entry>
+
+ <entry>color</entry>
+ </row>
+
+
+
+
+
+
+ </tbody>
+ </tgroup>
+ </table>
+
+
+ <table>
+ <title>Skin parameters redefinition for fieldset in dialog box</title>
+
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+
+ <tbody>
+
+ <row>
+ <entry>generalFamilyFont</entry>
+
+ <entry>font-family</entry>
+ </row>
+
+ <row>
+ <entry>panelBorderColor</entry>
+
+ <entry>border-color</entry>
+ </row>
+
+
+
+
+
+
+ </tbody>
+ </tgroup>
+ </table>
+
+
+ <table>
+ <title>Skin parameters redefinition for fieldset legend in dialog box</title>
+
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+
+ <tbody>
+
+ <row>
+ <entry>generalLinkColor</entry>
+
+ <entry>color</entry>
+ </row>
+
+
+
+
+
+
+ </tbody>
+ </tgroup>
+ </table>
+
+
+
+
+ <table>
+ <title>Skin parameters redefinition for input elements in dialog box</title>
+
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+
+ <tbody>
+
+ <row>
+ <entry>warningColor</entry>
+
+ <entry>color</entry>
+ </row>
+
+
+
+ <row>
+ <entry>warningColor</entry>
+
+ <entry>border-color</entry>
+ </row>
+
+
+
+ <row>
+ <entry>controlBackgroundColor</entry>
+
+ <entry>background</entry>
+ </row>
+
+ <row>
+ <entry>tableBorderColor</entry>
+
+ <entry>border-color</entry>
+ </row>
+
+
+ <row>
+ <entry>generalFamilyFont</entry>
+
+ <entry>font-family</entry>
+ </row>
+
+
+
+
+ </tbody>
+ </tgroup>
+ </table>
+
+
+
+
+ <table>
+ <title>Skin parameters redefinition for panel wrapper in dialog box</title>
+
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+
+ <tbody>
+
+ <row>
+ <entry>panelBorderColor</entry>
+
+ <entry>border-color</entry>
+ </row>
+
+ <row>
+ <entry>tableBackgroundColor</entry>
+
+ <entry>background</entry>
+ </row>
+
+
+
+
+ </tbody>
+ </tgroup>
+ </table>
+
+
+ <table>
+ <title>Skin parameters redefinition for headers in dialog box</title>
+
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+
+ <tbody>
+
+ <row>
+ <entry>generalLinkColor</entry>
+
+ <entry>color</entry>
+ </row>
+
+
+
+
+ </tbody>
+ </tgroup>
+ </table>
+
+
+ <table>
+ <title>Skin parameters redefinition for links in tabs in dialog box</title>
+
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+
+ <tbody>
+
+ <row>
+ <entry>generalFamilyFont</entry>
+
+ <entry>font-family</entry>
+ </row>
+
+
+ <row>
+ <entry>generalTextColor</entry>
+
+ <entry>color</entry>
+ </row>
+
+
+ </tbody>
+ </tgroup>
+ </table>
+
+
+
+ <table>
+ <title>Skin parameters redefinition for main text area</title>
+
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+
+ <tbody>
+
+ <row>
+ <entry>generalFamilyFont</entry>
+
+ <entry>font-family</entry>
+ </row>
+
+
+ <row>
+ <entry>generalTextColor</entry>
+
+ <entry>color</entry>
+ </row>
+
+ <row>
+ <entry>tableBackgroundColor</entry>
+
+ <entry>background</entry>
+ </row>
+
+
+
+ </tbody>
+ </tgroup>
+ </table>
+
+
+
+
+
</section>
<section>
- <title>Definition of Custom Style Classes</title>
-
+ <title>Definition of Custom Style Selectors</title>
+
+ <table>
+ <title>Skin parameters redefinition for main text area</title>
+
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Selector</entry>
+
+ <entry>Description</entry>
+ </row>
+ </thead>
+
+ <tbody>
+
+ <row>
+ <entry>generalFamilyFont</entry>
+
+ <entry>font-family</entry>
+ </row>
+
+
+ <row>
+ <entry>generalTextColor</entry>
+
+ <entry>color</entry>
+ </row>
+
+ <row>
+ <entry>tableBackgroundColor</entry>
+
+ <entry>background</entry>
+ </row>
+
+
+
+ </tbody>
+ </tgroup>
+ </table>
+
+
16 years, 1 month
JBoss Rich Faces SVN: r11669 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2008-12-09 12:10:16 -0500 (Tue, 09 Dec 2008)
New Revision: 11669
Modified:
trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml
Log:
https://jira.jboss.org/jira/browse/RF-391
correcting error in docs due to http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4195281#4195281
Modified: trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2008-12-09 16:30:08 UTC (rev 11668)
+++ trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2008-12-09 17:10:16 UTC (rev 11669)
@@ -253,7 +253,7 @@
<para>
<emphasis role="bold">Example:</emphasis>
</para>
- <programlisting role="XML"><![CDATA[Richfaces.showModalPanel('panelId', {left: auto}, {param1: value1});]]></programlisting>
+ <programlisting role="XML"><![CDATA[Richfaces.showModalPanel('panelId', {left: auto, param1: value1});]]></programlisting>
<para> Thus, except the standard modalPanel parameters you can pass any of your
own parameters. </para>
<para> Also modalPanel allows to handle its own opening and closing events on
16 years, 1 month
JBoss Rich Faces SVN: r11668 - in trunk/test-applications/facelets/src/main: webapp/PickList and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: adubovsky
Date: 2008-12-09 11:30:08 -0500 (Tue, 09 Dec 2008)
New Revision: 11668
Modified:
trunk/test-applications/facelets/src/main/java/util/event/Event.java
trunk/test-applications/facelets/src/main/webapp/PickList/PickList.xhtml
trunk/test-applications/facelets/src/main/webapp/PickList/PickListProperty.xhtml
Log:
+ events to pickList
Modified: trunk/test-applications/facelets/src/main/java/util/event/Event.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/util/event/Event.java 2008-12-09 16:29:42 UTC (rev 11667)
+++ trunk/test-applications/facelets/src/main/java/util/event/Event.java 2008-12-09 16:30:08 UTC (rev 11668)
@@ -128,7 +128,16 @@
private String onsetup;
private String onsave;
private String onsizeexceeded;
+ private String onlistchanged;
+ public String getOnlistchanged() {
+ return onlistchanged;
+ }
+
+ public void setOnlistchanged(String onlistchanged) {
+ this.onlistchanged = onlistchanged;
+ }
+
public String getOnsizeexceeded() {
return onsizeexceeded;
}
@@ -139,6 +148,7 @@
// showEvent('onkeypressInputID', 'onkeypress work!')
public Event() {
+ onlistchanged = "showEvent('formID:infoSubview:onlistchangedInputID', 'onlistchanged work!')";
onsave = "showEvent('formID:infoSubview:onsaveInputID', 'onsave work!')";
onsetup = "showEvent('formID:infoSubview:onsetupInputID', 'onsetup work!')";
onitemclick = "showEvent('formID:infoSubview:onitemclickInputID', 'onitemclick work!')";
Modified: trunk/test-applications/facelets/src/main/webapp/PickList/PickList.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/PickList/PickList.xhtml 2008-12-09 16:29:42 UTC (rev 11667)
+++ trunk/test-applications/facelets/src/main/webapp/PickList/PickList.xhtml 2008-12-09 16:30:08 UTC (rev 11668)
@@ -29,10 +29,10 @@
onkeypress="#{event.onkeypress}"
onkeyup="#{event.onkeyup}"
onmousedown="#{event.onmousedown}"
- onmousemove="#{event.onmousemove}"
- onmouseout="#{event.onmouseout}"
- onmouseover="#{event.onmouseover}"
- onmouseup="#{event.onmouseup}"
+ onmousemove="#{event.onmousemove}" onblur="#{event.onblur}"
+ onmouseout="#{event.onmouseout}" onfocus="#{event.onfocus}"
+ onmouseover="#{event.onmouseover}"
+ onmouseup="#{event.onmouseup}" onlistchanged="#{event.onlistchanged}"
binding="#{pickList.myPickList}">
<f:selectItem itemValue="selectItem" itemLabel="selectItem" />
<f:selectItem itemValue="selectItem 1" itemLabel="selectItem 1" />
Modified: trunk/test-applications/facelets/src/main/webapp/PickList/PickListProperty.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/PickList/PickListProperty.xhtml 2008-12-09 16:29:42 UTC (rev 11667)
+++ trunk/test-applications/facelets/src/main/webapp/PickList/PickListProperty.xhtml 2008-12-09 16:30:08 UTC (rev 11668)
@@ -83,6 +83,7 @@
</h:panelGrid>
<br />
<br />
+ <!--
<div style="FONT-WEIGHT: bold;">rich:findComponent</div>
<h:panelGrid columns="2">
<rich:column>
@@ -93,4 +94,5 @@
value="#{rich:findComponent('pickListID').selectedValues}" />
</rich:column>
</h:panelGrid>
+ -->
</f:subview>
\ No newline at end of file
16 years, 1 month
JBoss Rich Faces SVN: r11667 - in trunk/test-applications/jsp/src/main: java/util/event and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: adubovsky
Date: 2008-12-09 11:29:42 -0500 (Tue, 09 Dec 2008)
New Revision: 11667
Modified:
trunk/test-applications/jsp/src/main/java/pickList/PickList.java
trunk/test-applications/jsp/src/main/java/util/event/Event.java
trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp
trunk/test-applications/jsp/src/main/webapp/PickList/PickListProperty.jsp
Log:
+ events to pickList
Modified: trunk/test-applications/jsp/src/main/java/pickList/PickList.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/pickList/PickList.java 2008-12-09 16:28:04 UTC (rev 11666)
+++ trunk/test-applications/jsp/src/main/java/pickList/PickList.java 2008-12-09 16:29:42 UTC (rev 11667)
@@ -108,6 +108,7 @@
}
public void valueChangeListener(ValueChangeEvent event) {
+ System.out.println("valueChangeListener work!");
valueCL = "valueChangeListener work!";
}
Modified: trunk/test-applications/jsp/src/main/java/util/event/Event.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/util/event/Event.java 2008-12-09 16:28:04 UTC (rev 11666)
+++ trunk/test-applications/jsp/src/main/java/util/event/Event.java 2008-12-09 16:29:42 UTC (rev 11667)
@@ -130,7 +130,16 @@
private String onsetup;
private String onsave;
private String onsizeexceeded;
+ private String onlistchanged;
+ public String getOnlistchanged() {
+ return onlistchanged;
+ }
+
+ public void setOnlistchanged(String onlistchanged) {
+ this.onlistchanged = onlistchanged;
+ }
+
public String getOnsetup() {
return onsetup;
}
@@ -166,6 +175,7 @@
// showEvent('onkeypressInputID', 'onkeypress work!')
public Event() {
/* Events for toolBar */
+ onlistchanged = "showEvent('infoFormID:infoSubview:onlistchangedInputID', 'onlistchanged work!')";
onsave = "showEvent('infoFormID:infoSubview:onsaveInputID', 'onsave work!')";
onsetup = "showEvent('infoFormID:infoSubview:onsetupInputID', 'onsetup work!')";
onitemclick = "showEvent('infoFormID:infoSubview:onitemclickInputID', 'onitemclick work!')";
Modified: trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp 2008-12-09 16:28:04 UTC (rev 11666)
+++ trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp 2008-12-09 16:29:42 UTC (rev 11667)
@@ -27,13 +27,13 @@
ondblclick="#{event.ondblclick}"
onkeydown="#{event.onkeydown}"
onkeypress="#{event.onkeypress}"
- onkeyup="#{event.onkeyup}"
+ onkeyup="#{event.onkeyup}"
onmousedown="#{event.onmousedown}"
onmousemove="#{event.onmousemove}"
- onmouseout="#{event.onmouseout}"
+ onmouseout="#{event.onmouseout}" onlistchanged="#{event.onlistchanged}"
onmouseover="#{event.onmouseover}"
onmouseup="#{event.onmouseup}"
- binding="#{pickList.myPickList}">
+ binding="#{pickList.myPickList}" onblur="#{event.onblur}" onfocus="#{event.onfocus}">
<f:selectItems value="#{pickList.data}"/>
</rich:pickList>
<h:panelGrid columns="2">
Modified: trunk/test-applications/jsp/src/main/webapp/PickList/PickListProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/PickList/PickListProperty.jsp 2008-12-09 16:28:04 UTC (rev 11666)
+++ trunk/test-applications/jsp/src/main/webapp/PickList/PickListProperty.jsp 2008-12-09 16:29:42 UTC (rev 11667)
@@ -82,6 +82,7 @@
</h:panelGrid>
<br />
<br />
+ <%--
<div style="FONT-WEIGHT: bold;">rich:findComponent</div>
<h:panelGrid columns="2">
<rich:column>
@@ -91,4 +92,5 @@
<h:outputText value="#{rich:findComponent('pickListID').selectedValues}" />
</rich:column>
</h:panelGrid>
+ --%>
</f:subview>
\ No newline at end of file
16 years, 1 month
JBoss Rich Faces SVN: r11666 - trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: dmorozov
Date: 2008-12-09 11:28:04 -0500 (Tue, 09 Dec 2008)
New Revision: 11666
Modified:
trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
Log:
https://jira.jboss.org/jira/browse/RF-4584
Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
===================================================================
--- trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-12-09 15:18:48 UTC (rev 11665)
+++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-12-09 16:28:04 UTC (rev 11666)
@@ -101,28 +101,50 @@
buttonMouseUpHandler : function(e) {
this.buttonBG.className = "rich-combobox-font rich-combobox-button-background rich-combobox-button";
this.button.className = this.classes.button.classes.active + " rich-combobox-button-hovered";
+
+ var styleCss = this.classes.button.style;
+ if(styleCss && !styleCss.active.blank()) {
+ Element.setStyle(this.button,styleCss.active);
+ }
+
this.field.focus();
},
buttonMousedownHandler : function(e) {
this.buttonBG.className = "rich-combobox-font rich-combobox-button-pressed-background rich-combobox-button";
this.button.className = this.classes.button.classes.active + " rich-combobox-button-hovered";
+
+ var styleCss = this.classes.button.style;
+ if(styleCss && !styleCss.active.blank()) {
+ Element.setStyle(this.button,styleCss.active);
+ }
+
this.comboList.isList = true;
},
buttonMouseOverHandler : function(e) {
var classCss = this.classes.button.classes;
var iconStyles = this.classes.buttonicon.style;
-
+ var styleCss = this.classes.button.style;
if (this.isActive()) {
this.button.className= classCss.active + " " + classCss.hovered;
- if (!iconStyles.active.blank()) {
+
+ if(styleCss && !styleCss.active.blank()) {
+ Element.setStyle(this.button,styleCss.active);
+ }
+
+ if (iconStyles && !iconStyles.active.blank()) {
Element.setStyle(this.button,{backgroundImage : iconStyles.active});
}
} else {
this.button.className = classCss.normal + " " + classCss.hovered;
- if (!iconStyles.normal.blank()) {
+
+ if(styleCss && !styleCss.normal.blank()) {
+ Element.setStyle(this.button,styleCss.normal);
+ }
+
+ if (iconStyles && !iconStyles.normal.blank()) {
Element.setStyle(this.button,{backgroundImage : iconStyles.normal});
}
}
@@ -130,16 +152,27 @@
buttonMouseOutHandler : function(e) {
var classCss = this.classes.button.classes;
+ var styleCss = this.classes.button.style;
var iconStyles = this.classes.buttonicon.style;
if (this.isActive()) {
this.button.className= classCss.active;
- if (!iconStyles.active.blank()) {
- Element.setStyle(this.button,{backgroundImage : iconStyles.active});
+
+ if(styleCss && !styleCss.active.blank()) {
+ Element.setStyle(this.button,styleCss.active);
+ }
+
+ if (iconStyles && !iconStyles.active.blank()) {
+ Element.setStyle(this.button,{backgroundImage : iconStyles.active});
}
} else {
this.button.className = classCss.normal;
- if (!iconStyles.normal.blank()) {
+
+ if(styleCss && !styleCss.normal.blank()) {
+ Element.setStyle(this.button,styleCss.normal);
+ }
+
+ if (iconStyles && !iconStyles.normal.blank()) {
Element.setStyle(this.button,{backgroundImage : iconStyles.normal});
}
}
@@ -359,8 +392,13 @@
this.field.className = this.classes.field.classes.disabled;
Element.setStyle(this.field, this.classes.field.style.disabled);
+ var styleCss = this.classes.button.style;
+ if(styleCss && !styleCss.disabled.blank()) {
+ Element.setStyle(this.button, styleCss.disabled);
+ }
+
var iconStyles = this.classes.buttonicon.style;
- if(!iconStyles.disabled.blank()) {
+ if(iconStyles && !iconStyles.disabled.blank()) {
Element.setStyle(this.button,{backgroundImage : iconStyles.disabled});
}
@@ -381,6 +419,11 @@
if(!iconStyles.normal.blank()) {
Element.setStyle(this.button,{backgroundImage : iconStyles.normal});
}
+
+ var styleCss = this.classes.button.style;
+ if(styleCss && !styleCss.normal.blank()) {
+ Element.setStyle(this.button, styleCss.normal);
+ }
this.button.disabled = false;
this.field.disabled = false;
16 years, 1 month
JBoss Rich Faces SVN: r11665 - in trunk/test-applications/seleniumTest/richfaces/src: test/java/org/richfaces/testng and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2008-12-09 10:18:48 -0500 (Tue, 09 Dec 2008)
New Revision: 11665
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/message/testMoreThanOneMessage.xhtml
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AbstractMessageTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/MessagesTest.java
Log:
https://jira.jboss.org/jira/browse/RF-5127
Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/message/testMoreThanOneMessage.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/message/testMoreThanOneMessage.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AbstractMessageTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AbstractMessageTest.java 2008-12-09 15:06:12 UTC (rev 11664)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AbstractMessageTest.java 2008-12-09 15:18:48 UTC (rev 11665)
@@ -29,7 +29,11 @@
protected String label;
protected void init(Template template) {
- renderPage(template, "#{messageBean.init}");
+ init(template, null);
+ }
+
+ protected void init(Template template, String url) {
+ renderPage(url, template, "#{messageBean.init}");
mainForm = getParentId() + "mainForm";
inputText = mainForm + ":inputText";
message = mainForm + ":message";
@@ -112,13 +116,13 @@
public void testRendered(Template template) {
init(template);
init(template);
- Assert.assertTrue(selenium.isElementPresent(message), "ListShuttle must be rendered.");
+ Assert.assertTrue(selenium.isElementPresent(message), "Message must be rendered.");
selenium.click(rendered);
waitForAjaxCompletion();
clickAjaxCommandAndWait(submit);
- Assert.assertFalse(selenium.isElementPresent(message), "ListShuttle mustn't be rendered.");
+ Assert.assertFalse(selenium.isElementPresent(message), "Message mustn't be rendered.");
}
}
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/MessagesTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/MessagesTest.java 2008-12-09 15:06:12 UTC (rev 11664)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/MessagesTest.java 2008-12-09 15:18:48 UTC (rev 11665)
@@ -1,9 +1,14 @@
package org.richfaces.testng;
import org.ajax4jsf.template.Template;
+import org.testng.Assert;
+import org.testng.annotations.Test;
public class MessagesTest extends AbstractMessageTest {
+ private static String TEST_MORE_THAN_ONE_MESSAGE = "pages/message/testMoreThanOneMessage.xhtml";
+ private static String TEST_MESSAGES_WITH_FOR_ATTRIBUTE = "pages/message/testMessagesWithForAttribute.xhtml";
+
@Override
protected void init(Template template) {
super.init(template);
@@ -14,4 +19,31 @@
public String getTestUrl() {
return "pages/message/messages.xhtml";
}
+
+ @Test
+ public void testComponentOutputAllMessagesByAjax(Template template) {
+ init(template, TEST_MORE_THAN_ONE_MESSAGE);
+
+ Assert.assertFalse(selenium.isElementPresent(mainForm + ":fatalMarker"));
+ Assert.assertFalse(selenium.isElementPresent(mainForm + ":errorMarker"));
+
+ selenium.type(inputText, "fatal");
+ selenium.type(inputText + "2", "");
+ selenium.type(inputText + "3", "");
+
+ clickAjaxCommandAndWait(mainForm + ":submitWithoutReRender");
+ Assert.assertTrue(selenium.isElementPresent(mainForm + ":fatalMarker"));
+ Assert.assertTrue(selenium.isElementPresent(mainForm + ":errorMarker"));
+ Assert.assertEquals("messageSummary", selenium.getText("xpath=id('" + message + "')/dt[1]/span[2]"));
+ Assert.assertEquals("Required message 1", selenium.getText("xpath=id('" + message + "')/dt[2]/span[2]"));
+ Assert.assertEquals("Required message 2", selenium.getText("xpath=id('" + message + "')/dt[3]/span[2]"));
+
+ selenium.type(inputText, "passed");
+ selenium.type(inputText + "2", "passed");
+ selenium.type(inputText + "3", "passed");
+
+ clickAjaxCommandAndWait(mainForm + ":submitWithoutReRender");
+ Assert.assertFalse(selenium.isElementPresent(mainForm + ":fatalMarker"));
+ Assert.assertFalse(selenium.isElementPresent(mainForm + ":errorMarker"));
+ }
}
16 years, 1 month
JBoss Rich Faces SVN: r11664 - Reports/3.3.0 and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: tkuprevich
Date: 2008-12-09 10:06:12 -0500 (Tue, 09 Dec 2008)
New Revision: 11664
Added:
trunk/test-applications/qa/Test Reports/3.3.0/ComponentsAssignment3.3.0.BETA3.xls
Log:
Added: trunk/test-applications/qa/Test Reports/3.3.0/ComponentsAssignment3.3.0.BETA3.xls
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/qa/Test Reports/3.3.0/ComponentsAssignment3.3.0.BETA3.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 1 month