You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2013/04/26 19:24:49 UTC
svn commit: r1476303 - in
/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content:
05-toolBar/toolBar.xhtml 20-popup/popup.xhtml
Author: lofwyr
Date: Fri Apr 26 17:24:49 2013
New Revision: 1476303
URL: http://svn.apache.org/r1476303
Log:
TOBAGO-1171: Support for the Content Security Policy (CSP)
TOBAGO-1219: Evaluate jQuery UI Widget Factory
TOBAGO-1258: New attribute "omit" for commands
Modified:
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-popup/popup.xhtml
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml?rev=1476303&r1=1476302&r2=1476303&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml Fri Apr 26 17:24:49 2013
@@ -56,7 +56,7 @@
<tc:popup id="popup" modal="true">
<f:facet name="layout">
- <tc:gridLayout rows="auto" columns="auto" />
+ <tc:gridLayout rows="auto" columns="auto"/>
</f:facet>
<tc:box label="Message">
@@ -82,10 +82,10 @@
<f:facet name="dropDownMenu">
<tc:menu>
<tc:menuCommand label="Alert 1" omit="true">
- <tc:dataAttribute name="alert-text" value="Test 1"/>
+ <tc:dataAttribute name="alert-text" value="Test 1"/>
</tc:menuCommand>
<tc:menuCommand label="Alert 2" omit="true">
- <tc:dataAttribute name="alert-text" value="Test 2"/>
+ <tc:dataAttribute name="alert-text" value="Test 2"/>
</tc:menuCommand>
<tc:menuCommand action="#{overviewController.ping}" id="dropdown3"
actionListener="#{overviewController.click}" label="Action 3"/>
@@ -121,8 +121,12 @@
label="#{overviewBundle.toolbar_dropDownAction}">
<f:facet name="dropDownMenu">
<tc:menu>
- <tc:menuCommand onclick="alert('test 1')" label="Alert 1"/>
- <tc:menuCommand onclick="alert('test 2')" label="Alert 2"/>
+ <tc:menuCommand label="Alert 1" omit="true">
+ <tc:dataAttribute name="alert-text" value="Test 1"/>
+ </tc:menuCommand>
+ <tc:menuCommand label="Alert 2" omit="true">
+ <tc:dataAttribute name="alert-text" value="Test 2"/>
+ </tc:menuCommand>
<tc:menuCommand id="dropdown3_2" actionListener="#{overviewController.click}" label="Action 3"/>
</tc:menu>
</f:facet>
@@ -161,7 +165,9 @@
<tc:menu label="Menu 1">
- <tc:menuCommand onclick="alert('action 1')" label="alert 1"/>
+ <tc:menuCommand label="Alert" omit="true">
+ <tc:dataAttribute name="alert-text" value="Alert in Menu 1"/>
+ </tc:menuCommand>
<tc:menuCommand label="#{overviewBundle.toolbar_linkClickme}" image="image/config.gif">
<f:facet name="confirmation"><tc:out value="Do you really want to click this button?"/></f:facet>
@@ -174,11 +180,15 @@
</tc:menu>
<tc:menu label="Menu 2">
- <tc:menuCommand onclick="alert('action 1')" label="alert 1"/>
+ <tc:menuCommand label="Alert" omit="true">
+ <tc:dataAttribute name="alert-text" value="Alert in Menu 2"/>
+ </tc:menuCommand>
<tc:menu label="Menu 3">
- <tc:menuCommand onclick="alert('action 1')" label="alert 1" image="image/date.gif"/>
+ <tc:menuCommand label="Alert" image="image/date.gif" omit="true">
+ <tc:dataAttribute name="alert-text" value="Alert in Menu 3"/>
+ </tc:menuCommand>
<tc:menuCommand link="/" label="#{overviewBundle.toolbar_linkClickme}" image="image/config.gif">
<f:facet name="confirmation"><tc:out value="Do you really want leave this demo?"/></f:facet>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-popup/popup.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-popup/popup.xhtml?rev=1476303&r1=1476302&r2=1476303&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-popup/popup.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-popup/popup.xhtml Fri Apr 26 17:24:49 2013
@@ -58,7 +58,9 @@
<f:facet name="menuBar">
<tc:menuBar>
<tc:menu label="Menu">
- <tc:menuCommand label="Say okay" onclick="alert('okay');"/>
+ <tc:menuCommand label="Say okay" omit="true">
+ <tc:dataAttribute name="alert-text" value="Okay!"/>
+ </tc:menuCommand>
</tc:menu>
</tc:menuBar>
</f:facet>