8:27 a.m.
Author: adubovsky
Date: 2008-12-09 09:27:23 -0500 (Tue, 09 Dec 2008)
New Revision: 11662
Modified:
trunk/test-applications/jsp/src/main/webapp/HotKey/HotKey.jsp
trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp
Log:
changes in hotKey
Modified: trunk/test-applications/jsp/src/main/webapp/HotKey/HotKey.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/HotKey/HotKey.jsp 2008-12-09 12:30:27 UTC
(rev 11661)
+++ trunk/test-applications/jsp/src/main/webapp/HotKey/HotKey.jsp 2008-12-09 14:27:23 UTC
(rev 11662)
@@ -5,21 +5,23 @@
<f:subview id="hotKeySubviewID">
<rich:calendar id="hotKeyCalendarID" popup="false" />
-
-
- <h:commandButton id="commandButtonID" onclick="return false;"
value="test select"></h:commandButton>
+
+ <h:commandButton id="commandButtonID" onclick="return false;"
+ value="test select"></h:commandButton>
+
<rich:hotKey id="hotKeyID" binding="#{hotKey.htmlHotKey}"
disableInInput="#{hotKey.disableInInput}"
handler="#{hotKey.handler}"
key="#{hotKey.key}" rendered="#{hotKey.rendered}"
- selector="#{hotKey.selector}" timing="#{hotKey.timing}"
type="#{hotKey.type}"
disableInInputTypes="#{hotKey.disableInInputTypes}"/>
+ selector="#{hotKey.selector}" timing="#{hotKey.timing}"
+ type="#{hotKey.type}"
+ disableInInputTypes="#{hotKey.disableInInputTypes}" />
<h:panelGrid columns="2">
<h:outputText value="type"></h:outputText>
- <h:selectOneMenu value="#{hotKey.type}">
+ <h:selectOneMenu value="#{hotKey.type}"
onchange="submit();">
<f:selectItem itemLabel="onkeydown" itemValue="onkeydown"
/>
<f:selectItem itemLabel="onkeypress" itemValue="onkeypress"
/>
<f:selectItem itemLabel="onkeyup" itemValue="onkeyup" />
- <a4j:support reRender="hotKeyID"
event="onchange"></a4j:support>
</h:selectOneMenu>
<h:outputText value="key"></h:outputText>
@@ -33,10 +35,9 @@
</h:selectOneMenu>
<h:outputText value="selector"></h:outputText>
- <h:selectOneMenu value="#{hotKey.selector}">
+ <h:selectOneMenu value="#{hotKey.selector}"
onchange="submit();">
<f:selectItem itemLabel="" itemValue="" />
<f:selectItem itemLabel="Button" itemValue="#commandButtonID"
/>
- <a4j:support reRender="hotKeyID"
event="onchange"></a4j:support>
</h:selectOneMenu>
<h:outputText value="handler"></h:outputText>
@@ -48,16 +49,13 @@
</h:selectOneMenu>
<h:outputText value="disableInInput"></h:outputText>
- <h:selectBooleanCheckbox value="#{hotKey.disableInInput}">
- <a4j:support reRender="hotKeyID"
event="onchange"></a4j:support>
- </h:selectBooleanCheckbox>
-
+ <h:selectBooleanCheckbox value="#{hotKey.disableInInput}"
onchange="submit();" />
+
<h:outputText value="disableInInput"></h:outputText>
- <h:selectOneRadio value="#{hotKey.disableInInputTypes}" >
- <f:selectItem itemValue="all" itemLabel="all"/>
- <f:selectItem itemValue="buttons" itemLabel="buttons"/>
- <f:selectItem itemValue="texts" itemLabel="texts"/>
- <a4j:support reRender="hotKeyID"
event="onchange"></a4j:support>
+ <h:selectOneRadio value="#{hotKey.disableInInputTypes}"
onchange="submit();">
+ <f:selectItem itemValue="all" itemLabel="all" />
+ <f:selectItem itemValue="buttons" itemLabel="buttons" />
+ <f:selectItem itemValue="texts" itemLabel="texts" />
</h:selectOneRadio>
<%--<h:outputText value="checkParent"></h:outputText>
@@ -66,35 +64,50 @@
</h:selectBooleanCheckbox>--%>
<h:outputText value="rendered"></h:outputText>
- <h:selectBooleanCheckbox value="#{hotKey.rendered}">
- <a4j:support reRender="hotKeyID"
event="onchange"></a4j:support>
- </h:selectBooleanCheckbox>
+ <h:selectBooleanCheckbox value="#{hotKey.rendered}"
onchange="submit();" />
<h:outputText value="test binding:"></h:outputText>
<h:outputText value="#{hotKey.bindingInfo}"></h:outputText>
- <h:commandButton onclick="#{rich:component('hotKeyID')}.enable();
return false;" value="enable"></h:commandButton>
- <h:commandButton onclick="#{rich:component('hotKeyID')}.disable();
return false;" value="disable"></h:commandButton>
+ <h:commandButton
+ onclick="$('formID:hotKeySubviewID:hotKeyID').component.enable(); return
false;"
+ value="enable"></h:commandButton>
+ <h:commandButton
+ onclick="$('formID:hotKeySubviewID:hotKeyID').component.disable(); return
false;"
+ value="disable"></h:commandButton>
</h:panelGrid>
- <f:verbatim><hr /></f:verbatim>
+ <f:verbatim>
+ <hr />
+ </f:verbatim>
+
<rich:hotKey id="jsID" timing="onregistercall" />
<h:panelGrid columns="2">
- <h:commandButton id="jsAddCCID" value="add hotkey: alt+z"
onclick="return false;"></h:commandButton>
- <h:commandButton id="jsRemoveCCID" value="remove hotkey: alt+z"
onclick="return false;"></h:commandButton>
+ <h:commandButton id="jsAddCCID" value="add hotkey: shift+d"
+ onclick="return false;"></h:commandButton>
+ <h:commandButton id="jsRemoveCCID" value="remove hotkey:
shift+d"
+ onclick="return false;"></h:commandButton>
- <rich:componentControl disableDefault="true"
attachTo="jsAddCCID" for="jsID" event="onclick"
operation="add">
- <f:param name="key" value="alt+z" />
- <f:param name="handler" value="alert('alt+z')" />
+ <rich:componentControl disableDefault="true"
attachTo="jsAddCCID"
+ for="jsID" event="onclick" operation="add">
+ <f:param name="key" value="shift+d" />
+ <f:param name="handler" value="alert('shift+d')" />
</rich:componentControl>
- <rich:componentControl disableDefault="true"
attachTo="jsRemoveCCID" for="jsID" event="onclick"
operation="remove">
- <f:param name="key" value="alt+z" />
+ <rich:componentControl disableDefault="true"
attachTo="jsRemoveCCID"
+ for="jsID" event="onclick" operation="remove">
+ <f:param name="key" value="shift+d" />
</rich:componentControl>
</h:panelGrid>
- <f:verbatim><hr /></f:verbatim>
+
+ <f:verbatim>
+ <hr />
+ </f:verbatim>
+
<h:commandButton action="#{hotKey.add}" value="add test" />
+
+ <%--
<div style="FONT-WEIGHT: bold;">rich:findComponent</div>
<h:panelGrid columns="2">
<rich:column>
@@ -104,4 +117,5 @@
<h:outputText
value="#{rich:findComponent('hotKeyID').rendererType}" />
</rich:column>
</h:panelGrid>
+ --%>
</f:subview>
\ No newline at end of file
Modified: trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2008-12-09
12:30:27 UTC (rev 11661)
+++ trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2008-12-09
14:27:23 UTC (rev 11662)
@@ -18,6 +18,7 @@
<h:selectBooleanCheckbox id="a4jLodID" value="#{option.log}"
onchange="submit();"></h:selectBooleanCheckbox>
<a4j:status id="a4jStatusID" startText="WORK!"
startStyle="color: red;" stopText="a4j:status"></a4j:status>
+ <h:panelGroup></h:panelGroup>
</h:panelGrid>
<h:panelGrid columns="1">
<h:panelGrid columns="4">