[jboss-cvs] jboss-seam/examples/wiki/view/themes/default ...

Fri May 4 14:25:51 EDT 2007

  User: cbauer  
  Date: 07/05/04 14:25:51

  Modified:    examples/wiki/view/themes/default  template.xhtml
  Log:
  Fixed jQuery/RichFaces conflicts (except tree)
  
  Revision  Changes    Path
  1.22      +4 -15     jboss-seam/examples/wiki/view/themes/default/template.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: template.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/themes/default/template.xhtml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- template.xhtml	4 May 2007 12:35:29 -0000	1.21
  +++ template.xhtml	4 May 2007 18:25:51 -0000	1.22
  @@ -32,7 +32,7 @@
               var realId = document.getElementById(id).title;
               //alert("FOR: '" + id + "' FOUND: '"+ realId + "'");
               var element = document.getElementById(realId);
  -            return $(element);
  +            return jQuery(element);
           }
           var fadeIn = function(hash) { hash.w.fadeIn('fast',function(){ hash.o.show(); }); };
           var fadeOut = function(hash) { hash.w.fadeOut('fast',function(){ hash.o.remove(); }); };
  @@ -40,20 +40,9 @@
       <script type="text/javascript" src="#{themePath}/js/jquery.js"></script>
       <script type="text/javascript" src="#{themePath}/js/interface.js"></script>
       <script type="text/javascript" src="#{themePath}/js/jqModal.js"></script>
  -    <script type="text/javascript">$(function() {
  -
  -        /* jQuery example
  -        jsf("documentDisplay_").find("a").hover(
  -            function() {
  -                $(this).parents("div").css("background", "lightGreen")
  -            },
  -            function() {
  -                $(this).parents("div").css("background", "white")
  -            }
  -        );
  -        */
  -
  -    });</script>
  +    <script type="text/javascript">
  +        jQuery.noConflict(); // Avoid conflicts with the RichFaces/Prototype library
  +    </script>
   </head>
   
   <body>