JBoss Rich Faces SVN: r7378 - Reports/3.2.0 and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: tkuprevich
Date: 2008-03-28 14:34:51 -0400 (Fri, 28 Mar 2008)
New Revision: 7378
Modified:
trunk/test-applications/qa/Test Reports/3.2.0/QA test report Build RF 3.2.0 CR5.xls
Log:
Modified: trunk/test-applications/qa/Test Reports/3.2.0/QA test report Build RF 3.2.0 CR5.xls
===================================================================
(Binary files differ)
16 years, 9 months
JBoss Rich Faces SVN: r7377 - trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2008-03-28 14:30:44 -0400 (Fri, 28 Mar 2008)
New Revision: 7377
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/comboboxUtils.js
trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js
Log:
http://jira.jboss.com/jira/browse/RF-2789
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-03-28 18:17:04 UTC (rev 7376)
+++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-03-28 18:30:44 UTC (rev 7377)
@@ -300,9 +300,6 @@
this.comboValue.value = value;
this.comboList.doSelectItem(this.comboList.activeItem);
this.combobox.fire("rich:onselect", {});
- /*if (oV != value) {
- this.combobox.fire("rich:onchange", {});
- }*/
} else {
if (this.directInputSuggestions) {
var startInd = this.field.value.length;
Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/comboboxUtils.js
===================================================================
--- trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/comboboxUtils.js 2008-03-28 18:17:04 UTC (rev 7376)
+++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/comboboxUtils.js 2008-03-28 18:30:44 UTC (rev 7377)
@@ -1,16 +1,36 @@
if (!window.Richfaces) window.Richfaces = {};
+Richfaces.defined = function(o) {
+ return (typeof(o)!="undefined");
+};
+
+Richfaces.getBody = function() {
+ if (document.body) {
+ return document.body;
+ }
+ if (document.getElementsByTagName) {
+ var bodies = document.getElementsByTagName("BODY");
+ if (bodies!=null && bodies.length>0) {
+ return bodies[0];
+ }
+ }
+ return null;
+};
+
+Richfaces.zero = function(n) {
+ return (!Richfaces.defined(n) || isNaN(n))?0:n;
+};
+
+
Richfaces.getDocumentHeight = function() {
- if (self.innerHeight) { // all except Explorer
- return self.innerHeight;
- }
- else if (document.documentElement && document.documentElement.clientHeight) {
- // Explorer 6 Strict Mode
- return document.documentElement.clientHeight;
- }
- else if (document.body) { // other Explorers
- return document.body.clientHeight;
- }
+ var body = Richfaces.getBody();
+ var innerHeight = (Richfaces.defined(self.innerHeight)&&!isNaN(self.innerHeight))?self.innerHeight:0;
+ if (document.documentElement && (!document.compatMode || document.compatMode=="CSS1Compat")) {
+ var topMargin = Richfaces.getMarginWidth(body, 't');
+ var bottomMargin = Richfaces.getMarginWidth(body, 'b');
+ return Math.max(body.offsetHeight + topMargin + bottomMargin, document.documentElement.clientHeight, document.documentElement.scrollHeight, Richfaces.zero(self.innerHeight));
+ }
+ return Math.max(body.scrollHeight, body.clientHeight, Richfaces.zero(self.innerHeight));
}
Richfaces.getScrollWidth = function(elem) {
Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js
===================================================================
--- trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-03-28 18:17:04 UTC (rev 7376)
+++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-03-28 18:30:44 UTC (rev 7377)
@@ -138,7 +138,6 @@
if (item) {
//FIXME
this.listParent.style.visibility = "hidden";
- //this.shadowElem.style.visibility = "hidden";
this.listParent.show();
@@ -183,34 +182,6 @@
}
},
- /*setWidth : function(width) {
- var positionElem = this.listParent.childNodes[1];
- var combobox = this.listParent.parentNode;
- combobox.style.width = width;
- if (this.iframe) {
- this.iframe.style.width = width;
- }
- if (Prototype.Browser.Gecko) {
- width = parseInt(width) - Richfaces.getBorderWidth(positionElem.firstChild, "lr") - Richfaces.getPaddingWidth(positionElem.firstChild, "lr") + "px";
- }
- positionElem.firstChild.style.width = width;
- //positionElem.style.width = width;
- this.listParent.style.visibility = "hidden";
- this.listParent.show();
-
- var scrollWidth = Richfaces.getScrollWidth(positionElem.firstChild);
-
- this.listParent.hide();
- this.listParent.style.visibility = "visible";
- var correction = parseInt(width) - scrollWidth;
- if (Prototype.Browser.Gecko) {
- correction -= Richfaces.getBorderWidth(positionElem.firstChild, "lr") + Richfaces.getPaddingWidth(positionElem.firstChild, "lr");
- }
- this.list.style.width = correction + "px";
-
-
- },*/
-
setWidth : function(width) {
var positionElem = this.listParent.childNodes[1];
var combobox = this.listParent.parentNode;
16 years, 9 months
JBoss Rich Faces SVN: r7376 - Reports/3.2.0 and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: tkuprevich
Date: 2008-03-28 14:17:04 -0400 (Fri, 28 Mar 2008)
New Revision: 7376
Added:
trunk/test-applications/qa/Test Reports/3.2.0/QA test report Build RF 3.2.0 CR5.xls
Log:
Added: trunk/test-applications/qa/Test Reports/3.2.0/QA test report Build RF 3.2.0 CR5.xls
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/qa/Test Reports/3.2.0/QA test report Build RF 3.2.0 CR5.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 9 months
JBoss Rich Faces SVN: r7375 - trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-03-28 13:19:53 -0400 (Fri, 28 Mar 2008)
New Revision: 7375
Modified:
trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java
Log:
Modified: trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java
===================================================================
--- trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java 2008-03-28 17:02:52 UTC (rev 7374)
+++ trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java 2008-03-28 17:19:53 UTC (rev 7375)
@@ -63,7 +63,9 @@
Map request = context.getExternalContext().getRequestParameterMap();
if (request.containsKey(clientId)) {
String newValue = (String) request.get(clientId);
- inplaceInput.setSubmittedValue(newValue);
+ if(newValue != null) {
+ inplaceInput.setSubmittedValue(newValue);
+ }
}
}
16 years, 9 months
JBoss Rich Faces SVN: r7374 - in trunk/samples/richfaces-demo/src/main/webapp/richfaces: page and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-03-28 13:02:52 -0400 (Fri, 28 Mar 2008)
New Revision: 7374
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/htmlCommandLink/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/usage.xhtml
Log:
demo site redesign
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/htmlCommandLink/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/htmlCommandLink/usage.xhtml 2008-03-28 16:59:00 UTC (rev 7373)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/htmlCommandLink/usage.xhtml 2008-03-28 17:02:52 UTC (rev 7374)
@@ -8,20 +8,20 @@
<ui:composition template="/templates/component-sample.xhtml">
<ui:define name="sample">
<style type="text/css">
- .viewsourcepanel {
- padding-bottom:0px;
- width:100%;
- overflow:auto;
- border-width:0;
- background-color:#FFFFE7;
+ .viewsourcepanel {
+ padding: 10px;
+ width: 100%;
+ overflow: auto;
+ border-width: 0;
+ }
+
+ .viewsourcebody {
+ padding: 0;
}
- .viewsourcebody {
- padding:0;
+
+ input[type="button"], input[type="submit"] {
+ background-color:#{a4jSkin.trimColor};
}
-
- input[type="button"], input[type="submit"] {
- background-color:#{a4jSkin.trimColor};
- }
</style>
<p>a4j:htmlCommandLink functionality is similar to the standard h:commandLink component except the additional feature.
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/usage.xhtml 2008-03-28 16:59:00 UTC (rev 7373)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/usage.xhtml 2008-03-28 17:02:52 UTC (rev 7374)
@@ -8,20 +8,20 @@
<ui:composition template="/templates/component-sample.xhtml">
<ui:define name="sample">
<style type="text/css">
- .viewsourcepanel {
- padding-bottom:0px;
- width:100%;
- overflow:auto;
- border-width:0;
- background-color:#FFFFE7;
+ .viewsourcepanel {
+ padding: 10px;
+ width: 100%;
+ overflow: auto;
+ border-width: 0;
+ }
+
+ .viewsourcebody {
+ padding: 0;
+ }
+
+ input[type="button"], input[type="submit"] {
+ background-color:#{a4jSkin.trimColor};
}
- .viewsourcebody {
- padding:0;
- }
-
- input[type="button"], input[type="submit"] {
- background-color:#{a4jSkin.trimColor};
- }
</style>
<p>
<b><a4j:page></b> is a deprecated component used for solving of incompatibility
16 years, 9 months
JBoss Rich Faces SVN: r7373 - in trunk/samples/richfaces-demo/src/main/webapp/richfaces: inplaceSelect/examples and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-03-28 12:59:00 -0400 (Fri, 28 Mar 2008)
New Revision: 7373
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceInput/examples/controlsCustomization.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceSelect/examples/controlsCustomization.xhtml
Log:
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceInput/examples/controlsCustomization.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceInput/examples/controlsCustomization.xhtml 2008-03-28 16:58:15 UTC (rev 7372)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceInput/examples/controlsCustomization.xhtml 2008-03-28 16:59:00 UTC (rev 7373)
@@ -9,9 +9,9 @@
id="inplaceInput">
<f:facet name="controls">
- <button onclick="$('inplaceInput').component.save();"
+ <button onclick="#{rich:component('inplaceInput')}.save();"
type="button">Save</button>
- <button onclick="$('inplaceInput').component.cancel();"
+ <button onclick="#{rich:component('inplaceInput')}.cancel();"
type="button">Cancel</button>
</f:facet>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceSelect/examples/controlsCustomization.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceSelect/examples/controlsCustomization.xhtml 2008-03-28 16:58:15 UTC (rev 7372)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceSelect/examples/controlsCustomization.xhtml 2008-03-28 16:59:00 UTC (rev 7373)
@@ -11,7 +11,7 @@
</style>
<h:form>
<h:panelGrid columns="3" width="500px;">
- <h:outputText value="Current State:"></h:outputText>
+ <h:outputText value="Current State:"/>
<rich:inplaceSelect value="#{inplaceComponentsBean.inputValue}"
defaultLabel="Click here to edit" showControls="true"
controlsHorizontalPosition="left" controlsVerticalPosition="bottom"
@@ -20,8 +20,8 @@
<button onclick="#{rich:component('inplaceSelect')}.save();"
type="button">Save</button>
<button onclick="#{rich:component('inplaceSelect')}.cancel();"
- type="button">Cancel</button>
- </f:facet>
+ type="button">Cancel</button>
+ </f:facet>
<f:selectItems value="#{capitalsBean.capitalsOptions}" />
<a4j:support event="onviewactivated" reRender="output" />
</rich:inplaceSelect>
16 years, 9 months
JBoss Rich Faces SVN: r7372 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-03-28 12:58:15 -0400 (Fri, 28 Mar 2008)
New Revision: 7372
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider/examples/filterData.xhtml
Log:
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider/examples/filterData.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider/examples/filterData.xhtml 2008-03-28 16:57:53 UTC (rev 7371)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider/examples/filterData.xhtml 2008-03-28 16:58:15 UTC (rev 7372)
@@ -18,7 +18,7 @@
forValRef="inventoryList.carInventory" filterBy="getMileage"
manualInput="true" onSlide="true" onChange="true" storeResults="true"
width="200px" startRange="10000" endRange="60000" increment="10000"
- trailer="true" />
+ trailer="true" handleValue="60000"/>
<rich:spacer height="15" />
16 years, 9 months
JBoss Rich Faces SVN: r7371 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-03-28 12:57:53 -0400 (Fri, 28 Mar 2008)
New Revision: 7371
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/calSample.xhtml
Log:
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/calSample.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/calSample.xhtml 2008-03-28 16:41:37 UTC (rev 7370)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/calSample.xhtml 2008-03-28 16:57:53 UTC (rev 7371)
@@ -21,7 +21,7 @@
locale="#{calendarBean.locale}"
popup="#{calendarBean.popup}"
datePattern="#{calendarBean.pattern}"
- showApplyButton="#{calendarBean.showApply}"/>
+ showApplyButton="#{calendarBean.showApply}" style="width:200px"/>
</a4j:outputPanel>
<h:panelGrid columns="2">
16 years, 9 months
JBoss Rich Faces SVN: r7370 - in trunk/samples/richfaces-demo/src/main/webapp/richfaces: keepAlive/examples and 6 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-03-28 12:41:37 -0400 (Fri, 28 Mar 2008)
New Revision: 7370
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wizard.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wstep1.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/keepAlive/examples/enabledIssue.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel/examples/noneLayout.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/script/examples/manually.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/script/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/style/examples/skinedPanel.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/style/usage.xhtml
Log:
demo site redesign
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wizard.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wizard.xhtml 2008-03-28 16:39:34 UTC (rev 7369)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wizard.xhtml 2008-03-28 16:41:37 UTC (rev 7370)
@@ -10,9 +10,9 @@
.col2 { vertical-align:top; width:450px; }
.wizard { width:400px; }
.wform td { vertical-align:top; }
- .wfcol1 { width:60px; vertical-align:top; }
- .wfcol2 { vertical-align:top; }
- .wfcol3 { vertical-align:top; }
+ .wfcol1 { text-align: right; }
+ .wfcol2 { }
+ .wfcol3 { }
.s1row td { height:30px; }
.rich-message { color:red; }
@@ -23,7 +23,11 @@
margin:0;
padding:2px;
}
-
+
+ .navPanel input[type="button"] {
+ background-color: #{richSkin.additionalBackgroundColor};
+ }
+
</style>
<br/>
<h:panelGrid width="100%" columns="2" columnClasses="col1,col2">
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wstep1.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wstep1.xhtml 2008-03-28 16:39:34 UTC (rev 7369)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/include/examples/wstep1.xhtml 2008-03-28 16:41:37 UTC (rev 7370)
@@ -6,7 +6,7 @@
xmlns:rich="http://richfaces.org/rich">
<div style="position:relative;height:140px">
- <h:panelGrid rowClasses="s1row" columns="3" columnClasses="wfcol1,wfcol2,wfcol3">
+ <h:panelGrid style="padding: 15px" rowClasses="s1row" columns="3" columnClasses="wfcol1,wfcol2,wfcol3">
<h:outputText value="First Name:" />
<h:inputText id="fn" value="#{profile.firstName}" label="First Name" required="true" />
<rich:message for="fn" />
@@ -18,12 +18,9 @@
<h:outputText value="Company:" />
<h:inputText id="comp" value="#{profile.company}" label="Company" required="true" />
<rich:message for="comp"/>
-
-
-
</h:panelGrid>
- <div class="navPanel">
- <a4j:commandButton value="Next >>" style="float:right" action="next"/>
+ <div>
+ <a4j:commandButton style="float:right" action="next" value="Next »"/>
</div>
</div>
</ui:composition>
\ No newline at end of file
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/keepAlive/examples/enabledIssue.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/keepAlive/examples/enabledIssue.xhtml 2008-03-28 16:39:34 UTC (rev 7369)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/keepAlive/examples/enabledIssue.xhtml 2008-03-28 16:41:37 UTC (rev 7370)
@@ -9,8 +9,8 @@
<style type="text/css">
.pcolumn {
- padding:10px;
- vertical-align:top;
+ padding: 0px 30px 0px 0px;
+ vertical-align: top;
}
</style>
@@ -26,8 +26,8 @@
decision what is process on the second (APPLY VALUES) phase. At this moment,
the expression for 'disabled' still equals false. Therefore, the processing
for button is bypassed. The action does not invoked as a result.
- phase
- </f:verbatim>
+ phase<br/><br/>
+ </f:verbatim>
<f:verbatim>
This example will work properly. The code is almost the same as for
@@ -39,16 +39,14 @@
JSF lifecycle. At the beginning of the next cycle, it updates with
the rsBean2 with the stored data. Therefore, the expression for 'disabled'
equals true on the second phase. The button is processed and the action is
- invoked.
+ invoked.<br/><br/>
</f:verbatim>
-
-
<h:panelGroup>
<h:form>
<h:inputText size="4" label="First Addent" value="#{rsBean.addent1}">
<a4j:support event="onkeyup" reRender="btn" />
</h:inputText>
- <h:outputText value="+"/>
+ <h:outputText value=" + "/>
<h:inputText size="4" label="Second Addent" value="#{rsBean.addent2}">
<a4j:support event="onkeyup" reRender="btn" />
</h:inputText>
@@ -65,7 +63,7 @@
<h:inputText size="4" label="First Addent" value="#{rsBean2.addent1}">
<a4j:support event="onkeyup" reRender="btn2" />
</h:inputText>
- <h:outputText value="+"/>
+ <h:outputText value=" + "/>
<h:inputText size="4" label="Second Addent" value="#{rsBean2.addent2}">
<a4j:support event="onkeyup" reRender="btn2" />
</h:inputText>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel/examples/noneLayout.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel/examples/noneLayout.xhtml 2008-03-28 16:39:34 UTC (rev 7369)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/outputPanel/examples/noneLayout.xhtml 2008-03-28 16:41:37 UTC (rev 7370)
@@ -9,6 +9,8 @@
.col {
width:50%;
padding:10px;
+ padding: 0px 30px 0px 0px;
+ vertical-align: top;
}
</style>
@@ -34,7 +36,7 @@
<a4j:outputPanel layout="block">
<h:form>
- <h:outputText value="Enter Text: "/>
+ <h:outputText style="font-weight: bold;" value="Enter Text: "/>
<h:inputText id="text1" label="text1" value="#{rsBean.text1}">
<f:validateLength maximum="10"/>
<a4j:support event="onkeyup" reRender="out1" />
@@ -56,7 +58,7 @@
<a4j:outputPanel layout="block">
<h:form>
- <h:outputText value="Enter Text: "/>
+ <h:outputText style="font-weight: bold;" value="Enter Text: "/>
<h:inputText id="text2" label="text1" value="#{rsBean.text2}">
<f:validateLength maximum="10"/>
<a4j:support event="onkeyup" reRender="out2" />
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/usage.xhtml 2008-03-28 16:39:34 UTC (rev 7369)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/usage.xhtml 2008-03-28 16:41:37 UTC (rev 7370)
@@ -43,7 +43,7 @@
<rich:insert src="/richfaces/page/snippets/page.xhtml" highlight="xhtml"></rich:insert>
</rich:panel>
<p>
- Will be rendered as:
+ <b>Will be rendered as:</b>
</p>
<rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody">
<rich:insert src="/richfaces/page/snippets/gen.xhtml" highlight="xhtml"></rich:insert>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/script/examples/manually.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/script/examples/manually.xhtml 2008-03-28 16:39:34 UTC (rev 7369)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/script/examples/manually.xhtml 2008-03-28 16:41:37 UTC (rev 7370)
@@ -13,12 +13,25 @@
return -1*Math.pow(4,-2*pos) * Math.sin((pos*3-1)*(3*Math.PI)/2) + 1;
};
</script>
+ <style type="text/css">
+ .scriptdemobtn {
+ width: 75px;
+ }
+ .scriptdemocolumn-l {
+ padding: 2px;
+ text-align: right;
+ }
+ .scriptdemocolumn-r {
+ padding: 2px;
+ text-align: left;
+ }
+ </style>
- <h:commandButton onclick="new Effect.BlindUp($('mypanel'), {duration:.3});return false" value="Hide" />
- <h:commandButton onclick="new Effect.BlindDown($('mypanel'),{duration:1.5,transition:Effect.Transitions.Elastic});return false" value="Show" />
+ <h:commandButton class="scriptdemobtn" onclick="new Effect.BlindUp($('mypanel'), {duration:.3});return false" value="Hide" style="margin-right: 5px;" />
+ <h:commandButton class="scriptdemobtn" onclick="new Effect.BlindDown($('mypanel'),{duration:1.5,transition:Effect.Transitions.Elastic});return false" value="Show" />
<div>
- <rich:spacer height="20" />
+ <rich:spacer height="10" />
<rich:panel id="mypanel">
<f:facet name="header">
@@ -26,18 +39,21 @@
</f:facet>
<h:form>
- <h:panelGrid styleClass="rsPanel" width="250" columns="2">
+ <h:panelGrid styleClass="rsPanel" width="250" columns="2" columnClasses="scriptdemocolumn-l,scriptdemocolumn-r">
<h:outputText styleClass="rsLabel" value="Name:" />
<h:inputText styleClass="rsInput" value="#{userBean.name}" />
<h:outputText styleClass="rsLabel" value="Job:" />
<h:inputText styleClass="rsInput" value="#{userBean.job}" />
- <h:panelGroup />
- <h:commandButton styleClass="rsButton" value="Submit">
- <a4j:support disableDefault="true" event="onclick" reRender="out" />
- </h:commandButton>
-
+ <h:panelGroup/>
+ <h:panelGroup>
+ <rich:spacer height="5"/>
+ <h:commandButton styleClass="rsButton" value="Submit" style="width: 75px">
+ <a4j:support disableDefault="true" event="onclick" reRender="out" />
+ </h:commandButton>
+ </h:panelGroup>
+
<f:facet name="footer">
</f:facet>
@@ -47,6 +63,7 @@
<h:outputText value=""/>
<h:outputText value="You have just entered:"/>
+ <h:outputText value=""/>
<h:outputText value="Name: #{userBean.name}" />
<h:outputText value="Job: #{userBean.job}" />
</h:panelGrid>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/script/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/script/usage.xhtml 2008-03-28 16:39:34 UTC (rev 7369)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/script/usage.xhtml 2008-03-28 16:41:37 UTC (rev 7370)
@@ -21,9 +21,13 @@
RichFaces resource framework. For example, if your script file is located inside the
jar file and has a full path there: /org/mycompany/assets/script/focus.js , you can
point to it with:
- <pre style="margin:0px">
- <span class="xml_tag_symbols"><</span><span class="xml_tag_name">a4j:loadScript</span><span class="xml_plain"> </span><span class="xml_attribute_name">src</span><span class="xml_tag_symbols">=</span><span class="xml_attribute_value">"resource:///org/mycompany/assets/script/focus.js"</span><span class="xml_plain"> </span><span class="xml_tag_symbols">/></span><span class="xml_plain"/>
- </pre>
+
+ <fieldset class="demo_fieldset">
+ <legend class="demo_legend">Code</legend>
+ <div id="padding" style="padding: 20px">
+ <span class="xml_tag_symbols"><</span><span class="xml_tag_name">a4j:loadScript</span><span class="xml_plain"> </span><span class="xml_attribute_name">src</span><span class="xml_tag_symbols">=</span><span class="xml_attribute_value">"resource:///org/mycompany/assets/script/focus.js"</span><span class="xml_plain"> </span><span class="xml_tag_symbols">/></span><span class="xml_plain"/>
+ </div>
+ </fieldset>
</p>
<p>
It is possible to register aliases in the static script files or dynamically
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/style/examples/skinedPanel.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/style/examples/skinedPanel.xhtml 2008-03-28 16:39:34 UTC (rev 7369)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/style/examples/skinedPanel.xhtml 2008-03-28 16:41:37 UTC (rev 7370)
@@ -11,6 +11,8 @@
<f:facet name="header">
<h:outputText value="Applying Skin on non-RichFaces Components"/>
</f:facet>
+
+ <div id="padding" style="padding: 20px">
<h:commandLink value="DeepMarine">
<a4j:actionparam name="skin" value="deepMarine" assignTo="#{skinBean.skin}"/>
</h:commandLink>
@@ -23,9 +25,9 @@
<a4j:actionparam name="skin" value="japanCherry" assignTo="#{skinBean.skin}"/>
</h:commandLink>
- <rich:separator height="2" style="padding:10px 0" />
+ <rich:separator height="1" style="padding:10px 0" />
- <h:panelGrid styleClass="rsPanel" width="250" columns="2">
+ <h:panelGrid style="padding: 15px" styleClass="rsPanel" width="250" columns="2">
<h:outputText styleClass="rsLabel" value="Name:" />
<h:inputText styleClass="rsInput" value="#{userBean.name}" />
@@ -42,13 +44,14 @@
</h:panelGrid>
<h:panelGrid id="out" columns="1">
-
+
+ <rich:spacer height="10"/>
+ <h:outputText value="You have just entered:"/>
<h:outputText value=""/>
- <h:outputText value="You have just entered:"/>
<h:outputText value="Name: #{userBean.name}" />
<h:outputText value="Job: #{userBean.job}" />
</h:panelGrid>
-
+ </div>
</rich:panel>
</h:form>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/style/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/style/usage.xhtml 2008-03-28 16:39:34 UTC (rev 7369)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/style/usage.xhtml 2008-03-28 16:41:37 UTC (rev 7370)
@@ -22,9 +22,12 @@
jar file and has a full path there: /org/mycompany/assets/css/common.css, you can
point to it with:
</p>
-<pre style="margin:0px">
- <span class="xml_tag_symbols"><</span><span class="xml_tag_name">a4j:loadStyle</span><span class="xml_plain"> </span><span class="xml_attribute_name">src</span><span class="xml_tag_symbols">=</span><span class="xml_attribute_value">"resource:///org/mycompany/assets/css/common.css"</span><span class="xml_plain"> </span><span class="xml_tag_symbols">/></span><span class="xml_plain"/>
-</pre>
+ <fieldset class="demo_fieldset">
+ <legend class="demo_legend">Code</legend>
+ <div id="padding" style="padding: 20px">
+ <span class="xml_tag_symbols"><</span><span class="xml_tag_name">a4j:loadStyle</span><span class="xml_plain"> </span><span class="xml_attribute_name">src</span><span class="xml_tag_symbols">=</span><span class="xml_attribute_value">"resource:///org/mycompany/assets/css/common.css"</span><span class="xml_plain"> </span><span class="xml_tag_symbols">/></span><span class="xml_plain"/>
+ </div>
+ </fieldset>
<p>
Richfaces allows to have a dynamically generated css file based on RichFaces
skinnability feature. xcss is an XML formated css with some additional extensions.
16 years, 9 months
JBoss Rich Faces SVN: r7369 - in trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html: scripts and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-03-28 12:39:34 -0400 (Fri, 28 Mar 2008)
New Revision: 7369
Modified:
trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss
trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
Log:
http://jira.jboss.com/jira/browse/RF-2832
Modified: trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss
===================================================================
--- trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss 2008-03-28 16:11:50 UTC (rev 7368)
+++ trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss 2008-03-28 16:39:34 UTC (rev 7369)
@@ -80,6 +80,7 @@
.rich-inplace-shadow {
position : absolute;
+ font-size: 11px;
}
.rich-inplace-shadow-size {
Modified: trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
===================================================================
--- trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-03-28 16:11:50 UTC (rev 7368)
+++ trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-03-28 16:39:34 UTC (rev 7369)
@@ -99,33 +99,37 @@
},
switchingStatesHandler : function(e) {
- var target;
- if (e.target) {
- target = e.target;
- } else if (target = e.srcElement) {
- target = e.srcElement;
- } else {
- //TO DO: to catch this exception
- }
- if (target.tagName.toLowerCase() == "input") {
- if (target.id == this.tabber.id) {
- this.byTab = true;
+ var el = (e.srcElement) ? e.srcElement : e.target;
+ if ((el.id == this.inplaceInput.id) || (e.type == "focus")) {
+
+ var target;
+ if (e.target) {
+ target = e.target;
+ } else if (target = e.srcElement) {
+ target = e.srcElement;
} else {
- return;
+ //TO DO: to catch this exception
}
- }
-
- if (this.events.oneditactivation) {
- this.inplaceInput.fire("rich:oneditactivation", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value});
- }
- var textSize = this.inplaceInput.offsetWidth;
-
- this.startEditableState(textSize);
- //this.endViewState();
-
- if (this.events.oneditactivated) {
- this.inplaceInput.fire("rich:oneditactivated", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value});
- }
+ if (target.tagName.toLowerCase() == "input") {
+ if (target.id == this.tabber.id) {
+ this.byTab = true;
+ } else {
+ return;
+ }
+ }
+
+ if (this.events.oneditactivation) {
+ this.inplaceInput.fire("rich:oneditactivation", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value});
+ }
+ var textSize = this.inplaceInput.offsetWidth;
+
+ this.startEditableState(textSize);
+ //this.endViewState();
+
+ if (this.events.oneditactivated) {
+ this.inplaceInput.fire("rich:oneditactivated", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value});
+ }
+ }
},
tmpValueBlurHandler : function() {
@@ -261,9 +265,12 @@
cancel : function(e, value) {
this.endEditableState();
+ if (!value) {
+ value = this.valueKeeper.value;
+ }
this.tempValueKeeper.value = value;
this.currentText = value;
- if (this.tempValueKeeper.value == "") {
+ if ( this.tempValueKeeper.value == "") {
this.setDefaultText();
}
switch (this.prevState) {
16 years, 9 months