JBoss Rich Faces SVN: r9433 - trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-07-07 13:35:57 -0400 (Mon, 07 Jul 2008)
New Revision: 9433
Modified:
trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java
Log:
http://jira.jboss.com/jira/browse/RF-3811
Modified: trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java
===================================================================
--- trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java 2008-07-07 15:39:11 UTC (rev 9432)
+++ trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java 2008-07-07 17:35:57 UTC (rev 9433)
@@ -23,12 +23,10 @@
import java.io.IOException;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -69,7 +67,7 @@
contentClass = "";
}
if (null == contentStyle) {
- contentClass = "";
+ contentStyle = "";
}
if (children != null) {
@@ -95,12 +93,13 @@
ResponseWriter writer = facesContext.getResponseWriter();
for (Iterator<UIComponent> it = childrenToTheLeft.iterator(); it.hasNext();) {
UIComponent child = it.next();
+
if (! (child instanceof UIToolBarGroup)) {
writer.startElement(HTML.td_ELEM, component);
writer.writeAttribute(HTML.class_ATTRIBUTE, "dr-toolbar-int rich-toolbar-item " + contentClass, null);
getUtils().writeAttribute(writer, HTML.style_ATTRIBUTE, contentStyle);
- encodeEventsAttributes(facesContext, child, writer);
- }
+ encodeEventsAttributes(facesContext, toolBar, writer);
+ }
renderChild(facesContext, child);
if (! (child instanceof UIToolBarGroup)) {
writer.endElement(HTML.td_ELEM);
@@ -195,24 +194,17 @@
protected void encodeEventsAttributes(FacesContext facesContext, UIComponent component, ResponseWriter writer)
throws IOException {
- Map<String, Object> attributes = getParentToolBar(component).getAttributes();
- Set<String> encodedAttributes = new HashSet<String>();
-
+
+ UIToolBar toolbar = getParentToolBar(component);
+ Map<String, Object> attributes = toolbar.getAttributes();
+
for (int i = 0; i < ON_ITEM_EVENTS.length; i++) {
Object value = attributes.get(ON_ITEM_EVENTS[i]);
if (null != value && !"".equals(value)) {
String eventName = ON_ITEM_EVENTS[i].replace("item", "");
- encodedAttributes.add(eventName);
- Object selfEvent = component.getAttributes().get(eventName);
- if (null == selfEvent) {
- selfEvent = "";
- }
- writer.writeAttribute(eventName, selfEvent + ";" + value, null);
+ getUtils().writeAttribute(writer, eventName, value);
}
}
- encodedAttributes.add(HTML.class_ATTRIBUTE);
- encodedAttributes.add(HTML.style_ATTRIBUTE);
- getUtils().encodePassThruWithExclusionsArray(facesContext, component, encodedAttributes.toArray());
}
public UIToolBar getParentToolBar(UIComponent component) {
16 years, 2 months
JBoss Rich Faces SVN: r9432 - trunk/test-applications/facelets/src/main/java/scrollableDataTable.
by richfaces-svn-commits＠lists.jboss.org
Author: tkuprevich
Date: 2008-07-07 11:39:11 -0400 (Mon, 07 Jul 2008)
New Revision: 9432
Modified:
trunk/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java
Log:
Modified: trunk/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java 2008-07-07 15:38:16 UTC (rev 9431)
+++ trunk/test-applications/facelets/src/main/java/scrollableDataTable/ScrollableDataTable.java 2008-07-07 15:39:11 UTC (rev 9432)
@@ -1,13 +1,15 @@
package scrollableDataTable;
import java.util.ArrayList;
+import java.util.GregorianCalendar;
import org.ajax4jsf.model.DataComponentState;
+import org.richfaces.component.html.HtmlScrollableDataTable;
import org.richfaces.model.selection.Selection;
+import util.componentInfo.ComponentInfo;
import util.data.Data;
-
/**
* @author AYanul
*
@@ -34,7 +36,31 @@
private String activeRowKey;
private Selection selection;
private boolean ajaxSingle;
+ private GregorianCalendar date;
+ private HtmlScrollableDataTable htmlScrollableDataTable = null;
+
+ public void addHtmlScrollableDataTable(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlScrollableDataTable);
+ }
+
+ public HtmlScrollableDataTable getHtmlScrollableDataTable() {
+ return htmlScrollableDataTable;
+ }
+ public void setHtmlScrollableDataTable(
+ HtmlScrollableDataTable htmlScrollableDataTable) {
+ this.htmlScrollableDataTable = htmlScrollableDataTable;
+ }
+
+ public GregorianCalendar getDate() {
+ return date;
+ }
+
+ public void setDate(GregorianCalendar date) {
+ this.date = date;
+ }
+
public ScrollableDataTable() {
sortMode = "single";
width = "400px";
@@ -50,6 +76,7 @@
bypassUpdates = false;
ignoreDupResponses = false;
ajaxSingle = false;
+ date = new GregorianCalendar();
addNewItem();
}
@@ -161,14 +188,16 @@
this.hideWhenScrolling = hideWhenScrolling;
}
- public void addNewItem() {
+ public void addNewItem() {
if(dataLength < 0) dataLength = 0;
if(data.size() > dataLength)
- for(int i = dataLength; i < data.size(); )
+ for(int i = data.size() - 1; i >= dataLength; i--)
data.remove(i);
else
- for(int i = data.size() + 1; i <= dataLength; i++)
- data.add(new Data(i, "Text " + i, "Link " + i, "select" +(i % 5), Data.statusIcon[i % 5]));
+ for(int i = data.size(); i < dataLength; i++){
+ date.set(2008, 5, 14, 3, i);
+ data.add(new Data(i, "Text " + i, "Link " + i, "select" +(i % 5), Data.statusIcon[i % 5], date.getTime()));
+ }
}
public ArrayList<Data> getData() {
16 years, 2 months
JBoss Rich Faces SVN: r9431 - trunk/test-applications/jsp/src/main/java/scrollableDataTable.
by richfaces-svn-commits＠lists.jboss.org
Author: tkuprevich
Date: 2008-07-07 11:38:16 -0400 (Mon, 07 Jul 2008)
New Revision: 9431
Modified:
trunk/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java
Log:
Modified: trunk/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java 2008-07-07 14:56:16 UTC (rev 9430)
+++ trunk/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java 2008-07-07 15:38:16 UTC (rev 9431)
@@ -191,10 +191,10 @@
public void addNewItem() {
if(dataLength < 0) dataLength = 0;
if(data.size() > dataLength)
- for(int i = dataLength; i < data.size();i--)
+ for(int i = data.size() - 1; i >= dataLength; i--)
data.remove(i);
else
- for(int i = data.size() + 1; i <= dataLength; i++){
+ for(int i = data.size(); i < dataLength; i++){
date.set(2008, 5, 14, 3, i);
data.add(new Data(i, "Text " + i, "Link " + i, "select" +(i % 5), Data.statusIcon[i % 5], date.getTime()));
}
16 years, 2 months
JBoss Rich Faces SVN: r9430 - trunk/docs/userguide/en/src/main/docbook/modules.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-07-07 10:56:16 -0400 (Mon, 07 Jul 2008)
New Revision: 9430
Modified:
trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
Log:
http://jira.jboss.com/jira/browse/RF-3742
The info about new st. controls skinning classes is added
Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2008-07-07 13:59:53 UTC (rev 9429)
+++ trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2008-07-07 14:56:16 UTC (rev 9430)
@@ -2922,8 +2922,8 @@
<table>
<title>
Rich Elements Skin Bindings for .rich-input,
- .rich-select, .rich-textarea, .rich-button,
- .rich-keygen, .rich-isindex, .rich-legend,
+ .rich-select, .rich-textarea,
+ .rich-keygen, .rich-isindex,
.rich-link
</title>
<tgroup cols="2">
@@ -2983,7 +2983,7 @@
<thead>
<row>
<entry>CSS Properties</entry>
- <entry>Skin parameters</entry>
+ <entry>Skin parameters/Value</entry>
</row>
</thead>
<tbody>
@@ -2992,6 +2992,18 @@
<entry>border-color</entry>
<entry>panelBorderColor</entry>
</row>
+
+
+
+ <row>
+ <entry>border-width</entry>
+ <entry>1px</entry>
+ </row>
+
+ <row>
+ <entry>border-style</entry>
+ <entry>solid</entry>
+ </row>
</tbody>
</tgroup>
</table>
@@ -3068,6 +3080,378 @@
</tbody>
</tgroup>
</table>
+
+ <table>
+ <title>
+ Rich Elements Skin Bindings for
+ .rich-field
+ </title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>CSS Properties</entry>
+ <entry>Skin parameters/Value</entry>
+ </row>
+ </thead>
+ <tbody>
+
+
+ <row>
+ <entry>border-width</entry>
+ <entry>1px</entry>
+ </row>
+ <row>
+ <entry>border-style</entry>
+ <entry>inset</entry>
+ </row>
+ <row>
+ <entry>border-color</entry>
+ <entry>panelBorderColor</entry>
+ </row>
+
+ <row>
+ <entry>background-color</entry>
+ <entry>controlBackgroundColor</entry>
+ </row>
+
+ <row>
+ <entry>background-repeat</entry>
+ <entry>no-repeat</entry>
+ </row>
+
+ <row>
+ <entry>background-position</entry>
+ <entry>1px 1px</entry>
+ </row>
+
+
+
+
+ </tbody>
+ </tgroup>
+ </table>
+
+
+
+ <table>
+ <title>
+ Rich Elements Skin Bindings for
+ .rich-field-edit
+ </title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>CSS Properties</entry>
+ <entry>Skin parameters/Value</entry>
+ </row>
+ </thead>
+ <tbody>
+
+
+ <row>
+ <entry>border-width</entry>
+ <entry>1px</entry>
+ </row>
+ <row>
+ <entry>border-style</entry>
+ <entry>inset</entry>
+ </row>
+ <row>
+ <entry>border-color</entry>
+ <entry>panelBorderColor</entry>
+ </row>
+
+
+ <row>
+ <entry>background-color</entry>
+ <entry>editBackgroundColor</entry>
+ </row>
+
+
+
+ </tbody>
+ </tgroup>
+ </table>
+
+
+ <table>
+ <title>
+ Rich Elements Skin Bindings for
+ .rich-field-error
+ </title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>CSS Properties</entry>
+ <entry>Skin parameter/Value</entry>
+ </row>
+ </thead>
+ <tbody>
+
+
+ <row>
+ <entry>border-width</entry>
+ <entry>1px</entry>
+ </row>
+ <row>
+ <entry>border-style</entry>
+ <entry>inset</entry>
+ </row>
+ <row>
+ <entry>border-color</entry>
+ <entry>panelBorderColor</entry>
+ </row>
+
+
+ <row>
+ <entry>background-color</entry>
+ <entry>warningBackgroundColor</entry>
+ </row>
+
+ <row>
+ <entry>background-repeat</entry>
+ <entry>no-repeat</entry>
+ </row>
+
+
+ <row>
+ <entry>background-position</entry>
+ <entry>center left</entry>
+ </row>
+
+
+ <row>
+ <entry>padding-left</entry>
+ <entry>7px</entry>
+ </row>
+
+ </tbody>
+ </tgroup>
+ </table>
+
+
+
+
+
+
+ <table>
+ <title>
+ Rich Elements Skin Bindings for
+ .rich-button, .rich-button-disabled, .rich-button-over
+ </title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>CSS Properties</entry>
+ <entry>Skin parameter/Value</entry>
+ </row>
+ </thead>
+ <tbody>
+
+
+ <row>
+ <entry>border-width</entry>
+ <entry>1px</entry>
+ </row>
+ <row>
+ <entry>border-style</entry>
+ <entry>solid</entry>
+ </row>
+ <row>
+ <entry>border-color</entry>
+ <entry>panelBorderColor</entry>
+ </row>
+
+
+ <row>
+ <entry>background-color</entry>
+ <entry>trimColor</entry>
+ </row>
+
+ <row>
+ <entry>padding</entry>
+ <entry>2px 10px 2px 10px</entry>
+ </row>
+
+
+ <row>
+ <entry>text-align</entry>
+ <entry>center</entry>
+ </row>
+
+
+ <row>
+ <entry>cursor</entry>
+ <entry>pointer</entry>
+ </row>
+ <row>
+ <entry>background-repeat</entry>
+ <entry>repeat-x</entry>
+ </row> <row>
+ <entry>background-position</entry>
+ <entry>top left</entry>
+ </row>
+
+
+ </tbody>
+ </tgroup>
+ </table>
+
+
+
+
+
+
+ <table>
+ <title>
+ Rich Elements Skin Bindings for
+ .rich-button-press
+ </title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>CSS Properties</entry>
+ <entry>Skin parameter/Value</entry>
+ </row>
+ </thead>
+ <tbody>
+
+ <row>
+ <entry>background-position</entry>
+ <entry>bottom left</entry>
+ </row>
+
+ </tbody>
+ </tgroup>
+ </table>
+
+
+
+
+
+
+ <table>
+ <title>
+ Rich Elements Skin Bindings for
+ .rich-container fieldset, .rich-fieldset
+ </title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>CSS Properties</entry>
+ <entry>Skin parameters/Value</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>border-color</entry>
+ <entry>panelBorderColor</entry>
+ </row>
+
+
+ <row>
+ <entry>border-width</entry>
+ <entry>1px</entry>
+ </row>
+
+
+ <row>
+ <entry>border-style</entry>
+ <entry>solid</entry>
+ </row>
+
+
+ <row>
+ <entry>padding</entry>
+ <entry>10px</entry>
+ </row>
+
+
+ <row>
+ <entry>padding</entry>
+ <entry>10px</entry>
+ </row>
+
+
+ </tbody>
+ </tgroup>
+ </table>
+
+
+
+ <table>
+ <title>
+ Rich Elements Skin Bindings for
+ .rich-legend
+ </title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>CSS Properties</entry>
+ <entry>Skin parameter/Value</entry>
+ </row>
+ </thead>
+ <tbody>
+
+ <row>
+ <entry>font-size</entry>
+ <entry>generalSizeFont</entry>
+ </row>
+ <row>
+ <entry>font-family</entry>
+ <entry>generalFamilyFont</entry>
+ </row>
+ <row>
+ <entry>color</entry>
+ <entry>controlTextColor</entry>
+ </row>
+
+
+ <row>
+ <entry>font-weight</entry>
+ <entry>bold</entry>
+ </row>
+
+
+
+ </tbody>
+ </tgroup>
+ </table>
+
+
+
+
+
+
+ <table>
+ <title>
+ Rich Elements Skin Bindings for
+ .rich-form
+ </title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>CSS Properties</entry>
+ <entry>Skin parameters/Value</entry>
+ </row>
+ </thead>
+ <tbody>
+
+ <row>
+ <entry>padding</entry>
+ <entry>0px</entry>
+ </row>
+ <row>
+ <entry>margin</entry>
+ <entry>0px</entry>
+ </row>
+
+
+
+
+ </tbody>
+ </tgroup>
+ </table>
</section>
@@ -3086,7 +3470,7 @@
<thead>
<row>
<entry>CSS properties</entry>
- <entry>Skin parameters</entry>
+ <entry>Skin parameters/Value</entry>
</row>
</thead>
<tbody>
16 years, 2 months
JBoss Rich Faces SVN: r9429 - trunk/test-applications/facelets/src/main/webapp/DropDownMenu.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-07-07 09:59:53 -0400 (Mon, 07 Jul 2008)
New Revision: 9429
Modified:
trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuProperty.xhtml
Log:
+from forum:
http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4162691#4162691
Modified: trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuProperty.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuProperty.xhtml 2008-07-07 13:22:11 UTC (rev 9428)
+++ trunk/test-applications/facelets/src/main/webapp/DropDownMenu/DropDownMenuProperty.xhtml 2008-07-07 13:59:53 UTC (rev 9429)
@@ -5,6 +5,29 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
id="dropDownMenuPropertySubviewID">
+ <style>
+.pic {
+ margin-bottom: -4px;
+ margin-right: 2px;
+}
+</style>
+ <h:form>
+ <rich:toolBar itemSeparator="line">
+ <rich:toolBarGroup itemSeparator="none">
+ <rich:dropDownMenu>
+ <f:facet name="label">
+ <h:panelGroup>
+ <h:graphicImage value="/pics/info.gif" styleClass="pic" />
+ <h:outputText value="File" />
+ </h:panelGroup>
+ </f:facet>
+ <rich:menuItem submitMode="ajax" value="Laptop" ajaxSingle="true"></rich:menuItem>
+ <rich:menuItem submitMode="ajax" value="Desktop" ajaxSingle="true"></rich:menuItem>
+ <rich:menuItem submitMode="ajax" value="Servers" ajaxSingle="true"></rich:menuItem>
+ </rich:dropDownMenu>
+ </rich:toolBarGroup>
+ </rich:toolBar>
+ </h:form>
<h:panelGrid columns="2">
<h:outputText value="HideDelay (ms):" />
<h:inputText value="#{dDMenu.hideDelay}">
16 years, 2 months
JBoss Rich Faces SVN: r9428 - in trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html: scripts and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-07-07 09:22:11 -0400 (Mon, 07 Jul 2008)
New Revision: 9428
Modified:
trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/css/panelbar.xcss
trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js
Log:
http://jira.jboss.com/jira/browse/RF-3817
Modified: trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/css/panelbar.xcss
===================================================================
--- trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/css/panelbar.xcss 2008-07-07 13:20:46 UTC (rev 9427)
+++ trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/css/panelbar.xcss 2008-07-07 13:22:11 UTC (rev 9428)
@@ -15,7 +15,6 @@
border : 0px solid red;
padding : 0px 1px 1px 5px;
cursor : pointer;
- zoom : 1;
}
.dr-pnlbar-h-act{
Modified: trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js
===================================================================
--- trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js 2008-07-07 13:20:46 UTC (rev 9427)
+++ trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js 2008-07-07 13:22:11 UTC (rev 9428)
@@ -224,14 +224,6 @@
this.content.style.height="0px";
// this.content.style.paddingRight="0px";
this.hightFirefoxDelta = 0;
-
- if (this.slidePanel.isIE){
- if (this.slidePanel.panel.style.width.indexOf("%")!=-1) {
- this.item.style.width="100%";
- } else {
- this.item.style.width=this.slidePanel.panel.style.width;
- }
- }
if (this.onclick && this.onclick != ""){
this.onclickFunction = new Function("event",this.onclick);
16 years, 2 months
JBoss Rich Faces SVN: r9427 - in trunk/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-07-07 09:20:46 -0400 (Mon, 07 Jul 2008)
New Revision: 9427
Modified:
trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
Log:
fix stop functionality under flash
Modified: trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java
===================================================================
--- trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2008-07-07 13:15:19 UTC (rev 9426)
+++ trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2008-07-07 13:20:46 UTC (rev 9427)
@@ -114,15 +114,34 @@
MultipartRequest multipartRequest = map.get(uid);
clientId = clientId + ":file";
+ boolean isFlash = false;
if (multipartRequest.getFileName(clientId) == null) {
- clientId = "Filedata"; // Flesh mode
+ clientId = "Filedata"; // Flash mode
+ isFlash = true;
}
+
String fileName = multipartRequest.getFileName(clientId);
Object file = multipartRequest.getFile(clientId);
+
+ if (isFlash) {
+ try {
+ int actualSize = multipartRequest.getFileSize(clientId);
+ int clientSize = Integer.parseInt(requestParameterMap.get("_richfaces_size"));
+
+ if (actualSize != clientSize) {
+ return; // File uploading has been stopped on the client side
+ }
+ }catch (Exception e) {
+ return;
+ }
+ }
+
fileUpload.setLocalFileName(fileName);
fileUpload.setLocalContentType(multipartRequest.getFileContentType(clientId));
+
+
onUploadComplete(context, file, fileUpload);
}
Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
===================================================================
--- trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-07-07 13:15:19 UTC (rev 9426)
+++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-07-07 13:20:46 UTC (rev 9427)
@@ -700,8 +700,11 @@
this.runUpload = false;
if (this.activeEntry) {
- this.upload_stopped = true;
- this.activeEntry.stop();
+ if(!this.isFlash) {
+ this.activeEntry.stop();
+ }else {
+ this._flashStop();
+ }
}
return false;
},
@@ -1151,7 +1154,7 @@
},
_flashGetActionUrl: function (url, entry) {
- var getParams = "_richfaces_upload_uid="+ encodeURI(entry.uid) + "&id=" + this.id + "&_richfaces_upload_file_indicator=true&_richfaces_send_http_error=true";
+ var getParams = "_richfaces_upload_uid="+ encodeURI(entry.uid) + "&id=" + this.id + "&_richfaces_upload_file_indicator=true&_richfaces_size="+entry.size+"&_richfaces_send_http_error=true";
if (/\?/.test(url)) {
var i = url.indexOf("?");
url = url.substring(0, i) + ";jsessionid=" + this.sessionId + url.substring(i) + "&" + getParams;
@@ -1190,13 +1193,13 @@
},
-/* _flashStop: function() {
+ _flashStop: function() {
if (this.uploadIndex>=0) {
- //this.flashComponent.cancelUploadFile(this.uploadIndex);
- this.activeEntry.stop();
+ this.flashComponent.cancelUploadFile(this.uploadIndex);
+ //this.activeEntry.stop();
this._flashError(FileUploadEntry.UPLOAD_CANCELED);
}
- },*/
+ },
_flashOnProgress: function (bytesLoaded, bytesTotal)
{
16 years, 2 months
JBoss Rich Faces SVN: r9426 - trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-07-07 09:15:19 -0400 (Mon, 07 Jul 2008)
New Revision: 9426
Modified:
trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp
Log:
-combobox
Modified: trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp 2008-07-07 12:51:56 UTC (rev 9425)
+++ trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp 2008-07-07 13:15:19 UTC (rev 9426)
@@ -69,11 +69,7 @@
<rich:column sortExpression="#{sdt.str0}" sortable="false">
<f:facet name="header">
<h:outputText value="Text"></h:outputText>
- </f:facet>
- <rich:comboBox width="10">
- <f:selectItem itemValue="item_1" />
- <f:selectItem itemValue="item_2" />
- </rich:comboBox>
+ </f:facet>
<f:facet name="footer">
<h:outputText value="Text"></h:outputText>
</f:facet>
16 years, 2 months
JBoss Rich Faces SVN: r9425 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2008-07-07 08:51:56 -0400 (Mon, 07 Jul 2008)
New Revision: 9425
Modified:
trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml
Log:
http://jira.jboss.com/jira/browse/RF-3826
it works:
<a onclick="Richfaces.showModalPanel('modalPanelID');" href="#">Show</a>
<a onclick="Richfaces.hideModalPanel('modalPanelID');" href="#">Hide</a>
thus, this is added into the guide
Modified: trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2008-07-07 12:50:39 UTC (rev 9424)
+++ trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2008-07-07 12:51:56 UTC (rev 9425)
@@ -73,11 +73,10 @@
...
<!--Any Content inside-->
...
- <a href="javascript:RichFaces.hideModalPanel('form:panel')">Hide</a>
+<a onclick="Richfaces.hideModalPanel('modalPanelID');" href="#">Hide</a>
</rich:modalPanel>
+<a onclick="Richfaces.showModalPanel('modalPanelID');" href="#">Show</a>
...
-<a href="javascript:RichFaces.showModalPanel('form:panel')">Show</a>
-...
]]></programlisting>
</section>
16 years, 2 months
JBoss Rich Faces SVN: r9424 - trunk/ui/separator/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: cluts
Date: 2008-07-07 08:50:39 -0400 (Mon, 07 Jul 2008)
New Revision: 9424
Modified:
trunk/ui/separator/src/main/config/component/separator.xml
Log:
RF-696 - corrected descriptions for "align" (rich: mediaOutput, rich: dataTable, rich: combobox, rich: paint2D, rich: panelMenuGroup, rich: separator), "uriAttribute" (rich: mediaOutput), "fieldStyleClass" (rich: dataFilterSlider) , "frame"(rich:dataTable), "dashboardSize" (rich: virtualEarth), "mapType" (rich: gmap), "name" and "disableDefault" (rich: effect) attributes.
Modified: trunk/ui/separator/src/main/config/component/separator.xml
===================================================================
--- trunk/ui/separator/src/main/config/component/separator.xml 2008-07-07 12:49:54 UTC (rev 9423)
+++ trunk/ui/separator/src/main/config/component/separator.xml 2008-07-07 12:50:39 UTC (rev 9424)
@@ -62,11 +62,8 @@
<property>
<name>align</name>
<classname>java.lang.String</classname>
- <description>left|center|right [CI]
- This attribute specifies a position of the separator according to the document. Permitted values:
- * left: The separator is to the left of the document.
- * center: The separator is to the center of the document.
- * right: The separator is to the right of the document
+ <description>
+ This attribute specifies a position of the separator according to the document. The possible values are "left", "center" and "right". Default value is "left".
</description>
<defaultvalue>"left"</defaultvalue>
</property>
16 years, 2 months