JBoss Rich Faces SVN: r9220 - trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-06-25 09:47:54 -0400 (Wed, 25 Jun 2008)
New Revision: 9220
Modified:
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
Log:
add detailed file info to JS API (only for flesh)
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-06-25 13:47:40 UTC (rev 9219)
+++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-06-25 13:47:54 UTC (rev 9220)
@@ -122,10 +122,16 @@
state: FileUploadEntry.INITIALIZED,
- initialize: function(fileInput, uploadObject) {
+ initialize: function(fileInput, uploadObject, size, type, creator, creationDate, modificationDate) {
this.fileInput = fileInput;
this.uploadObject = uploadObject;
+ this.size = size;
+ this.type = type;
+ this.creator = creator;
+ this.creationDate = creationDate;
+ this.modificationDate = modificationDate;
+
var fileName = JSNode.prototype.xmlEscape($F(this.fileInput));
this.fileName = fileName;
var content = FileUploadEntry.template.invoke('getContent', {fileName: fileName, fileEntryWidth: uploadObject.getFileEntryWidth(), className : this.uploadObject.classes.FILE_ENTRY.ENABLED }).join('');
@@ -1097,9 +1103,10 @@
var filesArray = [];
for (var i=this.entries.length; i<files.length;i++)
{
+ var file = files[i];
this.currentInput.value = files[i].name;
this.createFrame();
- var newEntry = new FileUploadEntry(this.currentInput, this);
+ var newEntry = new FileUploadEntry(this.currentInput, this, file.size, file.type, file.creator, file.creationDate, file.modificationDate);
this.entries.push(newEntry);
filesArray.push(newEntry);
17 years, 3 months
JBoss Rich Faces SVN: r9219 - trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable.
by richfaces-svn-commits＠lists.jboss.org
Author: pkawiak
Date: 2008-06-25 09:47:40 -0400 (Wed, 25 Jun 2008)
New Revision: 9219
Modified:
trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js
Log:
Fixes concerning rendering caption
Modified: trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js
===================================================================
--- trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js 2008-06-25 13:33:07 UTC (rev 9218)
+++ trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js 2008-06-25 13:47:40 UTC (rev 9219)
@@ -276,7 +276,12 @@
cols[columnsNumber-1].width = null;
cols[cols.length-1].width = null;
}
- scrollingDiv.setStyle('height:'+(mainDivHeight - header.getHeight() - footerHeight - 2) +'px;');
+ var newHeight = mainDivHeight - header.getHeight() - footerHeight - 2;
+ var captions = this.table.getElement().getElementsByTagName('caption');
+ if (captions.length > 0) {
+ newHeight -= captions[0].offsetHeight;
+ }
+ scrollingDiv.setStyle('height:'+ newHeight +'px;');
for (var i=0; i<headerChildren.length-1; i++) {
var headerChild = headerChildren[i];
var isSortable = headerChild.getAttribute('sortable');
17 years, 3 months
JBoss Rich Faces SVN: r9218 - trunk/test-applications/seleniumTest/src/main/webapp/layout.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2008-06-25 09:33:07 -0400 (Wed, 25 Jun 2008)
New Revision: 9218
Modified:
trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml
Log:
Add contentType for correct XPath working
Modified: trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml 2008-06-25 13:15:09 UTC (rev 9217)
+++ trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml 2008-06-25 13:33:07 UTC (rev 9218)
@@ -5,6 +5,7 @@
xmlns:rich="http://richfaces.org/rich"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets">
+<f:view contentType="text/html">
<head>
<a4j:loadScript src="resource:///org/ajax4jsf/javascript/scripts/AJAX.js"></a4j:loadScript>
<script>
@@ -59,7 +60,6 @@
<ui:insert name="style"/>
</style>
</head>
-<f:view>
<body>
<div style="padding: 10px; font-size: 24px;">Rich faces component testing by Selenium</div><br/>
17 years, 3 months
JBoss Rich Faces SVN: r9217 - trunk/samples/tree-demo/src/main/java/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: dmorozov
Date: 2008-06-25 09:15:09 -0400 (Wed, 25 Jun 2008)
New Revision: 9217
Modified:
trunk/samples/tree-demo/src/main/java/org/richfaces/TreeDndBean.java
Log:
http://jira.jboss.com/jira/browse/RF-3785
Modified: trunk/samples/tree-demo/src/main/java/org/richfaces/TreeDndBean.java
===================================================================
--- trunk/samples/tree-demo/src/main/java/org/richfaces/TreeDndBean.java 2008-06-25 13:06:58 UTC (rev 9216)
+++ trunk/samples/tree-demo/src/main/java/org/richfaces/TreeDndBean.java 2008-06-25 13:15:09 UTC (rev 9217)
@@ -110,6 +110,7 @@
public void processLSelection(NodeSelectedEvent event) {
UITree tree = (UITree) event.getComponent();
leftSelectedNodeTitle = (String) tree.getRowData();
+ System.out.println("OnSelect LEFT tree: " + leftSelectedNodeTitle);
}
/**
@@ -120,6 +121,7 @@
UITree tree = (UITree) event.getComponent();
if (tree != null) {
rightSelectedNodeTitle = (String) tree.getRowData();
+ System.out.println("OnSelect RIGHT tree: " + rightSelectedNodeTitle);
}
}
@@ -280,11 +282,19 @@
UITreeNode srcNode = (dropEvent.getDraggableSource() instanceof UITreeNode) ? (UITreeNode) dropEvent.getDraggableSource() : null;
UITree srcTree = srcNode != null ? srcNode.getUITree() : null;
TreeRowKey dragNodeKey = (dropEvent.getDragValue() instanceof TreeRowKey) ? (TreeRowKey) dropEvent.getDragValue() : null;
+ TreeNode draggedNode = dragNodeKey != null ? srcTree.getTreeNode(dragNodeKey) : null;
// resolve drag destination attributes
UITreeNode destNode = (dropEvent.getSource() instanceof UITreeNode) ? (UITreeNode) dropEvent.getSource() : null;
UITree destTree = destNode != null ? destNode.getUITree() : getTree(dropEvent);
TreeRowKey dropNodeKey = (dropEvent.getDropValue() instanceof TreeRowKey) ? (TreeRowKey) dropEvent.getDropValue() : null;
+ TreeNode droppedInNode = dropNodeKey != null ? destTree.getTreeNode(dropNodeKey) : null;
+
+ // Note: check if we dropped node on to itself here
+ if (droppedInNode != null && droppedInNode.equals(draggedNode)) {
+ System.out.println("Warning: Can't drop on itself!");
+ return;
+ }
FacesContext context = FacesContext.getCurrentInstance();
@@ -293,10 +303,7 @@
destTree.addRequestKey(dropNodeKey);
Object state = null;
- TreeNode draggedNode = null;
if (dragNodeKey != null) { // Drag from this or other tree
- draggedNode = srcTree.getTreeNode(dragNodeKey);
-
TreeNode parentNode = draggedNode.getParent();
// 1. remove node from tree
state = srcTree.removeNode(dragNodeKey);
17 years, 3 months
JBoss Rich Faces SVN: r9216 - trunk/framework/impl/src/main/java/org/ajax4jsf/context.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-06-25 09:06:58 -0400 (Wed, 25 Jun 2008)
New Revision: 9216
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/context/RenderPhaseViewResourcesVisitor.java
Log:
http://jira.jboss.com/jira/browse/RF-3762
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/RenderPhaseViewResourcesVisitor.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/context/RenderPhaseViewResourcesVisitor.java 2008-06-25 11:48:15 UTC (rev 9215)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/context/RenderPhaseViewResourcesVisitor.java 2008-06-25 13:06:58 UTC (rev 9216)
@@ -45,7 +45,6 @@
private boolean processScripts;
private LinkedHashSet<String> scripts;
private LinkedHashSet<String> styles;
- // TODO remove if possible
private LinkedHashSet<String> userScripts;
private LinkedHashSet<String> userStyles;
@@ -312,6 +311,7 @@
ExternalContext externalContext = context.getExternalContext();
Map<String,Object> requestMap = externalContext.getRequestMap();
State state = (State) object;
+ state.scripts.addAll(state.userScripts);
if (state.scripts.size() > 0) {
if (log.isDebugEnabled()) {
StringBuffer buff = new StringBuffer(
17 years, 3 months
JBoss Rich Faces SVN: r9215 - trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable.
by richfaces-svn-commits＠lists.jboss.org
Author: pkawiak
Date: 2008-06-25 07:48:15 -0400 (Wed, 25 Jun 2008)
New Revision: 9215
Modified:
trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js
Log:
Hotfixes for Opera
Modified: trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js
===================================================================
--- trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js 2008-06-25 11:47:54 UTC (rev 9214)
+++ trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js 2008-06-25 11:48:15 UTC (rev 9215)
@@ -1,3 +1,6 @@
+/**
+
+*/
ExtendedDataTable.DataTable.header = Class.create(ClientUI.common.box.Box, {
// constructor
initialize: function($super, elementId, extDt) {
@@ -78,8 +81,6 @@
return this.headerRow.getHeight() + this.filterRow.getHeight();
},
OnMenuImageMouseDown: function(event) {
- ClientUILib.log(ClientUILogger.EVENT, "OnMenuImageMouseDown.");
-
var el = this.extDt._findParentElement(event, "th");
var columnId = (el) ? el.id : null;
@@ -134,23 +135,17 @@
dropSpanRight.setStyle('height:'+headerRowHeight+'px');
dropSpanRight.setStyle('width:'+(w/2)+'px');
}
- this.lastColWidth = this.getColumnWidth(this.getColumnsNumber()-1);
- ClientUILib.log(ClientUILogger.INFO,
- "[adjustSeparators] lastColWidth = "+
- this.lastColWidth+";"
- );
+ this.lastColWidth = this.extDt.getColumnWidth(this.getColumnsNumber()-1);
if (ClientUILib.isIE7){
this.lastColWidth -= 15;
}
},
OnSepClick: function(event) {
- ClientUILib.log(ClientUILogger.EVENT, "OnSepClick.");
Event.stop(event);
},
OnSepMouseDown: function(event) {
- ClientUILib.log(ClientUILogger.EVENT, "OnSepMouseDown.");
Event.stop(event);
this.dragColumnInfo = {
srcElement: Event.element(event),
@@ -160,22 +155,16 @@
originalX: 0
};
var srcElement = this.dragColumnInfo.srcElement;
- this.maxDelta = this.getColumnWidth(this.getColumnsNumber()-1);
- this.maxDelta -= this.extDt.getScrollbarWidth();
+ if (ClientUILib.isOpera) {
+ this.maxDelta = this.extDt.getColumnWidth(this.getColumnsNumber()-1);
+ ClientUILib.log(ClientUILogger.INFO, "this.maxDelta: " + this.maxDelta);
+ }else{
+ this.maxDelta = this.getColumnWidth(this.getColumnsNumber()-1);
+ ClientUILib.log(ClientUILogger.INFO, "this.maxDelta: " + this.maxDelta);
+ this.maxDelta -= this.extDt.getScrollbarWidth();
+ ClientUILib.log(ClientUILogger.INFO, "this.extDt.getScrollbarWidth() " + this.extDt.getScrollbarWidth());
+ }
this.minDelta = this.minColumnWidth - this.getColumnWidth(srcElement.columnIndex);
-// ClientUILib.log(ClientUILogger.INFO,
-// "[onSepMouseMove] minColumnWidth = "+this.minColumnWidth+";"
-// );
-// ClientUILib.log(ClientUILogger.INFO,
-// "[onSepMouseMove] minColumnWidth = "+this.minColumnWidth+";"
-// );
-// ClientUILib.log(ClientUILogger.INFO,
-// "[onSepMouseMove] columnWidth = "+this.getColumnWidth(srcElement.columnIndex+1)+";"
-// );
-// ClientUILib.log(ClientUILogger.INFO,
-// "[onSepMouseMove] mindelta = "+this.minDelta+";"
-// );
- //this.dragColumnInfo.object = this.getColumns()[srcElement.columnIndex];
Event.observe(document, 'mousemove', this.eventSepMouseMove, true);
Event.observe(document, 'mouseup', this.eventSepMouseUp, true);
},
@@ -207,7 +196,6 @@
OnSepMouseUp: function(event) {
var colsNumber = this.getColumnsNumber();
- ClientUILib.log(ClientUILogger.EVENT, "OnSepMouseUp.");
Event.stop(event);
Event.stopObserving(document, 'mousemove', this.eventSepMouseMove);
Event.stopObserving(document, 'mouseup', this.eventSepMouseUp);
@@ -264,36 +252,9 @@
if (delta > this.maxDelta) {
delta = this.maxDelta;
}
+ ClientUILib.log(ClientUILogger.INFO, "maxDelta: " + this.maxDelta);
var x = this.dragColumnInfo.originalX + delta;
var finalX = x - this.minColumnWidth - 6;
-// ClientUILib.log(ClientUILogger.INFO,
-// "[onSepMouseMove] maxDelta = "+this.maxDelta+";"
-// );
-// ClientUILib.log(ClientUILogger.INFO,
-// "[onSepMouseMove] originalX = "+this.dragColumnInfo.originalX+";"
-// );
- ClientUILib.log(ClientUILogger.INFO,
- "[onSepMouseMove] delta = "+delta+";"
- );
- ClientUILib.log(ClientUILogger.INFO,
- "[onSepMouseMove] mindelta = "+this.minDelta+";"
- );
-// ClientUILib.log(ClientUILogger.INFO,
-// "[onSepMouseMove] object.offsetWidth = "+
-// parseInt(this.dragColumnInfo.object.width)+";"
-// );
-// ClientUILib.log(ClientUILogger.INFO,
-// "[onSepMouseMove] minColumnWidth = "+minColumnWidth+";"
-// );
-// ClientUILib.log(ClientUILogger.INFO,
-// "[onSepMouseMove] x = "+x+";"
-// );
-// ClientUILib.log(ClientUILogger.INFO,
-// "[onSepMouseMove] finalX = "+finalX+";"
-// );
-// ClientUILib.log(ClientUILogger.INFO,
-// "[onSepMouseMove] ----------------------------"
-// );
this.columnSplitter.moveToX(finalX);
Event.stop(event);
}
17 years, 3 months
JBoss Rich Faces SVN: r9214 - trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable.
by richfaces-svn-commits＠lists.jboss.org
Author: pkawiak
Date: 2008-06-25 07:47:54 -0400 (Wed, 25 Jun 2008)
New Revision: 9214
Modified:
trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js
Log:
Hotfixes for Opera
Modified: trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js
===================================================================
--- trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js 2008-06-25 10:23:56 UTC (rev 9213)
+++ trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTable.js 2008-06-25 11:47:54 UTC (rev 9214)
@@ -20,7 +20,6 @@
}
this.eventContainerResize = this.OnWindowResize.bindAsEventListener(this);
this.eventGroupRowClicked = this.OnGroupRowMouseClicked.bindAsEventListener(this);
- ClientUILib.log(ClientUILogger.INFO, "[observe] resize");
Event.observe(window, "resize", this.eventContainerResize);
this.minColumnWidth = this.options.minColumnWidth;
@@ -55,13 +54,9 @@
},
OnCellMouseClicked: function(event) {
- ClientUILib.log(ClientUILogger.EVENT, "OnCellMouseClicked");
- //this.showSplashScreen();
//get column id
var el = this._findParentElement(event, "th");
var columnId = (el) ? el.id : null;
-
- ClientUILib.log(ClientUILogger.INFO, "columnId: " + columnId);
if (columnId && (columnId != "")){
this.showSplashScreen();
@@ -71,7 +66,6 @@
},
preSendAjaxRequest: function(){
- ClientUILib.log(ClientUILogger.INFO, "preSendAjaxReqest");
//remove listeners
Event.stopObserving(window, 'resize', this.eventContainerResize);
Event.stopObserving(document, 'mousemove', this.header.eventSepMouseMove);
@@ -81,19 +75,24 @@
},
showSplashScreen: function(){
- this.table.setStyle('visibility:hidden;');
- this.mainDiv.getElement().removeClassName('extdt-splscr-hddn');
- this.mainDiv.getElement().addClassName('extdt-splscr-vsbl');
+ if (ClientUILib.isOpera) {
+ this.mainDiv.setStyle({display:'none'});
+ }
+ this.table.setStyle({visibility:'hidden'});
+ this.mainDiv.getElement().removeClassName('extdt-splscr-hddn');
+ this.mainDiv.getElement().addClassName('extdt-splscr-vsbl');
},
hideSplashScreen: function(){
- this.table.setStyle('visibility:visible;');
+ if (ClientUILib.isOpera) {
+ this.mainDiv.setStyle({display:''});
+ }
+ this.table.setStyle({visibility:'visible'});
this.mainDiv.getElement().removeClassName('extdt-splscr-vsbl');
this.mainDiv.getElement().addClassName('extdt-splscr-hddn');
},
OnWindowResize: function(event) {
- ClientUILib.log(ClientUILogger.EVENT, "OnWindowResize.");
this.updateLayout();
},
getColumnsNumber: function() {
@@ -107,7 +106,6 @@
},
OnGroupRowMouseClicked: function(event) {
- ClientUILib.log(ClientUILogger.EVENT, "OnGroupRowMouseClicked.");
var groupRow = this._findParentElement(event, "tr");
var bExpanded = !(groupRow.getAttribute('expanded') == 'true');
var sExpanded = bExpanded ? 'true' : 'false';
@@ -129,6 +127,20 @@
imageDiv.setAttribute('alternatesrc', src);
},
+ getColumnWidth: function(columnNumber) {
+ if ((columnNumber < this.getColumnsNumber()) && (columnNumber >=0)) {
+ var col = this.getColumns()[columnNumber+this.getColumnsNumber()];
+ if (col.offsetWidth) {
+ return col.offsetWidth;
+ }else{
+ //cols don't have offsetWidth in Opera
+ return parseInt(col.width);
+ }
+ }else{
+ return null;
+ }
+ },
+
setGroupExpanded: function(iGroupIndex, bValue) {
var group = this.groups[iGroupIndex];
@@ -228,59 +240,43 @@
if (footers.size() > 0) {
footerHeight = footers[0].offsetHeight;
}
- ClientUILib.log(ClientUILogger.INFO,
- "[updateLayout] footerHeight = "+
- footerHeight+";"
- );
- ClientUILib.log(ClientUILogger.INFO,
- "[updateLayout] mainDivHeight = "+
- mainDivHeight+";"
- );
var columnsNumber = this.getColumnsNumber();
var visibleHeaderWidth = this.header.getVisibleWidth();
var excessWidth = this.header.getVisibleWidth() - this.mainDiv.getWidth();
- ClientUILib.log(ClientUILogger.INFO,
- "[updateLayout] getVisibleHeaderWidth() = "+
- visibleHeaderWidth+";"
- );
- ClientUILib.log(ClientUILogger.INFO,
- "[updateLayout] mainDiv.getWidth() = "+
- this.mainDiv.getWidth()+";"
- );
- ClientUILib.log(ClientUILogger.INFO,
- "[updateLayout] excessWidth1 = "+
- excessWidth+";"
- );
if (excessWidth > 0) {
var scrollbarExcess = scrollingDiv.getElement().offsetWidth - scrollingDiv.getElement().clientWidth;
excessWidth += scrollbarExcess;
this.validateColumnsWidth(cols,excessWidth);
}else{
var excessWidth = visibleHeaderWidth - scrollingDiv.getElement().clientWidth;
- ClientUILib.log(ClientUILogger.INFO,
- "[updateLayout] excessWidth2 = "+
- excessWidth+";"
- );
if (excessWidth>0) {
this.validateColumnsWidth(cols,excessWidth);
}
}
- ClientUILib.log(ClientUILogger.INFO,
- "scrollbarWidth = "+
- this.getScrollbarWidth()+";"
- );
if (ClientUILib.isOpera) {
- var newWidth = mainDivWidth - visibleHeaderWidth;
- cols[columnsNumber-1].width = newWidth;
- cols[cols.length-1].width = newWidth - this.getScrollbarWidth();
+ var _stl = headerChildren[0].getStyles().borderRightWidth;
+ _stl = parseInt(_stl.replace(/"px"/,""))*2;
+ var newWidth = mainDivWidth - visibleHeaderWidth - (this.header.getColumnsNumber()-1)*_stl;
+ cols[columnsNumber-1].width = newWidth;
+ ClientUILib.log(ClientUILogger.INFO, "_stl: " + _stl);
+ ClientUILib.log(ClientUILogger.INFO, "newWidth: " + newWidth);
+ newWidth -= this.getScrollbarWidth()-1;
+ if (newWidth <= 0) {
+ newWidth = 1;
+ }
+ cols[cols.length-1].width = newWidth;
+ ClientUILib.log(ClientUILogger.EVENT, "newWidth: " + newWidth);
+ var cols = this.header.getColumns();
+ var columnsNumber = this.header.getColumnsNumber();
+ for (var i=0; i<columnsNumber-1; i++) {
+ cols[i].width = parseInt(cols[i+columnsNumber].width) - _stl;
+ }
}else{
cols[columnsNumber-1].width = null;
cols[cols.length-1].width = null;
}
-
scrollingDiv.setStyle('height:'+(mainDivHeight - header.getHeight() - footerHeight - 2) +'px;');
-
for (var i=0; i<headerChildren.length-1; i++) {
var headerChild = headerChildren[i];
var isSortable = headerChild.getAttribute('sortable');
17 years, 3 months
JBoss Rich Faces SVN: r9213 - trunk/test-applications/jsp/src/main/webapp/FileUpload.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-06-25 06:23:56 -0400 (Wed, 25 Jun 2008)
New Revision: 9213
Modified:
trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp
Log:
-cancelButton classes
Modified: trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp 2008-06-25 10:15:20 UTC (rev 9212)
+++ trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp 2008-06-25 10:23:56 UTC (rev 9213)
@@ -28,9 +28,7 @@
onuploadcomplete="#{event.onuploadcomplete}" accesskey="y"
alt="alternative" binding="#{fileUpload.myFileUpload}"
addButtonClass="#{fileUpload.addButtonClass}"
- addButtonClassDisabled="#{fileUpload.addButtonClassDisabled}"
- cancelButtonClass="#{fileUpload.cancelButtonClass}"
- cancelButtonClassDisabled="#{fileUpload.cancelButtonClassDisabled}"
+ addButtonClassDisabled="#{fileUpload.addButtonClassDisabled}"
cleanButtonClass="#{fileUpload.cleanButtonClass}"
cleanButtonClassDisabled="#{fileUpload.cleanButtonClassDisabled}"
fileEntryClass="#{fileUpload.fileEntryClass}"
17 years, 3 months
JBoss Rich Faces SVN: r9212 - trunk/test-applications/jsp/src/main/java/hotKey.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2008-06-25 06:15:20 -0400 (Wed, 25 Jun 2008)
New Revision: 9212
Modified:
trunk/test-applications/jsp/src/main/java/hotKey/HotKey.java
Log:
Modified: trunk/test-applications/jsp/src/main/java/hotKey/HotKey.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/hotKey/HotKey.java 2008-06-25 10:15:07 UTC (rev 9211)
+++ trunk/test-applications/jsp/src/main/java/hotKey/HotKey.java 2008-06-25 10:15:20 UTC (rev 9212)
@@ -25,7 +25,7 @@
private boolean rendered = true;
private boolean disableInInput = false;
private boolean checkParent = false;
- Collection<E>
+
/**
* @return the binding
*/
17 years, 3 months
JBoss Rich Faces SVN: r9211 - in trunk/test-applications/jsp/src/main: webapp/HotKey and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2008-06-25 06:15:07 -0400 (Wed, 25 Jun 2008)
New Revision: 9211
Modified:
trunk/test-applications/jsp/src/main/java/hotKey/HotKey.java
trunk/test-applications/jsp/src/main/webapp/HotKey/HotKey.jsp
Log:
Modified: trunk/test-applications/jsp/src/main/java/hotKey/HotKey.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/hotKey/HotKey.java 2008-06-25 10:04:14 UTC (rev 9210)
+++ trunk/test-applications/jsp/src/main/java/hotKey/HotKey.java 2008-06-25 10:15:07 UTC (rev 9211)
@@ -3,6 +3,9 @@
*/
package hotKey;
+import java.util.Collection;
+import java.util.Collections;
+
import javax.faces.context.FacesContext;
import org.richfaces.component.html.HtmlHotKey;
@@ -14,15 +17,15 @@
public class HotKey {
private HtmlHotKey binding = null;
private String bindingInfo = "";
- private String handler = "alert('#{hotKey.key} is pressed; event type: ' + event.type); return false;";
+ private String handler = "alert('#{hotKey.key} is pressed')";
private String key = "alt+a";
- private String selector = "none";
- private String timing = "immediate";
+ private String selector = "";
+ private String timing = "onload";
private String type = "onkeydown";
private boolean rendered = true;
private boolean disableInInput = false;
private boolean checkParent = false;
-
+ Collection<E>
/**
* @return the binding
*/
Modified: trunk/test-applications/jsp/src/main/webapp/HotKey/HotKey.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/HotKey/HotKey.jsp 2008-06-25 10:04:14 UTC (rev 9210)
+++ trunk/test-applications/jsp/src/main/webapp/HotKey/HotKey.jsp 2008-06-25 10:15:07 UTC (rev 9211)
@@ -20,21 +20,20 @@
</h:selectOneMenu>
<h:outputText value="key"></h:outputText>
- <h:inputText value="#{hotKey.key}">
- <a4j:support reRender="hotKeyID" event="onchange"></a4j:support>
+ <h:inputText value="#{hotKey.key}" onchange="submit();">
</h:inputText>
<h:outputText value="timing"></h:outputText>
<h:selectOneMenu value="#{hotKey.timing}" onchange="submit();">
- <f:selectItem itemLabel="immediate" itemValue="immediate"/>
<f:selectItem itemLabel="onload" itemValue="onload"/>
+ <f:selectItem itemLabel="immediate" itemValue="immediate"/>
<f:selectItem itemLabel="onregistercall" itemValue="onregistercall"/>
</h:selectOneMenu>
<h:outputText value="selector"></h:outputText>
<h:selectOneMenu value="#{hotKey.selector}">
+ <f:selectItem itemLabel="" itemValue=""/>
<f:selectItem itemLabel="Button" itemValue="#commandButtonID"/>
- <f:selectItem itemLabel="none" itemValue=" "/>
<a4j:support reRender="hotKeyID" event="onchange"></a4j:support>
</h:selectOneMenu>
@@ -42,7 +41,7 @@
<h:outputText value="handler"></h:outputText>
<h:selectOneMenu value="#{hotKey.handler}" onchange="submit();">
<f:selectItem itemValue="$('formID:hotKeySubviewID:hotKeyCalendarID').component.nextYear();" itemLabel="nextYear(Calendar)"/>
- <f:selectItem itemValue="alert(#{hotKey.key}' is pressed; event type: ' + event.type); return false;" itemLabel="alert(...)"/>
+ <f:selectItem itemValue="alert('#{hotKey.key} is pressed')" itemLabel="alert(...)"/>
</h:selectOneMenu>
<h:outputText value="disableInInput"></h:outputText>
17 years, 3 months