JBoss Rich Faces SVN: r6348 - in trunk/sandbox/ui/inplaceSelect/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2008-02-26 08:49:28 -0500 (Tue, 26 Feb 2008)
New Revision: 6348
Modified:
trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css/inplaceselect.xcss
trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
trunk/sandbox/ui/inplaceSelect/src/main/templates/inplaceselect.jspx
Log:
latest changes
Modified: trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css/inplaceselect.xcss
===================================================================
--- trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css/inplaceselect.xcss 2008-02-26 13:45:05 UTC (rev 6347)
+++ trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css/inplaceselect.xcss 2008-02-26 13:49:28 UTC (rev 6348)
@@ -35,11 +35,9 @@
padding : 0px 0px 0px 0px;
border-width: 1px;
margin : 0px;
-/* position : absolute; */
- top:0px;
- left : 0px;
background-position : center right;
- background-repeat : no-repeat;
+ background-repeat : no-repeat;*/
+ background:#FFF281 none repeat scroll 0%;
}
.rich-inplace-select-strut{
Modified: trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
===================================================================
--- trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-02-26 13:45:05 UTC (rev 6347)
+++ trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-02-26 13:49:28 UTC (rev 6348)
@@ -8,7 +8,6 @@
initHandlers : function($super) {
$super();
- this.tempValueKeeper.observe("blur", function(e){this.tmpValueBlurHandler(e);}.bindAsEventListener(this));
this.tempValueKeeper.observe("click", function(e){this.tempKeeperClickHandler(e);}.bindAsEventListener(this));
this.tempValueKeeper.observe("keydown", function(e){this.tmpValueKeyDownHandler(e);}.bindAsEventListener(this));
@@ -17,6 +16,11 @@
this.comboList.listParent.observe("click", function(e){this.listClickHandler(e);}.bindAsEventListener(this));
},
+ switchingStatesHandler : function($super, e) {
+ $super(e);
+ this.tempValueKeeper.focus();
+ },
+
tempKeeperClickHandler : function() {
this.comboList.isList = false;
this.comboList.showWithDelay();
@@ -24,15 +28,17 @@
tmpValueBlurHandler : function($super, event) {
$super(event);
- /*if (this.comboList.isList) {
- this.tempValueKeeper.focus();
- } */
- this.comboList.hideWithDelay();
+
+ if (!this.comboList.isList || this.clickOnBar) {
+ this.comboList.hideWithDelay();
+ }
+ this.comboList.isList = false;
+ /*this.comboList.hideWithDelay();*/
+
},
listClickHandler : function(event) {
this.tempValueKeeper.focus();
- //this.inputProcessing();
this.comboList.hideWithDelay();
},
Modified: trunk/sandbox/ui/inplaceSelect/src/main/templates/inplaceselect.jspx
===================================================================
--- trunk/sandbox/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-02-26 13:45:05 UTC (rev 6347)
+++ trunk/sandbox/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-02-26 13:49:28 UTC (rev 6348)
@@ -63,7 +63,7 @@
<span id="#{clientId}" class="rich-inplace-select-default-state"
x:passThruWithExclusions="id,styleClass,class,style">
<input id="#{clientId}tabber" type="button" value="" style="width: 1px; position: absolute; left: -32767px;" />
- <img id="#{clientId}inplaceStrut" src="#{spacer}" class="rich-inplace-select-strut" style="display: none"/>
+ <img id="#{clientId}inplaceStrut" src="#{spacer}" class="rich-inplace-select-strut"/>
<input id="#{clientId}inplaceTmpValue"
type="text"
style='display:none;'
@@ -71,6 +71,7 @@
autocomplete="off"
maxlength='#{component.attributes["inputMaxLength"]}'
tabindex='#{component.attributes["tabindex"]}'
+ readonly="readonly"
class="rich-inplace-select-field"/>
<input id='#{clientId}inplaceValue' name='#{clientId}inplaceValue' type='hidden' value='#{fieldValue}'/>
<div id="#{clientId}bar" class="rich-inplace-select-btn-set" style="display:none;">
17 years, 10 months
JBoss Rich Faces SVN: r6347 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-02-26 08:45:05 -0500 (Tue, 26 Feb 2008)
New Revision: 6347
Modified:
trunk/docs/userguide/en/src/main/docbook/included/progressBar.xml
Log:
The text was restructured. And new descriptions were added.
http://jira.jboss.com/jira/browse/RF-1690
Modified: trunk/docs/userguide/en/src/main/docbook/included/progressBar.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/progressBar.xml 2008-02-26 13:31:58 UTC (rev 6346)
+++ trunk/docs/userguide/en/src/main/docbook/included/progressBar.xml 2008-02-26 13:45:05 UTC (rev 6347)
@@ -2,8 +2,8 @@
<section>
<sectioninfo>
<keywordset>
- <keyword>rich:</keyword>
- <keyword></keyword>
+ <keyword>rich:progressBar</keyword>
+ <keyword>progressBar</keyword>
</keywordset>
</sectioninfo>
<table>
@@ -66,8 +66,7 @@
<programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.progressBar;
...
HtmlColumns myColumns = new progressBar();
-...]]>
- </programlisting>
+...]]></programlisting>
</section>
@@ -76,53 +75,60 @@
<section>
<title>Details of Usage</title>
<para>
-
- As it was mentioned above <emphasis role="bold"><property><rich:progressBar></property> </emphasis>
+ As it was mentioned above, the <emphasis role="bold"><property><rich:progressBar></property> </emphasis>
component displays the status of the ongoing process. The component has a number of key attributes.
</para>
-
<para>
-
- <property> "label"</property> the attribute responsible for displaying informational
+ The <emphasis><property> "label"</property></emphasis> attribute is responsible for displaying informational
data on the progress bar, if it's not displayed using children components.
If this attribute is not set and the children components are not used either, no textual information
regarding ongoing process will be indicated.
- In order to indicated the current status you need to pass the value to this attribute. Please see see an example.
+ In order to indicate the current status you need to pass the value to this attribute. Please see an example.
+ </para>
+ <para>
+ <emphasis role="bold">Example:</emphasis>
+ </para>
+ <programlisting role="XML"><![CDATA[...
+<rich:progressBar value="#{bean.incValue}" id="progrs" label="{value}%" >
+</rich:progressBar>
+...]]></programlisting>
+ <para>
+ The <emphasis><property>"value"</property></emphasis> attribute sets the current value of the process. Status of the process is calculated basing on <property> "value"</property> attribute.
</para>
-
<para>
<emphasis role="bold">Example:</emphasis>
</para>
- <programlisting role="JAVA"><![CDATA[
-...
-<progressBar:progressBar value="#{bean.incValue}" id="progrs"
- label="{value}%">
-</progressBar:progressBar>
-...]]>
- </programlisting>
-
+ <programlisting role="XML"><![CDATA[...
+<rich:progressBar
+ value="#{bean.incValue}" >
+</rich:progressBar>
+...]]></programlisting>
+ <para> The <emphasis role="bold"><property><rich:progressBar></property> </emphasis> starts and finishes rendering its state being governed by <emphasis><property>"minValue"</property></emphasis> (default value – "0")
+ and <emphasis><property>"maxValue"</property></emphasis> (default value is "100") attributes relatively. See the following example.</para>
<para>
-
- <property> "value"</property> sets the current value of the process. Status of the process is calculated basing on value.
- </para>
+ <emphasis role="bold">Example:</emphasis>
+ </para>
+ <programlisting role="XML"><![CDATA[...
+<rich:progressBar value="#{bean.incValue}" enabled="#{bean.enabled}" id="progrs"
+ minValue="50"
+ maxValue="400">
+ <h:outputText value="{value}%" ></h:outputText>
+</rich:progressBar>
+...]]> </programlisting>
+ <para> The <emphasis><property>"interval"</property></emphasis>attribute defines the frequency of status polling. Polling is active while the component is operational. </para>
<para>
<emphasis role="bold">Example:</emphasis>
</para>
- <programlisting role="JAVA"><![CDATA[
-...
- <progressBar:progressBar
- value="#{bean.incValue}"
- </progressBar:progressBar>
-...]]>
- </programlisting>
-
-
-
- <para>
-
- The component employs the following facets to display the <property> "initial"</property> and <property> "complete"</property> states of the process:
+ <programlisting role="XML"><![CDATA[...
+<rich:progressBar value="#{bean.incValue}" enabled="#{bean.enabled}" id="progrs"
+ nterval="900" >
+ . . .
+</rich:progressBar>
+...]]> </programlisting>
+ <para>
+ The component can also employ the following facets to display the <property> "initial"</property> and <property> "complete"</property> states of the process:
</para>
<para>
<emphasis role="bold">Example:</emphasis>
@@ -131,8 +137,7 @@
<f:facet name="initial">
<h:outputText value="Process not started" />
</f:facet>
-...]]>
-</programlisting>
+...]]></programlisting>
<para>
and
</para>
@@ -143,57 +148,17 @@
<f:facet name="complete">
<h:outputText value="Process completed" />
</f:facet>
- ...]]>
-
- </programlisting>
+ ...]]> </programlisting>
<para> However, the usage of these facets is optional. If you omit them nothing will be displayed. </para>
- <para> The progress bar starts and finishes rendering its state being governed by <emphasis><property>"minValue"</property></emphasis> (default value – "0")
- and <emphasis><property>"maxValue"</property></emphasis> (default value is "100") attributes relatively. See the following example.</para>
+ <para> In order to display textual and numerical information on the progress bar (as it was said above this can be aslo performed using <emphasis><property> "label"</property></emphasis> attribute ) you need to use this code: </para>
<para>
<emphasis role="bold">Example:</emphasis>
- </para>
-
- <programlisting role="XML"><![CDATA[...
-<rich:progressBar value="#{bean.incValue}" enabled="#{bean.enabled}" id="progrs"
- minValue="50"
- maxValue="400">
- <h:outputText value="{value}%" ></h:outputText>
-</rich:progressBar>
-...]]>
- </programlisting>
-
- <para> In order to display textual and numerical information on the progress bar you need to use this code: </para>
-
-
- <para>
- <emphasis role="bold">Example:</emphasis>
</para>
<programlisting role="XML"><![CDATA[...
<h:outputText value="{value}%" ></h:outputText>
- ...]]>
- </programlisting>
-
-
-
- <para> The <emphasis><property>"interval"</property></emphasis>attribute defines the frequency of status polling. Polling is active while the component is operational. </para>
-
- <para>
- <emphasis role="bold">Example:</emphasis>
- </para>
-
- <programlisting role="XML"><![CDATA[...
-<rich:progressBar value="#{bean.incValue}" enabled="#{bean.enabled}" id="progrs"
- nterval="900" >
- . . .
-</rich:progressBar>
-...]]>
- </programlisting>
-
-
-
- <para>The <property><rich:progressBar></property>component can be used in two modes: Ajax (default) and Client. In order to define the mode you need to use <emphasis><property>"mode"</property></emphasis> attribute. </para>
-
+...]]></programlisting>
+ <para>The <emphasis role="bold"><property><rich:progressBar></property> </emphasis> component can be used in two modes: Ajax (default) and Client. In order to define the mode you need to use <emphasis><property>"mode"</property></emphasis> attribute. </para>
<itemizedlist>
<listitem>
<para><property>Ajax</property> - polling is activated when the component is enabled to check its value. </para>
@@ -201,14 +166,10 @@
<listitem>
<para><property>Client</property> - component updates after its value changed through JavaScript API. </para>
</listitem>
-
</itemizedlist>
-
-
</section>
<!-- End. Details of Usage-->
-
<!-- JavaScript API-->
<section>
<title>JavaScript API</title>
@@ -253,7 +214,7 @@
</tgroup>
</table>
</section>
- <!-- End of JavaScript API-->
+ <!-- End of JavaScript API-->
<!-- Look-and-Feel Customization-->
@@ -278,4 +239,4 @@
<!-- End of Look-and-Feel Customization-->
- </section>
\ No newline at end of file
+</section>
17 years, 10 months
JBoss Rich Faces SVN: r6346 - branches/3.1.x/framework/impl/src/main/javascript/ajaxjsf.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2008-02-26 08:31:58 -0500 (Tue, 26 Feb 2008)
New Revision: 6346
Modified:
branches/3.1.x/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
Log:
http://jira.jboss.com/jira/browse/RF-2325
Modified: branches/3.1.x/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- branches/3.1.x/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-02-26 13:17:43 UTC (rev 6345)
+++ branches/3.1.x/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-02-26 13:31:58 UTC (rev 6346)
@@ -1299,11 +1299,15 @@
_value_query : function(control){
- LOG.debug("Append "+control.type+" control "+control.name+" with value ["+control.value+"] and value attribute ["+control.getAttribute('value')+"]");
- if(null != control.value){
- this.appendParameter(control.name, control.value);
- }
- },
+ if (control.name) {
+ LOG.debug("Append "+control.type+" control "+control.name+" with value ["+control.value+"] and value attribute ["+control.getAttribute('value')+"]");
+ if(null != control.value){
+ this.appendParameter(control.name, control.value);
+ }
+ } else {
+ LOG.debug("Ignored "+control.type+" no-name control with value ["+control.value+"] and value attribute ["+control.getAttribute('value')+"]");
+ }
+ },
_check_query : function(control){
if( control.checked ) {
17 years, 10 months
JBoss Rich Faces SVN: r6345 - trunk/framework/impl/src/main/javascript/ajaxjsf.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2008-02-26 08:17:43 -0500 (Tue, 26 Feb 2008)
New Revision: 6345
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
Log:
http://jira.jboss.com/jira/browse/RF-2325
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-02-26 13:03:54 UTC (rev 6344)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-02-26 13:17:43 UTC (rev 6345)
@@ -1332,11 +1332,15 @@
_value_query : function(control){
- LOG.debug("Append "+control.type+" control "+control.name+" with value ["+control.value+"] and value attribute ["+control.getAttribute('value')+"]");
- if(null != control.value){
- this.appendParameter(control.name, control.value);
- }
- },
+ if (control.name) {
+ LOG.debug("Append "+control.type+" control "+control.name+" with value ["+control.value+"] and value attribute ["+control.getAttribute('value')+"]");
+ if(null != control.value){
+ this.appendParameter(control.name, control.value);
+ }
+ } else {
+ LOG.debug("Ignored "+control.type+" no-name control with value ["+control.value+"] and value attribute ["+control.getAttribute('value')+"]");
+ }
+ },
_check_query : function(control){
if( control.checked ) {
17 years, 10 months
JBoss Rich Faces SVN: r6344 - trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-02-26 08:03:54 -0500 (Tue, 26 Feb 2008)
New Revision: 6344
Modified:
trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
Log:
fix uploading into _blank window in IE
Modified: trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-26 12:31:56 UTC (rev 6343)
+++ trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-26 13:03:54 UTC (rev 6344)
@@ -405,14 +405,13 @@
},
createFrame: function () {
+ var div = document.createElement("div");
+ div.style.display = 'none';
+ var child = "<iframe name='"+this.id+"' id='"+this.id+"_iframe'></iframe>";
+ div.innerHTML = child;
+ document.body.appendChild(div);
var iframe = $(this.id + "_iframe");
- if (!iframe) {
- iframe = document.createElement("iframe");
- iframe.id = this.id + "_iframe";
- iframe.name = this.id;
- iframe.style.display = 'none';
- document.body.appendChild(iframe);
- }
+
this.iframe = iframe;
return iframe;
},
@@ -421,7 +420,7 @@
deleteFrame: function() {
if (this.iframe) {
this.iframe.src = "about:blank";
- document.body.removeChild(this.iframe);
+ document.body.removeChild(this.iframe.parentNode);
}
this.iframe = null;
},
17 years, 10 months
JBoss Rich Faces SVN: r6343 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: cluts
Date: 2008-02-26 07:31:56 -0500 (Tue, 26 Feb 2008)
New Revision: 6343
Modified:
trunk/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml
trunk/docs/userguide/en/src/main/docbook/included/dataGrid.xml
trunk/docs/userguide/en/src/main/docbook/included/dataList.xml
trunk/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml
trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml
Log:
http://jira.jboss.com/jira/browse/RF-926 - done for column,combobox and corrected code for dataGrid, dataOrderedList, dataDefinitionList, dataTable
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml 2008-02-26 12:30:12 UTC (rev 6342)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml 2008-02-26 12:31:56 UTC (rev 6343)
@@ -135,7 +135,7 @@
...
</rich:dataDefinitionList>
...
- <a4j:commandButton action"#{listBean.action}" reRender="list" value="Submit"/>
+ <a4j:commandButton action="#{listBean.action}" reRender="list" value="Submit"/>
...
]]></programlisting>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataGrid.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataGrid.xml 2008-02-26 12:30:12 UTC (rev 6342)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataGrid.xml 2008-02-26 12:31:56 UTC (rev 6343)
@@ -152,7 +152,7 @@
...
</rich:dataGrid>
...
- <a4j:commandButton action"#{listBean.action}" reRender="grid" value="Submit"/>
+ <a4j:commandButton action="#{listBean.action}" reRender="grid" value="Submit"/>
...
]]></programlisting>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataList.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataList.xml 2008-02-26 12:30:12 UTC (rev 6342)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataList.xml 2008-02-26 12:31:56 UTC (rev 6343)
@@ -147,7 +147,7 @@
...
</rich:dataList>
...
- <a4j:commandButton action"#{listBean.action}" reRender="list" value="Submit"/>
+ <a4j:commandButton action="#{listBean.action}" reRender="list" value="Submit"/>
...
]]></programlisting>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml 2008-02-26 12:30:12 UTC (rev 6342)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml 2008-02-26 12:31:56 UTC (rev 6343)
@@ -137,7 +137,7 @@
...
</rich:dataOrderedList>
...
- <a4j:commandButton action"#{listBean.action}" reRender="list" value="Submit"/>
+ <a4j:commandButton action="#{listBean.action}" reRender="list" value="Submit"/>
...
]]></programlisting>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2008-02-26 12:30:12 UTC (rev 6342)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2008-02-26 12:31:56 UTC (rev 6343)
@@ -95,7 +95,7 @@
...
</rich:dataTable>
...
- <a4j:commandButton action"#{tableBean.action}" reRender="table" value="Submit"/>
+ <a4j:commandButton action="#{tableBean.action}" reRender="table" value="Submit"/>
...
]]></programlisting>
17 years, 10 months
JBoss Rich Faces SVN: r6342 - trunk/sandbox/ui/inplaceInput/src/main/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-26 07:30:12 -0500 (Tue, 26 Feb 2008)
New Revision: 6342
Modified:
trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx
Log:
fix events
Modified: trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-02-26 12:20:24 UTC (rev 6341)
+++ trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-02-26 12:30:12 UTC (rev 6342)
@@ -76,16 +76,16 @@
onselect='#{component.attributes["onselect"]}'
onblur='#{component.attributes["onblur"]}'
onfocus='#{component.attributes["onfocus"]}'
- oninputclick='#{component.attributes["oninputclick"]}'
- oninputdblclick='#{component.attributes["oninputdblclick"]}'
- oninputkeydown='#{component.attributes["oninputkeydown"]}'
- oninputkeypress='#{component.attributes["oninputkeypress"]}'
- oninputkeyup='#{component.attributes["oninputkeyup"]}'
- oninputmousedown='#{component.attributes["oninputmousedown"]}'
- oninputmousemove='#{component.attributes["oninputmousemove"]}'
- oninputmouseout='#{component.attributes["oninputmouseout"]}'
- oninputmouseover='#{component.attributes["oninputmouseover"]}'
- oninputmouseup='#{component.attributes["oninputmouseup"]}'
+ onclick='#{component.attributes["oninputclick"]}'
+ ondblclick='#{component.attributes["oninputdblclick"]}'
+ onkeydown='#{component.attributes["oninputkeydown"]}'
+ onkeypress='#{component.attributes["oninputkeypress"]}'
+ onkeyup='#{component.attributes["oninputkeyup"]}'
+ onmousedown='#{component.attributes["oninputmousedown"]}'
+ onmousemove='#{component.attributes["oninputmousemove"]}'
+ onmouseout='#{component.attributes["oninputmouseout"]}'
+ onmouseover='#{component.attributes["oninputmouseover"]}'
+ onmouseup='#{component.attributes["oninputmouseup"]}'
/>
<input id='#{clientId}value' name='#{clientId}value' type='hidden' value='#{fieldValue}'/>
17 years, 10 months
JBoss Rich Faces SVN: r6341 - trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-26 07:20:24 -0500 (Tue, 26 Feb 2008)
New Revision: 6341
Modified:
trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss
Log:
skinning
Modified: trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss 2008-02-26 12:18:28 UTC (rev 6340)
+++ trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss 2008-02-26 12:20:24 UTC (rev 6341)
@@ -9,26 +9,13 @@
}
.rich-inplace-changed {
- background-color:#F1F1F1;
- border-bottom:1px dashed #000000;
- padding-left:3px;
- padding-right:3px;
- white-space:nowrap;
background-position:left top;
background-repeat:no-repeat;
}
- .rich-inplace-input-view-hover {
- border: thin solid red;
- }
-
- .rich-inplace-input-change-hover {
- border: thin solid blue;
- }
-
.rich-inplace-view {
- background-color:#F1F1F1;
- border-bottom:1px dashed #000000;
+ border-width: 1px;
+ border-style: dashed;
padding-left:3px;
padding-right:3px;
white-space:nowrap;
@@ -39,29 +26,46 @@
}
.rich-inplace-field {
- background:#FFF281 none repeat scroll 0%;
border:0px none;
- /*left:0px;
- top:0px;
- position:absolute;*/
margin:0px;
- padding:0px 0px 0px 3px;
+ padding:0px 0px 0px 0px;
}
+
+ .rich-inplace-input-view-hover {
+ border: thin solid red;
+ }
+ .rich-inplace-input-change-hover {
+ border: thin solid blue;
+ }
+
+ .rich-inplace-input-strut {
+ height : 1px;
+ }
+
.rich-inplace-button {
- background-color : #FFFFFF;
- border : 1px outset #BED6F8;
+ background-position: top;
+ background-repeat: repeat-x;
+ border-width : 1px;
+ border-style: outset;
padding : 0px;
margin : 0px;
}
.rich-inplace-button-press {
- background-color: #FFFFFF;
- border : 1px inset #BED6F8;
+ background-position: top;
+ background-repeat: repeat-x;
+ border-width: 1px;
+ border-style: inset;
padding : 0px;
margin : 0px;
}
+ .rich-inplace-input-button-set {
+ white-space : nowrap;
+ }
+
+
.rich-inplace-shadow {
top:-6px;
left:-4px;
@@ -69,7 +73,7 @@
}
.rich-inplace-shadow-size {
- width : 34px; height : 25px;
+ width : 34px; height : 16px;
}
.rich-inplace-shadow-tl {
@@ -91,14 +95,6 @@
background-repeat: repeat-x;
background-position: bottom right;
}
-
- .rich-inplace-input-button-set {
- white-space : nowrap;
- }
-
- .rich-inplace-input-strut {
- height : 1px;
- }
]]>
</f:verbatim>
@@ -113,13 +109,16 @@
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.images.SpinnerButtonGradient"/>
</u:style>
+ <u:style name="background-color" skin="tabBackgroundColor"/>
+ <u:style name="border-color" skin="panelBorderColor"/>
</u:selector>
-
-
+
<u:selector name=".rich-inplace-button-press">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.images.ComboBoxButtonPressGradient"/>
</u:style>
+ <u:style name="background-color" skin="tabBackgroundColor"/>
+ <u:style name="border-color" skin="panelBorderColor"/>
</u:selector>
<u:selector name=".rich-inplace-shadow-tl">
@@ -146,4 +145,14 @@
</u:style>
</u:selector>
+ <u:selector name=".rich-inplace-view">
+ <u:style name="background-color" skin="editorBackgroundColor"/>
+ <u:style name="border-color" skin="generalTextColor"/>
+ </u:selector>
+
+ <u:selector name=".rich-inplace-field">
+ <u:style name="background-color" skin="editBackgroundColor"/>
+ </u:selector>
+
+
</f:template>
17 years, 10 months
JBoss Rich Faces SVN: r6340 - in trunk/sandbox/ui/fileUpload/src/main: resources/org/richfaces/renderkit/html/js and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-02-26 07:18:28 -0500 (Tue, 26 Feb 2008)
New Revision: 6340
Modified:
trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java
trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
Log:
update view state after file uploaded functionality
Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-02-26 11:57:05 UTC (rev 6339)
+++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-02-26 12:18:28 UTC (rev 6340)
@@ -14,8 +14,12 @@
import javax.faces.context.ResponseWriter;
import javax.faces.render.RenderKit;
import javax.faces.render.RenderKitFactory;
+import javax.faces.render.ResponseStateManager;
import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpSession;
+import org.ajax4jsf.context.AjaxContext;
+import org.ajax4jsf.context.AjaxContextImpl;
import org.ajax4jsf.event.AjaxEvent;
import org.ajax4jsf.javascript.JSFunction;
import org.ajax4jsf.javascript.JSFunctionDefinition;
@@ -100,9 +104,10 @@
UIFileUpload fileUpload) {
storeData(context, fileUpload, file);
try {
- context.responseComplete();
+ AjaxContext ajaxContext = AjaxContextImpl.getCurrentInstance(context);
+ ajaxContext.setAjaxRequest(true);
} catch (Exception e) {
- e.getMessage();
+ e.getMessage();
}
}
Modified: trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-26 11:57:05 UTC (rev 6339)
+++ trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-26 12:18:28 UTC (rev 6340)
@@ -273,9 +273,10 @@
LoadWatcher = Class.create();
Object.extend(LoadWatcher.prototype, {
- initialize: function(iframe, callback) {
+ initialize: function(iframe, callback, viewStateUpdater) {
this.iframe = iframe;
this.callback = callback;
+ this.viewStateUpdater = viewStateUpdater;
this.loadObserver = function() {
if (!this.stopped) {
@@ -324,7 +325,10 @@
} else if (restr) {
this.callback(FileUploadEntry.UPLOAD_SIZE_ERROR);
} else {
- //TODO handle server internal errors, etc.
+ var state = iframeDocument.getElementById('javax.faces.ViewState');
+ if (state) {
+ this.viewStateUpdater(state.value);
+ }
this.callback(FileUploadEntry.UPLOAD_SUCCESS);
}
},
@@ -421,7 +425,7 @@
}
this.iframe = null;
},
-
+
initEvents : function() {
for (var e in this.events) {
if (e && this.events[e]) {
@@ -711,6 +715,15 @@
this.deleteFrame();
},
+ updateViewState: function (state) {
+ if (!state) return;
+ var form = this.getForm();
+ var viewStateE = form['javax.faces.ViewState'];
+ if (viewStateE) {
+ viewStateE.value = state;
+ }
+ },
+
_updateEntriesState: function() {
var l = this.entries.length;
@@ -793,11 +806,16 @@
this.processButtons();
},
- submitForm: function(entry) {
+ getForm: function () {
var parentForm = this.element;
while (parentForm.tagName && parentForm.tagName.toLowerCase() != 'form') {
parentForm = parentForm.parentNode;
}
+ return parentForm;
+ },
+
+ submitForm: function(entry) {
+ var parentForm = this.getForm();
if (!parentForm) {
throw "No parent form found!";
@@ -841,7 +859,10 @@
new LoadWatcher(iframe, function(newState) {
this.finishProgressBar();
this.setState(newState);
- }.bind(entry));
+ }.bind(entry),
+ function (state) {
+ this.updateViewState(state);
+ }.bind(this));
parentForm.submit();
}
17 years, 10 months
JBoss Rich Faces SVN: r6339 - trunk/sandbox/samples/fileUploadDemo/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-02-26 06:57:05 -0500 (Tue, 26 Feb 2008)
New Revision: 6339
Modified:
trunk/sandbox/samples/fileUploadDemo/src/main/webapp/pages/index.jsp
Log:
a sample js error fix
Modified: trunk/sandbox/samples/fileUploadDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/sandbox/samples/fileUploadDemo/src/main/webapp/pages/index.jsp 2008-02-26 09:41:32 UTC (rev 6338)
+++ trunk/sandbox/samples/fileUploadDemo/src/main/webapp/pages/index.jsp 2008-02-26 11:57:05 UTC (rev 6339)
@@ -3,7 +3,7 @@
<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/ui/fileUpload"
prefix="fu"%>
-<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/progressBar" prefix="progressBar" %>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/ui/progressBar" prefix="progressBar" %>
<html>
<head>
<title></title>
@@ -29,7 +29,7 @@
<tr><td>Upload List Width:</td><td>
<h:inputText value="#{bean.width}"></h:inputText></td></tr>
<tr><td>Upload List Height:</td><td>
-<h:inputText value="#{bean.height}"></h:inputText></td></tr>
+<h:inputText id="bonus" value="#{bean.height}"></h:inputText></td></tr>
</table><br/>
<a4j:commandButton reRender="upload1" value="Accept"></a4j:commandButton>
</h:form>
@@ -65,8 +65,8 @@
</h:dataTable>
<br/><br/><br/>
-<input type="button" onclick="$('j_id_jsp_223736782_7:upload1').component.enable();" value="Enable" />
-<input type="button" onclick="$('j_id_jsp_223736782_7:upload1').component.disable();" value="Disable" /><br/>
+<input type="button" onclick="$(this.form.id + ':upload1').component.enable();" value="Enable" />
+<input type="button" onclick="$(this.form.id + ':upload1').component.disable();" value="Disable" /><br/>
</h:form>
</f:view>
</body>
17 years, 10 months