[jboss-cvs] jboss-seam/examples/wiki/view/includes ...
Christian Bauer
christian at hibernate.org
Fri May 4 14:25:51 EDT 2007
User: cbauer
Date: 07/05/04 14:25:51
Modified: examples/wiki/view/includes ownerSelector.xhtml
deleteConfirmation.xhtml popupDialog.xhtml
directorySelector.xhtml
Log:
Fixed jQuery/RichFaces conflicts (except tree)
Revision Changes Path
1.2 +10 -10 jboss-seam/examples/wiki/view/includes/ownerSelector.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ownerSelector.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/ownerSelector.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ownerSelector.xhtml 4 May 2007 12:35:29 -0000 1.1
+++ ownerSelector.xhtml 4 May 2007 18:25:51 -0000 1.2
@@ -9,7 +9,7 @@
<ui:param name="dialogId" value="dialogOwnerSelection"/>
<ui:define name="dialogInit">
- <script type="text/javascript">$(function() {
+ <script type="text/javascript">jQuery(function() {
jsf('dialogOwnerSelectionPopup')
.css({ minWidth: "700px", minHeight: "420px", width: "725px;", height: "450px;", top: "100px", left: "100px"})
.jqm({trigger: jsf("openDialogOwnerSelection"), closeClass: "closeDialog", onShow: fadeIn, onHide: fadeOut});
@@ -49,7 +49,7 @@
</h:panelGroup>
<a:commandLink id="find" styleClass="button" reRender="dialogOwnerSelectionContent"
- oncomplete="$('#dialogOwnerSelection').jqmAddClose('.closeDialog')"
+ oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog')"
action="#{userSearch.find()}"
tabindex="20" accesskey="F"><span class="buttonLabel"><u>F</u>ind</span></a:commandLink>
@@ -63,7 +63,7 @@
rendered="#{userSearch.rowCount > 0}">
<a:commandLink action="#{userSearch.firstPage()}" rendered="#{userSearch.previousPageAvailable}" tabindex="20"
- oncomplete="$('#dialogOwnerSelection').jqmAddClose('.closeDialog')"
+ oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog')"
reRender="dialogOwnerSelectionContent">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.first.gif" width="13" height="11"/>
</a:commandLink>
@@ -71,7 +71,7 @@
rendered="#{!userSearch.previousPageAvailable}"/>
<a:commandLink action="#{userSearch.previousPage()}" rendered="#{userSearch.previousPageAvailable}" tabindex="20"
- oncomplete="$('#dialogOwnerSelection').jqmAddClose('.closeDialog')"
+ oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog')"
reRender="dialogOwnerSelectionContent">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.previous.gif" width="13" height="11"/>
</a:commandLink>
@@ -81,7 +81,7 @@
<h:outputText value="Found: #{userSearch.rowCount} member(s)"/>
<a:commandLink action="#{userSearch.nextPage()}" rendered="#{userSearch.nextPageAvailable}" tabindex="20"
- oncomplete="$('#dialogOwnerSelection').jqmAddClose('.closeDialog')"
+ oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog')"
reRender="dialogOwnerSelectionContent">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.next.gif" width="13" height="11"/>
</a:commandLink>
@@ -89,7 +89,7 @@
rendered="#{!userSearch.nextPageAvailable}"/>
<a:commandLink action="#{userSearch.lastPage()}" rendered="#{userSearch.nextPageAvailable}" tabindex="20"
- oncomplete="$('#dialogOwnerSelection').jqmAddClose('.closeDialog')"
+ oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog')"
reRender="dialogOwnerSelectionContent">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.last.gif" width="13" height="11"/>
</a:commandLink>
@@ -116,7 +116,7 @@
<h:column>
<f:facet name="header">
<a:commandLink action="#{userSearch.sortBy('username')}" tabindex="20" reRender="dialogOwnerSelectionContent"
- oncomplete="$('#dialogOwnerSelection').jqmAddClose('.closeDialog')">
+ oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog')">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'username'}"/>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
@@ -131,7 +131,7 @@
<h:column>
<f:facet name="header">
<a:commandLink action="#{userSearch.sortBy('firstname')}" tabindex="20" reRender="dialogOwnerSelectionContent"
- oncomplete="$('#dialogOwnerSelection').jqmAddClose('.closeDialog')">
+ oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog')">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'firstname'}"/>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
@@ -145,7 +145,7 @@
<h:column>
<f:facet name="header">
<a:commandLink action="#{userSearch.sortBy('lastname')}" tabindex="20" reRender="dialogOwnerSelectionContent"
- oncomplete="$('#dialogOwnerSelection').jqmAddClose('.closeDialog')">
+ oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog')">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'lastname'}"/>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
@@ -159,7 +159,7 @@
<h:column>
<f:facet name="header">
<a:commandLink action="#{userSearch.sortBy('email')}" tabindex="20" reRender="dialogOwnerSelectionContent"
- oncomplete="$('#dialogOwnerSelection').jqmAddClose('.closeDialog')">
+ oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog')">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'email'}"/>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
1.2 +1 -1 jboss-seam/examples/wiki/view/includes/deleteConfirmation.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: deleteConfirmation.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/deleteConfirmation.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- deleteConfirmation.xhtml 4 May 2007 12:35:29 -0000 1.1
+++ deleteConfirmation.xhtml 4 May 2007 18:25:51 -0000 1.2
@@ -9,7 +9,7 @@
<ui:param name="dialogId" value="dialogDelete"/>
<ui:define name="dialogInit">
- <script type="text/javascript">$(function() {
+ <script type="text/javascript">jQuery(function() {
jsf('dialogDeletePopup')
.css({ minWidth: "200px", minHeight: "150px", width: "300px;", height: "150px;", top: "300px", left: "300px"})
.jqm({trigger: jsf("openDialogDelete"), closeClass: "closeDialog", onShow: fadeIn, onHide: fadeOut});
1.2 +1 -1 jboss-seam/examples/wiki/view/includes/popupDialog.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: popupDialog.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/popupDialog.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- popupDialog.xhtml 4 May 2007 12:35:29 -0000 1.1
+++ popupDialog.xhtml 4 May 2007 18:25:51 -0000 1.2
@@ -11,7 +11,7 @@
<ui:insert name="dialogInit"/>
- <script type="text/javascript">$(function() {
+ <script type="text/javascript">jQuery(function() {
jsf('#{dialogId}Popup').Resizable({
minTop: 1,
dragHandle: "##{dialogId}Head",
1.3 +15 -19 jboss-seam/examples/wiki/view/includes/directorySelector.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: directorySelector.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/directorySelector.xhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- directorySelector.xhtml 4 May 2007 12:35:29 -0000 1.2
+++ directorySelector.xhtml 4 May 2007 18:25:51 -0000 1.3
@@ -10,7 +10,7 @@
<ui:param name="dialogId" value="dialogDirectorySelection"/>
<ui:define name="dialogInit">
- <script type="text/javascript">$(function() {
+ <script type="text/javascript">jQuery(function() {
jsf('dialogDirectorySelectionPopup')
.css({ minWidth: "250px", minHeight: "250px", width: "250px;", height: "250px;", top: "200px", left: "200px"})
.jqm({trigger: jsf("openDialogDirectorySelection"), closeClass: "closeDialog", onShow: fadeIn, onHide: fadeOut});
@@ -19,10 +19,7 @@
<ui:define name="dialogTitle">Select parent directory...</ui:define>
<ui:define name="dialogContent">
- The RichFaces tree component is currently broken (lots of JavaScript errors which bomb jQuery)...
-
- <!-- /*
- <h:form rendered="false">
+ <h:form>
<rich:tree id="directoryTree" switchType="ajax"
value="#{writableDirectoryTree}" var="d"
style="margin: 10px;"
@@ -30,14 +27,13 @@
iconLeaf="/themes/default/img/icon.dir.gif"
selectedClass="activeTab closeDialog"
ajaxSubmitSelection="true"
-
+ nodeSelectListener="#{nodeHome.parentDirectorySelected}"
reRender="directoryNameDisplay, content">
<rich:treeNode type="simpleNode">
<h:outputText value="#{d.id} - #{d.name}"/>
</rich:treeNode>
</rich:tree>
</h:form>
- */ -->
</ui:define>
More information about the jboss-cvs-commits
mailing list