JBoss Rich Faces SVN: r14633 - branches/community/3.3.X/ui/drag-drop/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-06-17 05:16:10 -0400 (Wed, 17 Jun 2009)
New Revision: 14633
Modified:
branches/community/3.3.X/ui/drag-drop/src/main/config/component/dragIndicator.xml
Log:
https://jira.jboss.org/jira/browse/RF-6233 - correcting the style attributes definitions;
Modified: branches/community/3.3.X/ui/drag-drop/src/main/config/component/dragIndicator.xml
===================================================================
--- branches/community/3.3.X/ui/drag-drop/src/main/config/component/dragIndicator.xml 2009-06-17 09:15:23 UTC (rev 14632)
+++ branches/community/3.3.X/ui/drag-drop/src/main/config/component/dragIndicator.xml 2009-06-17 09:16:10 UTC (rev 14633)
@@ -38,17 +38,17 @@
<property>
<name>styleClass</name>
<classname>java.lang.String</classname>
- <description>Assigns one or more CSS class names to the component. Corresponds to the HTML "class" attribute.</description>
+ <description>Assigns one or more space-separated CSS class names to the component. Corresponds to the HTML "class" attribute.</description>
</property>
<property>
<name>acceptClass</name>
<classname>java.lang.String</classname>
- <description>Assigns one or more CSS class names to the indicator which are applied when a drop is accepted</description>
+ <description>Assigns one or more space-separated CSS class names to the indicator which are applied when a drop is accepted</description>
</property>
<property>
<name>rejectClass</name>
<classname>java.lang.String</classname>
- <description>Assigns one or more CSS class names to the indicator which are applied when a drop is rejected</description>
+ <description>Assigns one or more space-separated CSS class names to the indicator which are applied when a drop is rejected</description>
</property>
</component>
</components>
15 years, 6 months
JBoss Rich Faces SVN: r14632 - branches/community/3.3.X/ui/datascroller/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-06-17 05:15:23 -0400 (Wed, 17 Jun 2009)
New Revision: 14632
Modified:
branches/community/3.3.X/ui/datascroller/src/main/config/component/datascroller.xml
Log:
https://jira.jboss.org/jira/browse/RF-6233 - correcting the style attributes definitions;
Modified: branches/community/3.3.X/ui/datascroller/src/main/config/component/datascroller.xml
===================================================================
--- branches/community/3.3.X/ui/datascroller/src/main/config/component/datascroller.xml 2009-06-17 09:15:03 UTC (rev 14631)
+++ branches/community/3.3.X/ui/datascroller/src/main/config/component/datascroller.xml 2009-06-17 09:15:23 UTC (rev 14632)
@@ -144,19 +144,19 @@
<property>
<name>selectedStyleClass</name>
<classname>java.lang.String</classname>
- <description>Assigns one or more CSS class names to the scroller selected cell
+ <description>Assigns one or more space-separated CSS class names to the scroller selected cell
</description>
</property>
<property>
<name>inactiveStyleClass</name>
<classname>java.lang.String</classname>
- <description>Assigns one or more CSS class names to the scroller inactive cells
+ <description>Assigns one or more space-separated CSS class names to the scroller inactive cells
</description>
</property>
<property>
<name>tableStyleClass</name>
<classname>java.lang.String</classname>
- <description>Assigns one or more CSS class names to the wrapper table element of the component
+ <description>Assigns one or more space-separated CSS class names to the wrapper table element of the component
</description>
</property>
<property>
@@ -169,7 +169,7 @@
<property>
<name>styleClass</name>
<classname>java.lang.String</classname>
- <description>Assigns one or more CSS class names to the component. Corresponds to the HTML "class" attribute.
+ <description>Assigns one or more space-separated CSS class names to the component. Corresponds to the HTML "class" attribute.
</description>
</property>
15 years, 6 months
JBoss Rich Faces SVN: r14631 - branches/community/3.3.X/ui/dataFilterSlider/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-06-17 05:15:03 -0400 (Wed, 17 Jun 2009)
New Revision: 14631
Modified:
branches/community/3.3.X/ui/dataFilterSlider/src/main/config/component/dataFilterSlider.xml
Log:
https://jira.jboss.org/jira/browse/RF-6233 - correcting the style attributes definitions;
Modified: branches/community/3.3.X/ui/dataFilterSlider/src/main/config/component/dataFilterSlider.xml
===================================================================
--- branches/community/3.3.X/ui/dataFilterSlider/src/main/config/component/dataFilterSlider.xml 2009-06-17 09:14:41 UTC (rev 14630)
+++ branches/community/3.3.X/ui/dataFilterSlider/src/main/config/component/dataFilterSlider.xml 2009-06-17 09:15:03 UTC (rev 14631)
@@ -82,14 +82,14 @@
<name>styleClass</name>
<classname>java.lang.String</classname>
<description>
- Assigns one or more CSS class names to the container surrounding the component. Corresponds to the HTML "class" attribute.
+ Assigns one or more space-separated CSS class names to the container surrounding the component. Corresponds to the HTML "class" attribute.
</description>
</property>
<property>
<name>fieldStyleClass</name>
<classname>java.lang.String</classname>
<description>
- Assigns one or more CSS class names to the component input field. The value of the "manualInput" attribute must
+ Assigns one or more space-separated CSS class names to the component input field. The value of the "manualInput" attribute must
be "true".
</description>
</property>
@@ -97,28 +97,28 @@
<name>handleStyleClass</name>
<classname>java.lang.String</classname>
<description>
- Assigns one or more CSS class names to the component handle
+ Assigns one or more space-separated CSS class names to the component handle
</description>
</property>
<property>
<name>trailerStyleClass</name>
<classname>java.lang.String</classname>
<description>
- Assigns one or more CSS class names to the trailer following the component handle
+ Assigns one or more space-separated CSS class names to the trailer following the component handle
</description>
</property>
<property>
<name>trackStyleClass</name>
<classname>java.lang.String</classname>
<description>
- Assigns one or more CSS class names to the component track
+ Assigns one or more space-separated CSS class names to the component track
</description>
</property>
<property>
<name>rangeStyleClass</name>
<classname>java.lang.String</classname>
<description>
- Assigns one or more CSS class names to the background div element wrapping a full range
+ Assigns one or more space-separated CSS class names to the background div element wrapping a full range
</description>
</property>
<property>
15 years, 6 months
JBoss Rich Faces SVN: r14630 - branches/community/3.3.X/ui/core/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-06-17 05:14:41 -0400 (Wed, 17 Jun 2009)
New Revision: 14630
Modified:
branches/community/3.3.X/ui/core/src/main/config/component/status.xml
Log:
https://jira.jboss.org/jira/browse/RF-6233 - correcting the style attributes definitions;
Modified: branches/community/3.3.X/ui/core/src/main/config/component/status.xml
===================================================================
--- branches/community/3.3.X/ui/core/src/main/config/component/status.xml 2009-06-16 16:22:11 UTC (rev 14629)
+++ branches/community/3.3.X/ui/core/src/main/config/component/status.xml 2009-06-17 09:14:41 UTC (rev 14630)
@@ -143,14 +143,14 @@
<name>startStyleClass</name>
<classname>java.lang.String</classname>
<description>
- Assigns one or more CSS class names to the element displayed when a request is in progress
+ Assigns one or more space-separated CSS class names to the element displayed when a request is in progress
</description>
</property>
<property>
<name>stopStyleClass</name>
<classname>java.lang.String</classname>
<description>
- Assigns one or more CSS class names to the element displayed on a request completion
+ Assigns one or more space-separated CSS class names to the element displayed on a request completion
</description>
</property>
<property>
15 years, 6 months
JBoss Rich Faces SVN: r14629 - in branches/community/3.3.X/ui/fileUpload/src: main/resources/org/richfaces/renderkit/html/js and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-06-16 12:22:11 -0400 (Tue, 16 Jun 2009)
New Revision: 14629
Modified:
branches/community/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java
branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
branches/community/3.3.X/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
branches/community/3.3.X/ui/fileUpload/src/test/java/org/richfaces/component/FileUploadComponentTest.java
Log:
RF-7370
Modified: branches/community/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java
===================================================================
--- branches/community/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2009-06-16 15:31:04 UTC (rev 14628)
+++ branches/community/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2009-06-16 16:22:11 UTC (rev 14629)
@@ -486,12 +486,9 @@
for (String type : types) {
accepted.put(type.toLowerCase(), true);
}
- return ScriptUtils.toScript(accepted);
}
- }else {
- accepted.put("*", true);
}
- return ScriptUtils.toScript(accepted);
+ return accepted;
}
/**
@@ -575,7 +572,7 @@
}
return (result != null) ? new JSLiteral(result.toString())
- : JSReference.NULL;
+ : null;
}
/**
@@ -715,7 +712,7 @@
parameters.putAll(commonAjaxParameters);
}
- return ((parameters.size() > 0) ? ScriptUtils.toScript(parameters) : JSReference.NULL);
+ return parameters;
}
public String getSessionId(FacesContext context, UIComponent component) {
Modified: branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
===================================================================
--- branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2009-06-16 15:31:04 UTC (rev 14628)
+++ branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2009-06-16 16:22:11 UTC (rev 14629)
@@ -418,56 +418,102 @@
options: null,
runUpload: false,
-
- classes: null,
-
- events: null,
- maxFileBatchSize: null,
+ maxFileBatchSize: 1,
uploadedCount: 0,
-
- initialize: function(id, formId, actionUrl, stopScript, getFileSizeScript, progressBarId, classes, label, maxFiles, events, disabled, acceptedTypes, options, labels, parameters, sessionId) {
+
+ acceptedTypes: {"*" : true},
+
+ initialize: function(id, actionUrl, stopScript, getFileSizeScript, progressBarId, sessionId, options) {
+ //default values of classes
+ this.classes = {
+ ADD : {
+ ENABLED : 'rich-fileupload-button rich-fileupload-font ',
+ DISABLED : 'rich-fileupload-button-dis rich-file-upload-font '
+ },
+ ADD_CONTENT : {
+ ENABLED : 'rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-add ',
+ DISABLED : 'rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-add-dis '
+ },
+ UPDATE : {
+ ENABLED : 'rich-fileupload-button rich-fileupload-font ',
+ DISABLED : 'rich-fileupload-button-dis rich-fileupload-font '
+ },
+ UPDATE_CONTENT : {
+ ENABLED : 'rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-start ',
+ DISABLED : 'rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-start-dis '
+ },
+ STOP : {
+ ENABLED : 'rich-fileupload-button rich-fileupload-font ',
+ DISABLED : 'rich-fileupload-button-dis rich-fileupload-font '
+ },
+ STOP_CONTENT : {
+ ENABLED : 'rich-fileupload-button-content rich-file-upload-font rich-fileupload-ico rich-fileupload-ico-stop ',
+ DISABLED : 'rich-fileupload-button-content rich-file-upload-font rich-fileupload-ico rich-fileupload-ico-stop-dis '
+ },
+ CLEAN : {
+ ENABLED : 'rich-fileupload-button rich-fileupload-font ',
+ DISABLED : 'rich-fileupload-button-dis rich-fileupload-font '
+ },
+ CLEAN_CONTENT : {
+ ENABLED : 'rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-clear ',
+ DISABLED : 'rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-clear-dis '
+ },
+ FILE_ENTRY : {
+ ENABLED : '',
+ DISABLED : ''
+ },
+ FILE_ENTRY_CONTROL : {
+ ENABLED : '',
+ DISABLED : ''
+ },
+ UPLOAD_LIST : {
+ ENABLED : '',
+ DISABLED : ''
+ }
+ };
+ this.events = {};
+ this.options = {};
+
+ var classes = options.classes;
+ for (var obj in classes) {
+ var value = classes[obj];
+ for (var property in value) {
+ this.classes[obj][property] += value[property];
+ if (this.classes[obj + "_CONTENT"]) {
+ this.classes[obj + "_CONTENT"][property] += value[property];
+ }
+ }
+ }
+ Object.extend(this, options.fields);
+
this.id = id;
this.element = $(this.id);
- if (formId != '') {
- this.formId = formId;
- this.form = $(formId);
- }else {
- var f = this._getForm();
- this.formId = (f) ? f.id : null;
- this.form = f;
- }
+ var f = this.element.up("form");
+ this.formId = (f) ? f.id : null;
+ this.form = f;
this._progressBar = $(progressBarId);
this.progressBar = this._progressBar.component;
this.entries = new Array();
- this.labelMarkup = label;
- this.disabled = disabled;
-
this.element.component = this;
- this.acceptedTypes = acceptedTypes;
-
this.stopScript = stopScript;
this.getFileSizeScript = getFileSizeScript;
this.items = $(this.id + ":fileItems");
- this.classes = classes;
- this.events = events;
- this.parameters = parameters;
this.sessionId = sessionId;
- this.maxFileBatchSize = maxFiles;
this.currentInput = $(this.id + ":file");
this.actionUrl = actionUrl;
- this.options = options || {};
+ this.options = {allowFlash : "false"};
this.initFlashModule();
this.initEvents();
this.setupAutoUpload();
this.checkFrame();
//this.initFileEntryWidth();
- this.initLabels(labels);
+ this.initLabels(options.labels);
this.processButtons();
this.initFileInput();
},
@@ -645,7 +691,7 @@
},
setupAutoUpload: function() {
- this.runUpload = this.options.autoUpload;
+ this.runUpload = this.options.immediateUpload;
},
checkFileType: function (fileName) {
Modified: branches/community/3.3.X/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
===================================================================
--- branches/community/3.3.X/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2009-06-16 15:31:04 UTC (rev 14628)
+++ branches/community/3.3.X/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2009-06-16 16:22:11 UTC (rev 14629)
@@ -139,67 +139,67 @@
</jsp:scriptlet>
<span>
+ <c:scriptObject var="ADD">
+ <c:scriptOption name="ENABLED" value="#{component.attributes['addButtonClass']}" />
+ <c:scriptOption name="DISABLED" value="#{component.attributes['addButtonClassDisabled']}" />
+ </c:scriptObject>
+ <c:scriptObject var="UPDATE">
+ <c:scriptOption name="ENABLED" value="#{component.attributes['uploadButtonClass']}" />
+ <c:scriptOption name="DISABLED" value="#{component.attributes['uploadButtonClassDisabled']}" />
+ </c:scriptObject>
+ <c:scriptObject var="STOP">
+ <c:scriptOption name="ENABLED" value="#{component.attributes['stopButtonClass']}" />
+ <c:scriptOption name="DISABLED" value="#{component.attributes['stopButtonClassDisabled']}" />
+ </c:scriptObject>
+ <c:scriptObject var="CLEAN">
+ <c:scriptOption name="ENABLED" value="#{component.attributes['cleanButtonClass']}" />
+ <c:scriptOption name="DISABLED" value="#{component.attributes['cleanButtonClassDisabled']}" />
+ </c:scriptObject>
+ <c:scriptObject var="FILE_ENTRY">
+ <c:scriptOption name="ENABLED" value="#{component.attributes['fileEntryClass']}" />
+ <c:scriptOption name="DISABLED" value="#{component.attributes['fileEntryClassDisabled']}" />
+ </c:scriptObject>
+ <c:scriptObject var="FILE_ENTRY_CONTROL">
+ <c:scriptOption name="ENABLED" value="#{component.attributes['fileEntryControlClass']}" />
+ <c:scriptOption name="DISABLED" value="#{component.attributes['fileEntryControlClassDisabled']}" />
+ </c:scriptObject>
+ <c:scriptObject var="UPLOAD_LIST">
+ <c:scriptOption name="ENABLED" value="#{component.attributes['uploadListClass']}" />
+ <c:scriptOption name="DISABLED" value="#{component.attributes['uploadListClassDisabled']}" />
+ </c:scriptObject>
+ <c:scriptObject var="classes">
+ <c:scriptOption variables="ADD, UPDATE, STOP, CLEAN, FILE_ENTRY, FILE_ENTRY_CONTROL, UPLOAD_LIST" />
+ </c:scriptObject>
+ <c:scriptObject var="events">
+ <c:scriptOption attributes="onupload, onuploadcomplete, onuploadcanceled, onerror, ontyperejected, onsizerejected, onclear, onadd, onfileuploadcomplete" wrapper="eventHandler"/>
+ </c:scriptObject>
+ <c:scriptObject var="internalOptions">
+ <c:scriptOption attributes="autoclear, noDuplicate, immediateUpload" />
+ <c:scriptOption name="allowFlash" value="#{allowFlash}" defaultValue="false" />
+ <c:scriptOption name="flashComponentUrl" value="#{flashComponent}" />
+ </c:scriptObject>
+ <c:scriptObject var="fields">
+ <c:scriptOption name="labelMarkup" value="#{this:getLabelMarkup(context, component)}" />
+ <c:scriptOption name="maxFileBatchSize" value="#{maxCount}" defaultValue="1" />
+ <c:scriptOption attributes="disabled" />
+ <c:scriptOption name="maxFileBatchSize" value="#{maxCount}" defaultValue="1" />
+ <c:scriptOption name="acceptedTypes" value="#{this:getAcceptedTypes(context, component)}" />
+ <c:scriptOption variables="events" />
+ <c:scriptOption name="options" value="#{internalOptions}" />
+ <c:scriptOption name="parameters" value="#{this:getChildrenParams(context, component)}" />
+ </c:scriptObject>
+ <c:scriptObject var="options">
+ <c:scriptOption variables="classes, fields" />
+ <c:scriptOption name="labels" value="#{labels}" />
+ </c:scriptObject>
<script type="text/javascript">
- FileUpload.CLASSES = {
- ADD : {
- ENABLED : 'rich-fileupload-button rich-fileupload-font #{component.attributes["addButtonClass"]}',
- DISABLED : 'rich-fileupload-button-dis rich-file-upload-font #{component.attributes["addButtonClassDisabled"]}'
- },
- ADD_CONTENT : {
- ENABLED : 'rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-add #{component.attributes["addButtonClass"]}',
- DISABLED : 'rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-add-dis #{component.attributes["addButtonClassDisabled"]}'
- },
- UPDATE : {
- ENABLED : 'rich-fileupload-button rich-fileupload-font #{component.attributes["uploadButtonClass"]}',
- DISABLED : 'rich-fileupload-button-dis rich-fileupload-font #{component.attributes["uploadButtonClassDisabled"]}'
- },
- UPDATE_CONTENT : {
- ENABLED : 'rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-start #{component.attributes["uploadButtonClass"]}',
- DISABLED : 'rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-start-dis #{component.attributes["uploadButtonClassDisabled"]}'
- },
- STOP : {
- ENABLED : 'rich-fileupload-button rich-fileupload-font #{component.attributes["stopButtonClass"]}',
- DISABLED : 'rich-fileupload-button-dis rich-fileupload-font #{component.attributes["stopButtonClassDisabled"]}'
- },
- STOP_CONTENT : {
- ENABLED : 'rich-fileupload-button-content rich-file-upload-font rich-fileupload-ico rich-fileupload-ico-stop #{component.attributes["stopButtonClass"]}',
- DISABLED : 'rich-fileupload-button-content rich-file-upload-font rich-fileupload-ico rich-fileupload-ico-stop-dis #{component.attributes["stopButtonClassDisabled"]}'
- },
- CLEAN : {
- ENABLED : 'rich-fileupload-button rich-fileupload-font #{component.attributes["cleanButtonClass"]}',
- DISABLED : 'rich-fileupload-button-dis rich-fileupload-font #{component.attributes["cleanButtonClassDisabled"]}'
- },
- CLEAN_CONTENT : {
- ENABLED : 'rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-clear #{component.attributes["cleanButtonClass"]}',
- DISABLED : 'rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-clear-dis #{component.attributes["cleanButtonClassDisabled"]}'
- },
- FILE_ENTRY : {
- ENABLED : '#{component.attributes["fileEntryClass"]}',
- DISABLED : '#{component.attributes["fileEntryClassDisabled"]}'
- },
- FILE_ENTRY_CONTROL : {
- ENABLED : '#{component.attributes["fileEntryControlClass"]}',
- DISABLED : '#{component.attributes["fileEntryControlClassDisabled"]}'
- },
- UPLOAD_LIST : {
- ENABLED : '#{component.attributes["uploadListClass"]}',
- DISABLED : '#{component.attributes["uploadListClassDisabled"]}'
- }
- };
-
- var events = {
- onupload : #{this:getAsEventHandler(context, component, "onupload")},
- onuploadcomplete : #{this:getAsEventHandler(context, component, "onuploadcomplete")},
- onuploadcanceled : #{this:getAsEventHandler(context, component, "onuploadcanceled")},
- onerror : #{this:getAsEventHandler(context, component, "onerror")},
- ontyperejected : #{this:getAsEventHandler(context, component, "ontyperejected")},
- onsizerejected : #{this:getAsEventHandler(context, component, "onsizerejected")},
- onclear : #{this:getAsEventHandler(context, component, "onclear")},
- onadd : #{this:getAsEventHandler(context, component, "onadd")},
- onfileuploadcomplete : #{this:getAsEventHandler(context, component, "onfileuploadcomplete")}
- };
-
- new FileUpload('#{clientId}','#{formId}','#{actionUrl}',#{this:getStopScript(context, component)}, #{this:getFileSizeScript(context, component)} ,'#{this:getProgressBarId(context, component)}', FileUpload.CLASSES, #{this:getLabelMarkup(context, component)}, #{maxCount}, events, #{component.attributes["disabled"]}, #{this:getAcceptedTypes(context, component)}, {'autoclear':#{component.attributes["autoclear"]},'autoUpload':#{component.attributes["immediateUpload"]},'noDuplicate':#{component.attributes["noDuplicate"]}, 'allowFlash':'#{allowFlash}', 'flashComponentUrl':'#{flashComponent}'},#{this:_getLabels(labels)},#{this:getChildrenParams(context, component)},'#{this:getSessionId(context, component)}');
+ new FileUpload('#{clientId}','#{actionUrl}',#{this:getStopScript(context, component)},
+ #{this:getFileSizeScript(context, component)} ,'#{this:getProgressBarId(context, component)}',
+ '#{this:getSessionId(context, component)}'
+ <c:if test="#{not empty options}">
+ , <f:writeAsScript value="#{options}" />
+ </c:if>
+ );
</script>
</span>
<f:call name="utils.encodeEndFormIfNessesary" />
Modified: branches/community/3.3.X/ui/fileUpload/src/test/java/org/richfaces/component/FileUploadComponentTest.java
===================================================================
--- branches/community/3.3.X/ui/fileUpload/src/test/java/org/richfaces/component/FileUploadComponentTest.java 2009-06-16 15:31:04 UTC (rev 14628)
+++ branches/community/3.3.X/ui/fileUpload/src/test/java/org/richfaces/component/FileUploadComponentTest.java 2009-06-16 16:22:11 UTC (rev 14629)
@@ -109,7 +109,6 @@
assertTrue(scriptBodyString.contains("image/jpeg"));
assertTrue(scriptBodyString.contains("video/mpeg"));
assertFalse(scriptBodyString.contains("image/png"));
- assertTrue(scriptBodyString.contains("FileUpload.CLASSES"));
}
}
}
15 years, 6 months
JBoss Rich Faces SVN: r14628 - branches/community/3.3.X/ui/menu-components/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-06-16 11:31:04 -0400 (Tue, 16 Jun 2009)
New Revision: 14628
Modified:
branches/community/3.3.X/ui/menu-components/src/main/config/component/menucomponents.xml
Log:
https://jira.jboss.org/jira/browse/RF-6233 - unification of style attributes descriptions;
Modified: branches/community/3.3.X/ui/menu-components/src/main/config/component/menucomponents.xml
===================================================================
--- branches/community/3.3.X/ui/menu-components/src/main/config/component/menucomponents.xml 2009-06-16 15:30:11 UTC (rev 14627)
+++ branches/community/3.3.X/ui/menu-components/src/main/config/component/menucomponents.xml 2009-06-16 15:31:04 UTC (rev 14628)
@@ -123,27 +123,27 @@
<property>
<name>selectStyle</name>
<classname>java.lang.String</classname>
- <description>CSS style rules to be applied to selected items</description>
+ <description>Holds a fragment of a style sheet that applies to the component selected items</description>
</property>
<property>
<name>selectClass</name>
<classname>java.lang.String</classname>
- <description>Class to be applied to selected items</description>
+ <description>Assigns one or more space-separated CSS class names to the component selected items</description>
</property>
<property>
<name>iconStyle</name>
<classname>java.lang.String</classname>
- <description>CSS style rules to be applied to icon element</description>
+ <description>Holds a fragment of a style sheet that applies to the component icon element</description>
</property>
<property>
<name>iconClass</name>
<classname>java.lang.String</classname>
- <description>Class to be applied to icon element</description>
+ <description>Assigns one or more space-separated CSS class names to the component icon element</description>
</property>
<property>
<name>labelClass</name>
<classname>java.lang.String</classname>
- <description>Class to be applied to label element</description>
+ <description>Assigns one or more space-separated CSS class names to the component label element</description>
</property>
<property>
<name>converter</name>
@@ -268,27 +268,27 @@
<property>
<name>selectClass</name>
<classname>java.lang.String</classname>
- <description>Class to be applied to selected items</description>
+ <description>Assigns one or more CSS class names to the selected item</description>
</property>
<property>
<name>selectStyle</name>
<classname>java.lang.String</classname>
- <description>CSS style rules to be applied to selected items</description>
+ <description>Holds a fragment of a style sheet that applies to the selected item</description>
</property>
<property>
<name>iconClass</name>
<classname>java.lang.String</classname>
- <description>Class to be applied to icon element</description>
+ <description>Assigns one or more space-separated CSS class names to the component icon element</description>
</property>
<property>
<name>iconStyle</name>
<classname>java.lang.String</classname>
- <description>CSS style rules to be applied to icon element</description>
+ <description>Holds a fragment of a style sheet that applies to the component icon element</description>
</property>
<property>
<name>labelClass</name>
<classname>java.lang.String</classname>
- <description>Class to be applied to label element</description>
+ <description>Assigns one or more space-separated CSS class names to the component label element</description>
</property>
&ajax_component_attributes;
15 years, 6 months
JBoss Rich Faces SVN: r14627 - branches/community/3.3.X/ui/dropdown-menu/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-06-16 11:30:11 -0400 (Tue, 16 Jun 2009)
New Revision: 14627
Modified:
branches/community/3.3.X/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml
Log:
https://jira.jboss.org/jira/browse/RF-6233 - unification of style attributes descriptions;
Modified: branches/community/3.3.X/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml
===================================================================
--- branches/community/3.3.X/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml 2009-06-16 15:29:23 UTC (rev 14626)
+++ branches/community/3.3.X/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml 2009-06-16 15:30:11 UTC (rev 14627)
@@ -158,7 +158,7 @@
<name>selectItemStyle</name>
<classname>java.lang.String</classname>
<description>
- CSS style(s) is/are to be applied to selected item when this component is rendered.
+ Holds a fragment of a style sheet that applies to the component selected item
</description>
</property>
@@ -166,7 +166,7 @@
<name>selectItemClass</name>
<classname>java.lang.String</classname>
<description>
- Space-separated list of CSS style class(es) that are be applied to selected item of this component.
+ Assigns one or more space-separated CSS class names to the component selected item
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
@@ -175,7 +175,7 @@
<name>disabledItemStyle</name>
<classname>java.lang.String</classname>
<description>
- CSS style(s) is/are to be applied to disabled item when this component is rendered.
+ Holds a fragment of a style sheet that applies to the component disabled item
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
@@ -184,7 +184,7 @@
<name>disabledItemClass</name>
<classname>java.lang.String</classname>
<description>
- Space-separated list of CSS style class(es) that are be applied to disabled item of this component
+ Assigns one or more space-separated CSS class names to the component disabled item
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
@@ -193,7 +193,7 @@
<name>disabledLabelClass</name>
<classname>java.lang.String</classname>
<description>
- Space-separated list of CSS style class(es) applied to dropdown menu label when it is disabled.
+ Assigns one or more space-separated CSS class names to the component label when it is disabled
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
@@ -201,7 +201,7 @@
<name>selectedLabelClass</name>
<classname>java.lang.String</classname>
<description>
- Space-separated list of CSS style class(es) applied to dropdown menu label when it is selected.
+ Assigns one or more space-separated CSS class names to the component label when it is selected
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
@@ -210,7 +210,7 @@
<name>labelClass</name>
<classname>java.lang.String</classname>
<description>
- Space-separated list of CSS style class(es) applied to dropdown menu label in it normal (neither selected nor disabled) sate.
+ Assigns one or more space-separated CSS class names to the component label
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
@@ -219,7 +219,7 @@
<name>itemStyle</name>
<classname>java.lang.String</classname>
<description>
- CSS style(s) is/are to be applied to item when this component is rendered.
+ Holds a fragment of a style sheet that applies to the component item
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
@@ -228,7 +228,7 @@
<name>itemClass</name>
<classname>java.lang.String</classname>
<description>
- Space-separated list of CSS style class(es) that are be applied to item of this component
+ Assigns one or more space-separated CSS class names to the component item
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
15 years, 6 months
JBoss Rich Faces SVN: r14626 - branches/community/3.3.X/ui/contextMenu/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-06-16 11:29:23 -0400 (Tue, 16 Jun 2009)
New Revision: 14626
Modified:
branches/community/3.3.X/ui/contextMenu/src/main/config/component/contextMenu.xml
Log:
https://jira.jboss.org/jira/browse/RF-6233 - unification of style attributes descriptions;
Modified: branches/community/3.3.X/ui/contextMenu/src/main/config/component/contextMenu.xml
===================================================================
--- branches/community/3.3.X/ui/contextMenu/src/main/config/component/contextMenu.xml 2009-06-16 15:27:53 UTC (rev 14625)
+++ branches/community/3.3.X/ui/contextMenu/src/main/config/component/contextMenu.xml 2009-06-16 15:29:23 UTC (rev 14626)
@@ -161,7 +161,7 @@
<name>selectItemStyle</name>
<classname>java.lang.String</classname>
<description>
- CSS style(s) is/are to be applied to selected item when this component is rendered.
+ Holds a fragment of a style sheet that applies to the component selected item
</description>
</property>
@@ -169,7 +169,7 @@
<name>selectItemClass</name>
<classname>java.lang.String</classname>
<description>
- Space-separated list of CSS style class(es) that are be applied to selected item of this component.
+ Assigns one or more space-separated CSS class names to the component selected item
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
@@ -178,7 +178,7 @@
<name>disabledItemStyle</name>
<classname>java.lang.String</classname>
<description>
- CSS style(s) is/are to be applied to disabled item when this component is rendered.
+ Holds a fragment of a style sheet that applies to the component disabled item
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
@@ -187,7 +187,7 @@
<name>disabledItemClass</name>
<classname>java.lang.String</classname>
<description>
- Space-separated list of CSS style class(es) that are be applied to disabled item of this component
+ Assigns one or more space-separated CSS class names to the component disabled item
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
@@ -196,7 +196,7 @@
<name>itemStyle</name>
<classname>java.lang.String</classname>
<description>
- CSS style(s) is/are to be applied to item when this component is rendered.
+ Holds a fragment of a style sheet that applies to the component item
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
@@ -205,7 +205,7 @@
<name>itemClass</name>
<classname>java.lang.String</classname>
<description>
- Space-separated list of CSS style class(es) that are be applied to item of this component
+ Assigns one or more space-separated CSS class names to the component item
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
15 years, 6 months
JBoss Rich Faces SVN: r14625 - branches/community/3.3.X/ui/tree/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-06-16 11:27:53 -0400 (Tue, 16 Jun 2009)
New Revision: 14625
Modified:
branches/community/3.3.X/ui/tree/src/main/config/component/commonTreeAttributes.ent
branches/community/3.3.X/ui/tree/src/main/config/component/treeNode.xml
Log:
https://jira.jboss.org/jira/browse/RF-6233 - unification of style attributes descriptions;
Modified: branches/community/3.3.X/ui/tree/src/main/config/component/commonTreeAttributes.ent
===================================================================
--- branches/community/3.3.X/ui/tree/src/main/config/component/commonTreeAttributes.ent 2009-06-16 15:26:18 UTC (rev 14624)
+++ branches/community/3.3.X/ui/tree/src/main/config/component/commonTreeAttributes.ent 2009-06-16 15:27:53 UTC (rev 14625)
@@ -18,12 +18,12 @@
<property>
<name>selectedClass</name>
<classname>java.lang.String</classname>
- <description>Corresponds to the HTML class attribute. Applied to selected node</description>
+ <description>Assigns one or more CSS class names to the component selected node</description>
</property>
<property>
<name>highlightedClass</name>
<classname>java.lang.String</classname>
- <description>Corresponds to the HTML class attribute. Applied to highlighted node</description>
+ <description> Assigns one or more CSS class names to the component highlighted node</description>
</property>
<property>
<name>reRender</name>
Modified: branches/community/3.3.X/ui/tree/src/main/config/component/treeNode.xml
===================================================================
--- branches/community/3.3.X/ui/tree/src/main/config/component/treeNode.xml 2009-06-16 15:26:18 UTC (rev 14624)
+++ branches/community/3.3.X/ui/tree/src/main/config/component/treeNode.xml 2009-06-16 15:27:53 UTC (rev 14625)
@@ -162,7 +162,7 @@
<property>
<name>nodeClass</name>
<classname>java.lang.String</classname>
- <description>Name of node CSS class</description>
+ <description> Assigns one or more CSS class names to the component node</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
15 years, 6 months
JBoss Rich Faces SVN: r14624 - branches/community/3.3.X/ui/drag-drop/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-06-16 11:26:18 -0400 (Tue, 16 Jun 2009)
New Revision: 14624
Modified:
branches/community/3.3.X/ui/drag-drop/src/main/config/component/dragIndicator.xml
Log:
https://jira.jboss.org/jira/browse/RF-6233 - unification of style attributes descriptions;
Modified: branches/community/3.3.X/ui/drag-drop/src/main/config/component/dragIndicator.xml
===================================================================
--- branches/community/3.3.X/ui/drag-drop/src/main/config/component/dragIndicator.xml 2009-06-16 15:25:49 UTC (rev 14623)
+++ branches/community/3.3.X/ui/drag-drop/src/main/config/component/dragIndicator.xml 2009-06-16 15:26:18 UTC (rev 14624)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd
">
<components>
@@ -38,17 +38,17 @@
<property>
<name>styleClass</name>
<classname>java.lang.String</classname>
- <description>Corresponds to the HTML class attribute</description>
+ <description>Assigns one or more CSS class names to the component. Corresponds to the HTML "class" attribute.</description>
</property>
<property>
<name>acceptClass</name>
<classname>java.lang.String</classname>
- <description>Corresponds to the HTML class attribute and added to an indicator when a drop is accepted</description>
+ <description>Assigns one or more CSS class names to the indicator which are applied when a drop is accepted</description>
</property>
<property>
<name>rejectClass</name>
<classname>java.lang.String</classname>
- <description>Corresponds to the HTML class attribute and added to an indicator when a drop is rejected</description>
+ <description>Assigns one or more CSS class names to the indicator which are applied when a drop is rejected</description>
</property>
</component>
</components>
15 years, 6 months