March 2007 - richfaces-svn-commits

JBoss Rich Faces SVN: r28 - trunk/richfaces/datascroller/src/main/templates/org/richfaces.

by richfaces-svn-commits＠lists.jboss.org

Author: d.bulahov Date: 2007-03-07 05:27:57 -0500 (Wed, 07 Mar 2007) New Revision: 28 Modified: trunk/richfaces/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx Log: RFA-299 fixed Modified: trunk/richfaces/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx =================================================================== --- trunk/richfaces/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2007-03-07 09:55:45 UTC (rev 27) +++ trunk/richfaces/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2007-03-07 10:27:57 UTC (rev 28) @@ -23,8 +23,9 @@ <div id="#{clientId}" name="#{clientId}" x:passThruWithExclusions="value,name,type,id" - > - <table id="#{clientId}_table" border="0" cellpadding="0" cellspacing="1" class="dr-dscr-t rich-dtascroller-table #{component.attributes['tableStyleClass']}"> + class="dr-dscr rich-datascr #{component.attributes['styleClass']}" + style="#{component.attributes['style']};"> + <table id="#{clientId}_table" align="center" border="0" cellpadding="0" cellspacing="1" class="dr-dscr-t rich-dtascroller-table #{component.attributes['tableStyleClass']}"> <tbody> <tr> <jsp:scriptlet><![CDATA[

17 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r27 - in trunk/richfaces/datascroller/src/main: java/org/richfaces/renderkit/html and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: d.bulahov Date: 2007-03-07 04:55:45 -0500 (Wed, 07 Mar 2007) New Revision: 27 Modified: trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java trunk/richfaces/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss Log: RFA-282 fixed RFA-299 fixed Modified: trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java =================================================================== --- trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2007-03-06 20:27:54 UTC (rev 26) +++ trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2007-03-07 09:55:45 UTC (rev 27) @@ -128,14 +128,61 @@ //} + public void processUpdates(FacesContext context){ + try { + + } catch (RuntimeException e) { + context.renderResponse(); + throw e; + } finally + { allowCache = false; _UIData = null; } + + } + + public void processValidators(FacesContext context){ + try { + + } catch (RuntimeException e) { + context.renderResponse(); + throw e; + }finally + { allowCache = false; _UIData = null; } + + + } + + public void processDecodes(FacesContext context){ + try { + decode(context); + + } catch (RuntimeException e) { + context.renderResponse(); + throw e; + + }finally + { allowCache = false; _UIData = null; } + + } + + private transient UIData _UIData; + private transient boolean allowCache; +// private UIData getUIData() { +// if (_UIData == null) { +// _UIData = getDataTable(); +// } +// return _UIData; +// } + private UIData getUIData() { - if (_UIData == null) { + if (!allowCache) { _UIData = getDataTable(); + allowCache=true; } return _UIData; } + /** * Finds the dataTable which id is mapped to the "for" property @@ -219,6 +266,7 @@ } else if (NEXT_FACET_NAME.equals(facetName)) { int next = dataTable.getFirst() + getRows(); + if (next>getMaxPages()) next=getMaxPages(); if (next < getRowCount()) dataTable.setFirst(next); } else if (FAST_FORWARD_FACET_NAME.equals(facetName)) { @@ -228,6 +276,9 @@ int rowcount = getRowCount(); if (next >= rowcount) next = (rowcount - 1) - ((rowcount - 1) % getRows()); + if (next>getMaxPages()){ + next=getMaxPages(); + } dataTable.setFirst(next); } else if (FAST_REWIND_FACET_NAME.equals(facetName)) { @@ -244,6 +295,9 @@ int first = delta > 0 && delta < rows ? rowcount - delta : rowcount - rows; if (first >= 0) { + if (first>getMaxPages()){ + first=getMaxPages(); + } dataTable.setFirst(first); } else { @@ -308,12 +362,52 @@ //let's implement "dychotomic" discovery // setPage(1)... if isPageAvailable() setPage(2) then 4, 8, etc. // setPage() { setRowIndex(pageIdx * rows); } - // isPageAvailable() { return isRowAvailable() } + // isPageAvailable() { return isRowAvailable() } return getUIData().getRowCount(); + //return BinarySearch(getUIData()); } + private int BinarySearch(UIData Data) + { + int n=1; + int k=2; + for (;;){ + Data.setRows(k-1); + if (Data.isRowAvailable()){ + n=k; + k=k*2; + } + else{ + break; + } + } + + + while (n < k) { + //int kk = (int)Math.round((n + k)/ 2 + 0.5) - 1; + int kk = (int)Math.round((n + k)/ 2); + Data.setRows(kk-1); + if (Data.isRowAvailable()){ + n = kk; + } + else{ + k=kk-1; + } + } + + + Data.setRows(k-1); + if (Data.isRowAvailable()){ + return k; + } + else{ + return 0; + } + } + + /** * @return int */ Modified: trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java =================================================================== --- trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-03-06 20:27:54 UTC (rev 26) +++ trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-03-07 09:55:45 UTC (rev 27) @@ -136,13 +136,15 @@ out.startElement("td", component); if (isCurrentPage){ out.writeAttribute("align", "center", null); - out.writeAttribute("class", "dr-dscr-act rich-datascr-act "+scroller.getStyleClass(), null); + //out.writeAttribute("class", "dr-dscr-act rich-datascr-act "+scroller.getStyleClass(), null); + out.writeAttribute("class", "dr-dscr-act rich-datascr-act", null); out.writeAttribute("style", ""+scroller.getSelectedStyle(), null); } else{ out.writeAttribute("align", "center", null); - out.writeAttribute("class", "dr-dscr-inact rich-datascr-inact "+scroller.getStyleClass(), null); - out.writeAttribute("style", ""+scroller.getStyle(), null); + //out.writeAttribute("class", "dr-dscr-inact rich-datascr-inact "+scroller.getStyleClass(), null); + out.writeAttribute("class", "dr-dscr-inact rich-datascr-inact", null); + //out.writeAttribute("style", ""+scroller.getStyle(), null); out.writeAttribute("onclick", getOnClick(context, component,Integer.toString(j)) , null); } out.writeText(Integer.toString(i + 1), null); Modified: trunk/richfaces/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss =================================================================== --- trunk/richfaces/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss 2007-03-06 20:27:54 UTC (rev 26) +++ trunk/richfaces/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss 2007-03-07 09:55:45 UTC (rev 27) @@ -4,6 +4,8 @@ xmlns="http://www.w3.org/1999/xhtml" > <f:verbatim><![CDATA[ +.dr-dscr{ +} .dr-dscr-t{ border : 1px solid #c0c0c0; /*panelBorderColor*/ background-color : #ffffff; /*tableBackgroundColor*/

17 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r26 - in trunk: richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd and 6 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2007-03-06 15:27:54 -0500 (Tue, 06 Mar 2007) New Revision: 26 Modified: trunk/ trunk/richfaces-samples/tree-demo/src/main/webapp/pages/index.jsp trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DnDEventsExchangeMailer.java trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/simple-draggable.js trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/simple-dropzone.js trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item-dnd.js trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx Log: DnD fixes: - JS method getDndParams() divided into drag and drop methods - Shuffled types in DnDEventsExchangeMailer fixed - Tree now handles correctly DnD params for UITree & UINode - Test for Tree updated Property changes on: trunk ___________________________________________________________________ Name: svn:ignore + .project Modified: trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js =================================================================== --- trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js 2007-03-06 20:23:23 UTC (rev 25) +++ trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js 2007-03-06 20:27:54 UTC (rev 26) @@ -3,34 +3,52 @@ * base class for draggable component. */ DnD.Draggable = function() {}; -DnD.Draggable.prototype = { - getElement: function() { - return $(this.id); - }, - - getDnDParams: function() { - var elt = this.getElement(); - var attr = elt.attributes["rich:dragdndparams"]; - var dndParams; - +if (!DnD.getDnDDefaultParams) { + DnD.getDnDDefaultParams = function(elt) { + var attr = elt.attributes["rich:defaultdndparams"]; + if (attr) { - dndParams = attr.value.parseJSON(); + return attr.value.parseJSON(); } + + return null; + }; +} - attr = elt.attributes["rich:defaultdndparams"]; +DnD.getDnDDragParams = function(elt) { + var params = DnD.getDnDDefaultParams(elt); - if (attr) { + var attr = elt.attributes["rich:dragdndparams"]; + + if (attr) { + var dndParams = attr.value.parseJSON(); + if (params) { if (dndParams) { - Object.extend(dndParams, attr.value.parseJSON()); - } else { - dndParams = attr.value.parseJSON(); + Object.extend(params, dndParams); } + } else { + params = dndParams; } + } - return dndParams; + return params; +}; + +DnD.Draggable.prototype = { + + getElement: function() { + return $(this.id); }, + getDnDDefaultParams: function() { + return DnD.getDnDDefaultParams(this.getElement()); + }, + + getDnDDragParams: function() { + return DnD.getDnDDragParams(this.getElement()); + }, + /** * @return type of draggable content */ @@ -61,7 +79,7 @@ var indicator = this.getIndicator(); if (indicator) { - var dndParams = this.getDnDParams(); + var dndParams = this.getDnDDragParams(); if (this.getDraggableItems && this.getDraggableItems() > 1) { if (!dndParams) { Modified: trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js =================================================================== --- trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js 2007-03-06 20:23:23 UTC (rev 25) +++ trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js 2007-03-06 20:27:54 UTC (rev 26) @@ -4,35 +4,53 @@ * Base class for drop zones */ DnD.Dropzone = function(){}; -DnD.Dropzone.DROP_TARGET_ID = "dropTargetId"; -DnD.Dropzone.prototype = { - getElement: function() { - return $(this.id); - }, - - getDnDParams: function() { - var elt = this.getElement(); - var attr = elt.attributes["rich:dropdndparams"]; - var dndParams; - +if (!DnD.getDnDDefaultParams) { + DnD.getDnDDefaultParams = function(elt) { + var attr = elt.attributes["rich:defaultdndparams"]; + if (attr) { - dndParams = attr.value.parseJSON(); + return attr.value.parseJSON(); } + + return null; + }; +} - attr = elt.attributes["rich:defaultdndparams"]; +DnD.getDnDDropParams = function(elt) { + var params = DnD.getDnDDefaultParams(elt); - if (attr) { + var attr = elt.attributes["rich:dropdndparams"]; + + if (attr) { + var dndParams = attr.value.parseJSON(); + if (params) { if (dndParams) { - Object.extend(dndParams, attr.value.parseJSON()); - } else { - dndParams = attr.value.parseJSON(); + Object.extend(params, dndParams); } + } else { + params = dndParams; } + } - return dndParams; + return params; +}; + +DnD.Dropzone.DROP_TARGET_ID = "dropTargetId"; +DnD.Dropzone.prototype = { + + getElement: function() { + return $(this.id); }, + getDnDDefaultParams: function() { + return DnD.getDnDDefaultParams(this.getElement()); + }, + + getDnDDropParams: function() { + return DnD.getDnDDropParams(this.getElement()); + }, + /** * * @param {Object} drag @@ -70,11 +88,11 @@ if (indicator) { var icon = this.getIconCodeForType(drag.type); - var dndParams = drag.source.getDnDParams(); + var dndParams = drag.source.getDnDDragParams(); if (dndParams) { - Object.extend(dndParams, this.getDnDParams()); + Object.extend(dndParams, this.getDnDDropParams()); } else { - dndParams = this.getDnDParams(); + dndParams = this.getDnDDropParams(); } if (dndParams) { Modified: trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DnDEventsExchangeMailer.java =================================================================== --- trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DnDEventsExchangeMailer.java 2007-03-06 20:23:23 UTC (rev 25) +++ trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/DnDEventsExchangeMailer.java 2007-03-06 20:27:54 UTC (rev 26) @@ -121,14 +121,14 @@ draggable = (Draggable) target; dropzone = (Dropzone) component; - acceptedTypes = eventInfo.type; - dragType = type; + acceptedTypes = type; + dragType = eventInfo.type; } else { draggable = (Draggable) component; dropzone = (Dropzone) target; - acceptedTypes = type; - dragType = eventInfo.type; + acceptedTypes = eventInfo.type; + dragType = type; } DnDValidator.validateAcceptTypes(facesContext, draggable, dropzone, acceptedTypes, dragType); Modified: trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/simple-draggable.js =================================================================== --- trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/simple-draggable.js 2007-03-06 20:23:23 UTC (rev 25) +++ trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/simple-draggable.js 2007-03-06 20:27:54 UTC (rev 26) @@ -13,7 +13,7 @@ //Event.observe(this.id, "mousedown", this.eventMouseDown); }, - getDnDParams: function() { + getDnDDragParams: function() { if (this.options.dndParams) { return this.options.dndParams.parseJSON(); } Modified: trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/simple-dropzone.js =================================================================== --- trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/simple-dropzone.js 2007-03-06 20:23:23 UTC (rev 25) +++ trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/simple-dropzone.js 2007-03-06 20:27:54 UTC (rev 26) @@ -29,7 +29,7 @@ }, - getDnDParams: function() { + getDnDDropParams: function() { if (this.options.dndParams) { return this.options.dndParams.parseJSON(); } Modified: trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java =================================================================== --- trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-03-06 20:23:23 UTC (rev 25) +++ trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-03-06 20:27:54 UTC (rev 26) @@ -30,6 +30,7 @@ import org.richfaces.component.state.events.CollapseNodeCommandEvent; import org.richfaces.component.state.events.ExpandNodeCommandEvent; import org.richfaces.component.util.ViewUtil; +import org.richfaces.renderkit.DnDParametersEncoder; /** * @author Nick - mailto:nbelaevski@exadel.com created 23.11.2006 @@ -64,6 +65,8 @@ addContributor(DropzoneRendererContributor.getInstance()); addContributor(DraggableRendererContributor.getInstance()); + + addParameterEncoder(DnDParametersEncoder.getInstance()); } protected String getToggleScript(FacesContext context, UITreeNode treeNode) { Modified: trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item-dnd.js =================================================================== --- trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item-dnd.js 2007-03-06 20:23:23 UTC (rev 25) +++ trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item-dnd.js 2007-03-06 20:27:54 UTC (rev 26) @@ -7,6 +7,12 @@ * Dropzone interface */ Object.extend(Tree.Item.prototype, DnD.Dropzone.prototype); + +/** + * Draggable Interface + */ +Object.extend(Tree.Item.prototype, DnD.Draggable.prototype); + Object.extend(Tree.Item.prototype, { getAcceptedTypes: function() { var opts = this.getDropzoneOptions(); @@ -20,6 +26,33 @@ return []; }, + mergeParams: function(func) { + var treeParam = func(this.tree.getElement()); + var nodeParam = func(this.getElement()); + + if (treeParam) { + if (nodeParam) { + Object.extend(treeParam, nodeParam); + } + + return treeParam; + } else { + return nodeParam; + } + }, + + getDnDDefaultParams: function() { + return this.mergeParams(DnD.getDnDDefaultParams); + }, + + getDnDDragParams: function() { + return this.mergeParams(DnD.getDnDDragParams); + }, + + getDnDDropParams: function() { + return this.mergeParams(DnD.getDnDDropParams); + }, + getDropzoneOptions: function() { var attr = this.elements.icon.attributes["rich:dropzoneoptions"]; if (attr) { @@ -42,13 +75,8 @@ } this.tree.drop(event, drag); - } -}); -/** - * Draggable Interface - */ -Object.extend(Tree.Item.prototype, DnD.Draggable.prototype); -Object.extend(Tree.Item.prototype, { + }, + getIndicator: function() { var indicator = $(this.tree.dragIndicatorId); if (!indicator) { Modified: trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js =================================================================== --- trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js 2007-03-06 20:23:23 UTC (rev 25) +++ trunk/richfaces/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js 2007-03-06 20:27:54 UTC (rev 26) @@ -156,6 +156,10 @@ } else if (nodeBottom > visibleBottom) { this.element.scrollTop = nodeBottom - this.element.clientHeight; } + }, + + getElement: function() { + return $(this.id); } } Modified: trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx =================================================================== --- trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx 2007-03-06 20:23:23 UTC (rev 25) +++ trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx 2007-03-06 20:27:54 UTC (rev 26) @@ -33,6 +33,7 @@ <f:call name="initializeResources" /> <tr> + <f:call name="encodeAttributeParameters" /> <td class="dr-tree-h-ic #{line}"> <jsp:scriptlet> <![CDATA[ Modified: trunk/richfaces-samples/tree-demo/src/main/webapp/pages/index.jsp =================================================================== --- trunk/richfaces-samples/tree-demo/src/main/webapp/pages/index.jsp 2007-03-06 20:23:23 UTC (rev 25) +++ trunk/richfaces-samples/tree-demo/src/main/webapp/pages/index.jsp 2007-03-06 20:27:54 UTC (rev 26) @@ -27,6 +27,12 @@ <h:form> + <dnd:dragIndicator id="treeIndicator"> + <f:facet name="single"> + <f:verbatim>{marker} <br /> {treeParam} <br /> {nodeParam}</f:verbatim> + </f:facet> + </dnd:dragIndicator> + <h:selectOneRadio binding="#{skinBean.component}" /> <h:commandLink action="#{skinBean.change}" value="set skin" /> <br /> @@ -43,7 +49,6 @@ <rich:tree id="tree" switchType="#{bean.switchType}" value="#{bean.data}" var="data" - acceptedTypes="valueNode" nodeFace="#{data.name != 'param-value' ? 'input' : 'text'}" changeExpandListener="#{bean.onExpand}" nodeSelectListener="#{bean.onSelect}" binding="#{bean.tree}" @@ -52,26 +57,37 @@ oncollapse="window.status='collapsedNode: '+event.collapsedNode" ajaxSubmitSelection="true" reRender="outputText, selectOneListbox" preserveModel="state" - dragType="node" + dragIndicator="treeIndicator" + + acceptedTypes="file1" + dragType="file1" + iconCollapsed="#{bean.iconCollapsed}" iconExpanded="#{bean.iconExpanded}" iconLeaf="#{bean.iconLeaf}" icon="#{bean.icon}" - > + dropListener="#{bean.processDrop}"> - <dnd:dndParam name="test" value="testValue" /> + <dnd:dndParam name="treeParam" value="Tree Parameter" /> + <dnd:dndParam name="accept" value="accept" /> - <rich:treeNode type="input" dragType="valueNode" acceptedTypes="valueNode" dropListener="#{bean.processDrop}"> + <rich:treeNode type="input" dropListener="#{bean.processDrop}"> <h:outputText value="#{data} : " /> <h:inputText value="#{data.name}" required="true" styleClass="inputs"> </h:inputText> + + <dnd:dndParam name="nodeParam" value="Node Parameter" /> + </rich:treeNode> - <rich:treeNode type="text" nodeClass="customNode"> + <rich:treeNode type="text" nodeClass="customNode" acceptedTypes="file2"> <h:outputText value="#{data}" /> </rich:treeNode> </rich:tree> </h:form> + + <a4j:status startText="...start..." /> + </f:view> </body> </html>

17 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r25 - tags.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2007-03-06 15:23:23 -0500 (Tue, 06 Mar 2007) New Revision: 25 Added: tags/3_0_0/ Log: Copied: tags/3_0_0 (from rev 24, trunk)

17 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r24 - /.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2007-03-06 15:21:48 -0500 (Tue, 06 Mar 2007) New Revision: 24 Added: tags/ Log:

17 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r23 - trunk/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts.

by richfaces-svn-commits＠lists.jboss.org

Author: A.Skokov Date: 2007-03-06 10:34:16 -0500 (Tue, 06 Mar 2007) New Revision: 23 Modified: trunk/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js Log: http://jira.exadel.com/browse/RFA-293 fixed Modified: trunk/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js =================================================================== --- trunk/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js 2007-03-06 15:22:32 UTC (rev 22) +++ trunk/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js 2007-03-06 15:34:16 UTC (rev 23) @@ -263,13 +263,13 @@ }, markPrevious: function() { - if (this.index > 0) this.index-- - else this.index = this.entryCount - 1; + if (this.index > 0) this.index--; + //else this.index = this.entryCount - 1; }, markNext: function() { - if (this.index < this.entryCount - 1) this.index++ - else this.index = 0; + if (this.index < this.entryCount - 1) this.index++; + //else this.index = 0; }, getEntry: function(index) {

17 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r20 - trunk/richfaces-samples/dragDropDemo/src/main/webapp/pages.

by richfaces-svn-commits＠lists.jboss.org

Author: A.Skokov Date: 2007-03-06 09:33:48 -0500 (Tue, 06 Mar 2007) New Revision: 20 Added: trunk/richfaces-samples/dragDropDemo/src/main/webapp/pages/test.html Modified: trunk/richfaces-samples/dragDropDemo/src/main/webapp/pages/index.jsp Log: IE selection on iframe for DnD fixed Modified: trunk/richfaces-samples/dragDropDemo/src/main/webapp/pages/index.jsp =================================================================== --- trunk/richfaces-samples/dragDropDemo/src/main/webapp/pages/index.jsp 2007-03-06 14:31:14 UTC (rev 19) +++ trunk/richfaces-samples/dragDropDemo/src/main/webapp/pages/index.jsp 2007-03-06 14:33:48 UTC (rev 20) @@ -206,6 +206,7 @@ <h:messages /> </a4j:outputPanel> + <iframe src="pages/test.html"></iframe> </h:form> </f:view> </body> Added: trunk/richfaces-samples/dragDropDemo/src/main/webapp/pages/test.html =================================================================== --- trunk/richfaces-samples/dragDropDemo/src/main/webapp/pages/test.html (rev 0) +++ trunk/richfaces-samples/dragDropDemo/src/main/webapp/pages/test.html 2007-03-06 14:33:48 UTC (rev 20) @@ -0,0 +1,12 @@ +01234567890 +<br> +01234567890 +<br> +01234567890 +<br> +01234567890 +<br> +01234567890 +<br> +01234567890 +<br>

17 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r19 - trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd.

by richfaces-svn-commits＠lists.jboss.org

Author: A.Skokov Date: 2007-03-06 09:31:14 -0500 (Tue, 06 Mar 2007) New Revision: 19 Modified: trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js Log: IE selection on iframe for DnD fixed Color decoration for default drag indicator fixed Modified: trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js =================================================================== --- trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js 2007-03-06 09:53:02 UTC (rev 18) +++ trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js 2007-03-06 14:31:14 UTC (rev 19) @@ -50,10 +50,10 @@ if (!dragDiv) { dragDiv = document.createElement("div"); dragDiv.id = "_rfDefaultDragIndicator"; - Element.setStyle(dragDiv, {"border" : "1px dashed black"}); Object.extend(dragDiv, DefaultDragIndicator); document.body.appendChild(dragDiv); } + Element.setStyle(dragDiv, {"border" : "1px dashed black"}); return dragDiv; }, @@ -62,14 +62,14 @@ if (indicator) { var dndParams = this.getDnDParams(); - + if (this.getDraggableItems && this.getDraggableItems() > 1) { if (!dndParams) { dndParams = {}; } - + dndParams["draggableItems"] = this.getDraggableItems(); - + indicator.setContent("default", false, dndParams); } else { indicator.setContent("default", true, dndParams); @@ -79,7 +79,7 @@ startDrag : function(event) { var type = this.getContentType(); - var indicator = this.getIndicator(); + var indicator = this.getIndicator(); var drag = new DnD.Drag(this, indicator, type); DnD.startDrag(drag); DnD.updateDrag(event); @@ -87,33 +87,42 @@ if (indicator) { indicator.show(); } - - if (indicator.id.indexOf("_rfDefaultDragIndicator") != -1) { + +/* if (indicator.id.indexOf("_rfDefaultDragIndicator") != -1) { Position.clone(Event.element(event), indicator); var offSets = Position.cumulativeOffset(Event.element(event)); indicator.removalX = Event.pointerX(event) - offSets[0]; - indicator.removalY = Event.pointerY(event) - offSets[1]; - } - + indicator.removalY = Event.pointerY(event) - offSets[1]; + } */ + if( this.options && this.options.ondragstart) { this.options.ondragstart(); } - }, + + // cancel out any text selections + document.body.focus(); + + // prevent text selection in IE + this.onSelectStartHandler = document.onselectstart; + document.onselectstart = function () { return false; }; + }, /** * * @param {DnD.Drag} drag */ endDrag: function(event, drag) { - var indicator = drag.indicator; + document.onselectstart = this.onSelectStartHandler; + + var indicator = drag.indicator; if (indicator) { indicator.hide(); } this.ondragend(event, drag); - + if( this.options && this.options.ondragend) { this.options.ondragend(); } - }, + }, /** * cubclasses may define custom behavior * @param {Object} drag @@ -135,7 +144,7 @@ show: function() { if (window.drag && window.drag.source) { var target = window.drag.source.getElement(); - + Element.setStyle(this, {"width": Element.getWidth(target) + "px", "height": Element.getHeight(target) + "px"}); Element.show(this); @@ -149,19 +158,22 @@ }, position: function(x, y) { - if (this.id.indexOf("_rfDefaultDragIndicator") != -1 && this.removalX && this.removalY) { +/* if (this.id.indexOf("_rfDefaultDragIndicator") != -1 && this.removalX && this.removalY) { x -= (this.removalX + 5); - y -= (this.removalY + 14); - } + y -= (this.removalY + 14); + } */ Element.setStyle(this, {"left": x + "px", "top": y + "px"}); }, accept: function() { + Element.setStyle(this, {"border" : "1px dashed green"}); }, reject: function() { + Element.setStyle(this, {"border" : "1px dashed red"}); }, leave: function() { + Element.setStyle(this, {"border" : "1px dashed black"}); } };

17 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r18 - trunk/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts.

by richfaces-svn-commits＠lists.jboss.org

Author: A.Skokov Date: 2007-03-06 04:53:02 -0500 (Tue, 06 Mar 2007) New Revision: 18 Modified: trunk/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js Log: SuggestionBox position in IE fixed Modified: trunk/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js =================================================================== --- trunk/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js 2007-03-06 05:11:00 UTC (rev 17) +++ trunk/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js 2007-03-06 09:53:02 UTC (rev 18) @@ -466,7 +466,7 @@ var targetStyle = {}; /* http://jira.exadel.com/browse/RFA-236 - + var pos = Exadel.SmartPosition.getPosition(this.source, this.target, options); if (RichFaces.navigatorType() == "MSIE") { @@ -494,7 +494,7 @@ }, calcOffsets : function(element) { - var x = 0,y = 0,ret = new Object(),prevPos; + var x = 0,y = 0,ret = new Object(),prevPos, pos; if (element.currentStyle) { prevPos = element.currentStyle['position']; @@ -504,8 +504,10 @@ //prevPos = element.currentStyle.position; element.style.position = "absolute"; - y = (Number(Position.cumulativeOffset(element)[1]) + element.clientHeight); - x = Number(element.offsetLeft); + + pos = Position.cumulativeOffset(element); + y = Number(pos[1] + element.clientHeight); + x = Number(pos[0]); element.style.position = prevPos; ret["x"] = x; ret["y"] = y; @@ -521,7 +523,6 @@ return str; }, - calcHeight: function() { return this.options.height == "auto" ? "" :this.options.height; },

17 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r17 - trunk/richfaces-samples/richfaces-demo/src/main/resources/org/richfaces/demo/common.

by richfaces-svn-commits＠lists.jboss.org

Author: SergeySmirnov Date: 2007-03-06 00:11:00 -0500 (Tue, 06 Mar 2007) New Revision: 17 Modified: trunk/richfaces-samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties Log: url corrections Modified: trunk/richfaces-samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties =================================================================== --- trunk/richfaces-samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-03-06 00:34:33 UTC (rev 16) +++ trunk/richfaces-samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-03-06 05:11:00 UTC (rev 17) @@ -6,9 +6,9 @@ tabPanel= Tab Panel, /images/ico_tabpanel.gif, /images/cn_tabpanel.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/tabPanel.jsf inputNumberSlider= Input Number Slider, /images/ico_slider.gif, /images/cn_slider.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/inputNumberSlider.jsf inputNumberSpinner= Input Number Spinner, /images/ico_spinner.gif, /images/cn_spinner.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/inputNumberSpinner.jsf -dataFilterSlider= Data Filter Slider, /images/ico_DataFilterSlider.gif, /images/cn_DataFilterSlider.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dataFilterSlider.jsf -dataTable= Data Table, /images/ico_DataTable.gif, /images/cn_DataTable.gif, http\://dem01.exadel.com\:18091/openexadel-org/richdocs/devguide/dataTable.html, http\://dem01.exadel.com\:18091/openexadel-org/richdocs/tlddoc/rich/dataTable.html, http\://dem01.exadel.com\:18091/openexadel-org/richdocs/javadoc/org/richfaces/component/UIDataTable.html, /richfaces/dataTable.jsf -gmap= Google Map, /images/ico_GoogleMap.gif, /images/cn_GoogleMap.gif, http\://dem01.exadel.com\:18091/openexadel-org/richdocs/devguide/gmap.html, http\://dem01.exadel.com\:18091/openexadel-org/richdocs/tlddoc/rich/gmap.html, http\://dem01.exadel.com\:18091/openexadel-org/richdocs/javadoc/org/richfaces/component/UIGmap.html, /richfaces/gmap.jsf +dataFilterSlider= Data Filter Slider, /images/ico_DataFilterSlider.gif, /images/cn_DataFilterSlider.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dataFilterSlider.jsf +dataTable= Data Table, /images/ico_DataTable.gif, /images/cn_DataTable.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dataTable.jsf +gmap= Google Map, /images/ico_GoogleMap.gif, /images/cn_GoogleMap.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/gmap.jsf paint2d= Paint2D, /images/ico_Paint2D.gif, /images/cn_Paint2D.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/paint2D.jsf toolBar= Tool Bar, /images/ico_ToolBar.gif, /images/cn_ToolBar.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/toolBar.jsf simpleTogglePanel= Simple Toggle Panel, /images/ico_SimpleTogglePanel.gif, /images/cn_SimpleTogglePanel.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/simpleTogglePanel.jsf @@ -18,6 +18,6 @@ panelBar= Panel Bar, /images/ico_PanelBar.gif, /images/cn_PanelBar.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/panelBar.jsf tree= Tree, /images/ico_Tree.gif, /images/cn_tree.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/tree.jsf modalPanel= Modal Panel, /images/ico_ModalPanel.gif, /images/cn_ModalPanel.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/modalPanel.jsf -togglePanel= Toggle Panel, /images/ico_TogglePanel.gif, /images/cn_TogglePanel.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/togglePanel.jsf +togglePanel= Toggle Panel, /images/ico_TogglePanel.gif, /images/cn_TogglePanel.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/togglePanel.jsf suggestionBox= Suggestion Box, /images/ico_SuggestionBox.gif, /images/cn_SuggestionBox.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/suggestionBox.jsf dataTableScroller= Data Table Scroller, /images/ico_DataTableScroller.gif, /images/cn_DataTableScroller.gif, http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..., /richfaces/dataTableScroller.jsf

17 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits March 2007