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 2011/08/10 16:07:50 UTC

svn commit: r1156191 - in /myfaces/tobago/trunk: tobago-example/tobago-example-test/src/main/webapp/tc/hidden/ tobago-example/tobago-example-test/src/main/webapp/tc/tabGroup/ tobago-example11/tobago-example11-test/src/main/webapp/tc/hidden/ tobago-them...

Author: lofwyr
Date: Wed Aug 10 14:07:49 2011
New Revision: 1156191

URL: http://svn.apache.org/viewvc?rev=1156191&view=rev
Log:
we should use "jQuery" instead of "$"

Modified:
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/hidden/hidden.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/tabGroup/client.xhtml
    myfaces/tobago/trunk/tobago-example11/tobago-example11-test/src/main/webapp/tc/hidden/hidden.xhtml
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.java
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/logging.js
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/hidden/hidden.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/hidden/hidden.xhtml?rev=1156191&r1=1156190&r2=1156191&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/hidden/hidden.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/hidden/hidden.xhtml Wed Aug 10 14:07:49 2011
@@ -50,9 +50,9 @@
     <tc:script>
 
       function fillHiddenFields() {
-        $('#page\\:h1').val("new " + $('#page\\:h1').val());
-        $('#page\\:h2').val("new " + $('#page\\:h2').val());
-        $('#page\\:h3').val("new " + $('#page\\:h3').val());
+        jQuery('#page\\:h1').val("new " + jQuery('#page\\:h1').val());
+        jQuery('#page\\:h2').val("new " + jQuery('#page\\:h2').val());
+        jQuery('#page\\:h3').val("new " + jQuery('#page\\:h3').val());
       }
       
       // todo: the test code is not full automated

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/tabGroup/client.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/tabGroup/client.xhtml?rev=1156191&r1=1156190&r2=1156191&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/tabGroup/client.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/tabGroup/client.xhtml Wed Aug 10 14:07:49 2011
@@ -50,8 +50,8 @@
       
     </tc:box>
 
-    <tc:button onclick="$('.tobago-tabGroup').hide()" label="hide"/>
-    <tc:button onclick="$('.tobago-tabGroup').show()" label="show"/>
+    <tc:button onclick="jQuery('.tobago-tabGroup').hide()" label="hide"/>
+    <tc:button onclick="jQuery('.tobago-tabGroup').show()" label="show"/>
 
   </tc:page>
 </f:view>

Modified: myfaces/tobago/trunk/tobago-example11/tobago-example11-test/src/main/webapp/tc/hidden/hidden.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example11/tobago-example11-test/src/main/webapp/tc/hidden/hidden.xhtml?rev=1156191&r1=1156190&r2=1156191&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example11/tobago-example11-test/src/main/webapp/tc/hidden/hidden.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example11/tobago-example11-test/src/main/webapp/tc/hidden/hidden.xhtml Wed Aug 10 14:07:49 2011
@@ -50,9 +50,9 @@
     <tc:script>
 
       function fillHiddenFields() {
-        $('#page\\:h1').val("new " + $('#page\\:h1').val());
-        $('#page\\:h2').val("new " + $('#page\\:h2').val());
-        $('#page\\:h3').val("new " + $('#page\\:h3').val());
+        jQuery('#page\\:h1').val("new " + jQuery('#page\\:h1').val());
+        jQuery('#page\\:h2').val("new " + jQuery('#page\\:h2').val());
+        jQuery('#page\\:h3').val("new " + jQuery('#page\\:h3').val());
       }
       
       // todo: the test code is not full automated

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.java?rev=1156191&r1=1156190&r2=1156191&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.java Wed Aug 10 14:07:49 2011
@@ -77,7 +77,7 @@ public class MenuCommandRenderer extends
       String hiddenId = checkbox.getClientId(facesContext);
       // the function toggles true <-> false
       String setValue = JQueryUtils.selectId(hiddenId) 
-          + ".each(function(){$(this).val($(this).val() == 'true' ? 'false' : 'true')}); ";
+          + ".each(function(){jQuery(this).val(jQuery(this).val() == 'true' ? 'false' : 'true')}); ";
       encodeItem(facesContext, writer, menu, label, setValue + submit, disabled, firstLevel, image);
       encodeHidden(writer, hiddenId, checked);
     } else if (menu.getFacet(Facets.RADIO) != null) {

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/logging.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/logging.js?rev=1156191&r1=1156190&r2=1156191&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/logging.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/logging.js Wed Aug 10 14:07:49 2011
@@ -306,7 +306,7 @@ LOG.LogArea.prototype.initialize = funct
     LOG.addAppender(this);
 
     /* Select the logging area with jQuery. TODO: The selector is fragile! */
-    $("body > .tobagoLogArea").draggable();
+    jQuery("body > .tobagoLogArea").draggable();
 };
 
 LOG.LogArea.prototype.show = function() {

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js?rev=1156191&r1=1156190&r2=1156191&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js Wed Aug 10 14:07:49 2011
@@ -261,7 +261,7 @@ Tobago.Menu.init = function(elements) {
       elements, ".tobago-toolBar-menu .tobago-boxToolBar-menu .tobago-tabGroupToolBar-menu");
   // a click on toolBar menu opener -> forward to .tobago-menu-markup-top
   toolBarMenu.click(function(event) {
-    $(this).next().find('a').click();
+    jQuery(this).next().find('a').click();
     event.stopPropagation();
   });