9:12 a.m.
Author: ilya_shaikovsky
Date: 2008-12-12 10:12:45 -0500 (Fri, 12 Dec 2008)
New Revision: 11743
Modified:
trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/editor/EditorBean.java
trunk/samples/richfaces-demo/src/main/webapp/richfaces/editor/examples/editor.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/queue/examples/queue.xhtml
trunk/samples/richfaces-demo/src/main/webapp/scripts/queueUi.js
Log:
queue demo updated
editor seam usage support demo started.
Modified:
trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/editor/EditorBean.java
===================================================================
---
trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/editor/EditorBean.java 2008-12-12
15:04:06 UTC (rev 11742)
+++
trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/editor/EditorBean.java 2008-12-12
15:12:45 UTC (rev 11743)
@@ -11,6 +11,7 @@
private String viewMode = "visual";
private String value;
private boolean liveUpdatesEnabled=false;
+ private boolean useSeamText=false;
private static final String CONFIGS_PACKAGE = "/org/richfaces/demo/editor/";
List<SelectItem> configurations = new ArrayList<SelectItem>();
@@ -55,6 +56,14 @@
public void setLiveUpdatesEnabled(boolean liveUpdatesEnabled) {
this.liveUpdatesEnabled = liveUpdatesEnabled;
}
+
+ public boolean isUseSeamText() {
+ return useSeamText;
+ }
+
+ public void setUseSeamText(boolean useSeamText) {
+ this.useSeamText = useSeamText;
+ }
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/editor/examples/editor.xhtml
===================================================================
---
trunk/samples/richfaces-demo/src/main/webapp/richfaces/editor/examples/editor.xhtml 2008-12-12
15:04:06 UTC (rev 11742)
+++
trunk/samples/richfaces-demo/src/main/webapp/richfaces/editor/examples/editor.xhtml 2008-12-12
15:12:45 UTC (rev 11743)
@@ -8,6 +8,10 @@
.column{
width:50%;
vertical-align:top;
+ }
+ .pbody{
+ height:200px;
+ overflow:auto;
}
</style>
<h:form>
@@ -34,6 +38,10 @@
</h:selectOneRadio>
<h:outputText value="Toggle Preview: " />
<h:selectBooleanCheckbox value="#{editorBean.liveUpdatesEnabled}" >
+ <a4j:support event="onchange" reRender="result"/>
+ </h:selectBooleanCheckbox>
+ <h:outputText value="Use Seam Text Format:"/>
+ <h:selectBooleanCheckbox value="#{editorBean.useSeamText}" >
<a4j:support event="onchange" reRender="editor,
result"/>
</h:selectBooleanCheckbox>
</h:panelGrid>
@@ -41,7 +49,7 @@
</h:panelGrid>
<a4j:outputPanel layout="block" id="result">
- <rich:panel rendered="#{editorBean.liveUpdatesEnabled}">
+ <rich:panel rendered="#{editorBean.liveUpdatesEnabled}"
bodyClass="pbody">
<f:facet name="header">
<h:outputText value="Preview"/>
</f:facet>
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/queue/examples/queue.xhtml
===================================================================
---
trunk/samples/richfaces-demo/src/main/webapp/richfaces/queue/examples/queue.xhtml 2008-12-12
15:04:06 UTC (rev 11742)
+++
trunk/samples/richfaces-demo/src/main/webapp/richfaces/queue/examples/queue.xhtml 2008-12-12
15:12:45 UTC (rev 11743)
@@ -8,7 +8,7 @@
<a4j:loadScript src="/scripts/queueUi.js"/>
<a4j:loadStyle src="/css/queueStylesheet.js"/>
<h:form id="form1" prependId="false">
- <a4j:queue />
+ <a4j:queue requestDelay="1000" ignoreDupResponce="true"/>
<h:panelGrid columns="2" cellspacing="5">
<h:panelGrid id="board1" columns="6" border="1">
@@ -22,7 +22,7 @@
style="height:50px;width:50px;"
onclick="buttonpush('_#{i}');"
oncomplete="buttonpop('_#{i}');"
- actionListener="#{mojarraBean.process}" />
+ actionListener="#{mojarraBean.process}" value="submit"/>
<h:panelGrid cellpadding="5">
<h:outputText value="#{i}" style="font-weight:bold"/>
</h:panelGrid>
Modified: trunk/samples/richfaces-demo/src/main/webapp/scripts/queueUi.js
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/scripts/queueUi.js 2008-12-12 15:04:06
UTC (rev 11742)
+++ trunk/samples/richfaces-demo/src/main/webapp/scripts/queueUi.js 2008-12-12 15:12:45
UTC (rev 11743)
@@ -1,16 +1,25 @@
var disabledImage = 'queue/examples/resources/button3.gif';
var enabledImage = 'queue/examples/resources/button2.gif';
+var lastButtonActivated;
+var lastButtonCounter;
function buttonpush(buttonName) {
var button = document.getElementById(buttonName);
- if (!button.disabled) {
+ var txt = document.createTextNode(buttonName);
+ if (button.value=='submit') {
button.src = disabledImage;
- button.disabled = true;
+ button.value = 'progress';
}
- var txt = document.createTextNode(buttonName);
- addCell(txt);
+ if ((typeof lastButtonActivated=='undefined')||(lastButtonActivated.nodeValue
!= txt.nodeValue)){
+ lastButtonActivated=txt;
+ lastButtonCounter=1;
+ addCell(txt);
+ }
+ else{
+ changeCounterInCell(txt,++lastButtonCounter);
+ }
}
-
+
function buttonpop(buttonName) {
var txt = document.createTextNode(buttonName);
removeCell(txt);
@@ -19,20 +28,29 @@
function addCell(cellData) {
var cell = document.getElementById("tr1").insertCell(0);
cell.setAttribute("height", "50px");
- cell.setAttribute("width", "50px");
- cell.innerHTML = cellData.nodeValue;
+ cell.setAttribute("width", "50px");
+ cell.innerHTML = cellData.nodeValue + '(1)';
cell.className = "queueCell";
}
+function changeCounterInCell(cellData, counter){
+ var row = document.getElementById("tr1");
+ var cells = row.getElementsByTagName("td");
+ cells[0].innerHTML=cellData.nodeValue + '(' + counter + ')';
+}
function removeCell(cellData) {
var row = document.getElementById("tr1");
var cells = row.getElementsByTagName("td");
+ if (cells.length==1) {
+ lastButtonActivated=undefined;
+ lastButtonCounter=undefined;
+ }
if (typeof cells != 'undefined' || cells != null) {
for (var i=0; i<cells.length; i++) {
- if (cells[i].firstChild.nodeValue == cellData.nodeValue) {
+ if (cells[i].firstChild.nodeValue.indexOf(cellData.nodeValue)==0) {
row.deleteCell(i);
var button = document.getElementById(cellData.nodeValue);
- button.disabled = false;
+ button.value = 'submit';
button.src = enabledImage;
break;
}