Index: misc/teaser.js =================================================================== RCS file: /cvs/drupal/drupal/misc/teaser.js,v retrieving revision 1.12 diff -u -r1.12 teaser.js --- misc/teaser.js 9 Jan 2008 12:10:04 -0000 1.12 +++ misc/teaser.js 31 Jan 2008 06:15:41 -0000 @@ -1,5 +1,7 @@ // $Id: teaser.js,v 1.12 2008/01/09 12:10:04 goba Exp $ +(function($) { + /** * Auto-attach for teaser behavior. * @@ -94,3 +96,5 @@ }); }; + +})(jQuery); Index: misc/batch.js =================================================================== RCS file: /cvs/drupal/drupal/misc/batch.js,v retrieving revision 1.4 diff -u -r1.4 batch.js --- misc/batch.js 21 Oct 2007 18:59:01 -0000 1.4 +++ misc/batch.js 31 Jan 2008 06:15:41 -0000 @@ -1,5 +1,7 @@ // $Id: batch.js,v 1.4 2007/10/21 18:59:01 goba Exp $ +(function($) { + /** * Attaches the batch behavior to progress bars. */ @@ -36,3 +38,5 @@ progress.startMonitoring(uri+'&op=do', 10); }); }; + +})(jQuery); Index: misc/collapse.js =================================================================== RCS file: /cvs/drupal/drupal/misc/collapse.js,v retrieving revision 1.16 diff -u -r1.16 collapse.js --- misc/collapse.js 12 Sep 2007 18:29:32 -0000 1.16 +++ misc/collapse.js 31 Jan 2008 06:15:41 -0000 @@ -1,4 +1,5 @@ // $Id: collapse.js,v 1.16 2007/09/12 18:29:32 goba Exp $ +(function($) { /** * Toggle the visibility of a fieldset using smooth animations @@ -71,3 +72,5 @@ .addClass('collapse-processed'); }); }; + +})(jQuery); Index: misc/tabledrag.js =================================================================== RCS file: /cvs/drupal/drupal/misc/tabledrag.js,v retrieving revision 1.13 diff -u -r1.13 tabledrag.js --- misc/tabledrag.js 19 Dec 2007 10:58:35 -0000 1.13 +++ misc/tabledrag.js 31 Jan 2008 06:15:41 -0000 @@ -1,5 +1,7 @@ // $Id: tabledrag.js,v 1.13 2007/12/19 10:58:35 goba Exp $ +(function($) { + /** * Drag and drop table rows with field manipulation. * @@ -1079,3 +1081,5 @@ Drupal.theme.prototype.tableDragChangedWarning = function () { return '
' + Drupal.theme('tableDragChangedMarker') + ' ' + Drupal.t("Changes made in this table will not be saved until the form is submitted.") + '
'; }; + +})(jQuery); Index: misc/ahah.js =================================================================== RCS file: /cvs/drupal/drupal/misc/ahah.js,v retrieving revision 1.7 diff -u -r1.7 ahah.js --- misc/ahah.js 4 Jan 2008 11:53:21 -0000 1.7 +++ misc/ahah.js 31 Jan 2008 06:15:41 -0000 @@ -1,5 +1,7 @@ // $Id: ahah.js,v 1.7 2008/01/04 11:53:21 goba Exp $ +(function($) { + /** * Provides AJAX-like page updating via AHAH (Asynchronous HTML and HTTP). * @@ -210,3 +212,5 @@ // Re-enable the element. $(this.element).removeClass('progess-disabled').attr('disabled', false); }; + +})(jQuery); Index: misc/tableselect.js =================================================================== RCS file: /cvs/drupal/drupal/misc/tableselect.js,v retrieving revision 1.8 diff -u -r1.8 tableselect.js --- misc/tableselect.js 19 Nov 2007 12:15:16 -0000 1.8 +++ misc/tableselect.js 31 Jan 2008 06:15:41 -0000 @@ -1,5 +1,7 @@ // $Id: tableselect.js,v 1.8 2007/11/19 12:15:16 goba Exp $ +(function($) { + Drupal.behaviors.tableSelect = function (context) { $('form table:has(th.select-all):not(.tableSelect-processed)', context).each(Drupal.tableSelect); }; @@ -85,3 +87,5 @@ } } }; + +})(jQuery); Index: misc/autocomplete.js =================================================================== RCS file: /cvs/drupal/drupal/misc/autocomplete.js,v retrieving revision 1.23 diff -u -r1.23 autocomplete.js --- misc/autocomplete.js 4 Jan 2008 11:53:21 -0000 1.23 +++ misc/autocomplete.js 31 Jan 2008 06:15:41 -0000 @@ -1,5 +1,7 @@ // $Id: autocomplete.js,v 1.23 2008/01/04 11:53:21 goba Exp $ +(function($) { + /** * Attaches the autocomplete behavior to all required fields */ @@ -296,3 +298,5 @@ if (this.timer) clearTimeout(this.timer); this.searchString = ''; }; + +})(jQuery); Index: misc/tableheader.js =================================================================== RCS file: /cvs/drupal/drupal/misc/tableheader.js,v retrieving revision 1.13 diff -u -r1.13 tableheader.js --- misc/tableheader.js 15 Jan 2008 10:43:00 -0000 1.13 +++ misc/tableheader.js 31 Jan 2008 06:15:41 -0000 @@ -1,4 +1,5 @@ // $Id: tableheader.js,v 1.13 2008/01/15 10:43:00 goba Exp $ +(function($) { Drupal.behaviors.tableHeader = function (context) { // This breaks in anything less than IE 7. Prevent it from running. @@ -93,3 +94,5 @@ }; $(window).resize(resize); }; + +})(jQuery); Index: misc/progress.js =================================================================== RCS file: /cvs/drupal/drupal/misc/progress.js,v retrieving revision 1.20 diff -u -r1.20 progress.js --- misc/progress.js 4 Jan 2008 11:53:21 -0000 1.20 +++ misc/progress.js 31 Jan 2008 06:15:41 -0000 @@ -1,5 +1,7 @@ // $Id: progress.js,v 1.20 2008/01/04 11:53:21 goba Exp $ +(function($) { + /** * A progressbar object. Initialized with the given id. Must be inserted into * the DOM afterwards through progressBar.element. @@ -105,3 +107,5 @@ this.errorCallback(this); } }; + +})(jQuery); Index: misc/drupal.js =================================================================== RCS file: /cvs/drupal/drupal/misc/drupal.js,v retrieving revision 1.41 diff -u -r1.41 drupal.js --- misc/drupal.js 4 Jan 2008 11:53:21 -0000 1.41 +++ misc/drupal.js 31 Jan 2008 06:15:41 -0000 @@ -2,6 +2,8 @@ var Drupal = Drupal || { 'settings': {}, 'behaviors': {}, 'themes': {}, 'locale': {} }; +(function($) { + /** * Set the variable that indicates if JavaScript behaviors should be applied */ @@ -291,3 +293,5 @@ return '' + Drupal.checkPlain(str) + ''; } }; + +})(jQuery); Index: misc/form.js =================================================================== RCS file: /cvs/drupal/drupal/misc/form.js,v retrieving revision 1.1 diff -u -r1.1 form.js --- misc/form.js 12 Sep 2007 18:29:32 -0000 1.1 +++ misc/form.js 31 Jan 2008 06:15:41 -0000 @@ -1,5 +1,7 @@ // $Id: form.js,v 1.1 2007/09/12 18:29:32 goba Exp $ +(function($) { + Drupal.behaviors.multiselectSelector = function() { // Automatically selects the right radio button in a multiselect control. $('.multiselect select:not(.multiselectSelector-processed)') @@ -8,3 +10,5 @@ .attr('checked', true); }); }; + +})(jQuery); Index: misc/textarea.js =================================================================== RCS file: /cvs/drupal/drupal/misc/textarea.js,v retrieving revision 1.22 diff -u -r1.22 textarea.js --- misc/textarea.js 17 Jan 2008 19:31:56 -0000 1.22 +++ misc/textarea.js 31 Jan 2008 06:15:41 -0000 @@ -1,5 +1,7 @@ // $Id: textarea.js,v 1.22 2008/01/17 19:31:56 goba Exp $ +(function($) { + Drupal.behaviors.textarea = function(context) { $('textarea.resizable:not(.textarea-processed)', context).each(function() { // Avoid non-processed teasers. @@ -34,3 +36,5 @@ } }); }; + +})(jQuery); Index: modules/block/block.js =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.js,v retrieving revision 1.2 diff -u -r1.2 block.js --- modules/block/block.js 16 Dec 2007 10:36:53 -0000 1.2 +++ modules/block/block.js 31 Jan 2008 06:15:42 -0000 @@ -1,5 +1,7 @@ // $Id: block.js,v 1.2 2007/12/16 10:36:53 goba Exp $ +(function($) { + /** * Move a block in the blocks table from one region to another via select list. * @@ -93,3 +95,5 @@ }); }; }; + +})(jQuery); Index: modules/profile/profile.js =================================================================== RCS file: /cvs/drupal/drupal/modules/profile/profile.js,v retrieving revision 1.2 diff -u -r1.2 profile.js --- modules/profile/profile.js 8 Dec 2007 14:06:22 -0000 1.2 +++ modules/profile/profile.js 31 Jan 2008 06:15:42 -0000 @@ -1,5 +1,7 @@ // $Id: profile.js,v 1.2 2007/12/08 14:06:22 goba Exp $ +(function($) { + /** * Add functionality to the profile drag and drop table. * @@ -52,3 +54,5 @@ } }; }; + +})(jQuery); Index: modules/color/color.js =================================================================== RCS file: /cvs/drupal/drupal/modules/color/color.js,v retrieving revision 1.6 diff -u -r1.6 color.js --- modules/color/color.js 12 Sep 2007 18:29:32 -0000 1.6 +++ modules/color/color.js 31 Jan 2008 06:15:42 -0000 @@ -1,5 +1,7 @@ // $Id: color.js,v 1.6 2007/09/12 18:29:32 goba Exp $ +(function($) { + Drupal.behaviors.color = function (context) { // This behavior attaches by ID, so is only valid once on a page. if ($('#color_scheme_form .color-form.color-processed').size()) { @@ -249,3 +251,5 @@ // Render preview preview(); }; + +})(jQuery); Index: modules/comment/comment.js =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.js,v retrieving revision 1.5 diff -u -r1.5 comment.js --- modules/comment/comment.js 12 Sep 2007 18:29:32 -0000 1.5 +++ modules/comment/comment.js 31 Jan 2008 06:15:42 -0000 @@ -1,5 +1,7 @@ // $Id: comment.js,v 1.5 2007/09/12 18:29:32 goba Exp $ +(function($) { + Drupal.behaviors.comment = function (context) { var parts = new Array("name", "homepage", "mail"); var cookie = ''; @@ -33,3 +35,5 @@ return returnValue; }; + +})(jQuery); Index: misc/farbtastic/farbtastic.js =================================================================== RCS file: /cvs/drupal/drupal/misc/farbtastic/farbtastic.js,v retrieving revision 1.4 diff -u -r1.4 farbtastic.js --- misc/farbtastic/farbtastic.js 1 Jun 2007 09:05:45 -0000 1.4 +++ misc/farbtastic/farbtastic.js 31 Jan 2008 06:15:42 -0000 @@ -1,6 +1,8 @@ // $Id: farbtastic.js,v 1.4 2007/06/01 09:05:45 unconed Exp $ // Farbtastic 1.2 +(function($) { + jQuery.fn.farbtastic = function (callback) { $.farbtastic(this, callback); return this; @@ -326,4 +328,6 @@ if (callback) { fb.linkTo(callback); } -}; \ No newline at end of file +}; + +})(jQuery); Index: modules/openid/openid.js =================================================================== RCS file: /cvs/drupal/drupal/modules/openid/openid.js,v retrieving revision 1.6 diff -u -r1.6 openid.js --- modules/openid/openid.js 30 Jan 2008 22:11:22 -0000 1.6 +++ modules/openid/openid.js 31 Jan 2008 06:15:42 -0000 @@ -36,3 +36,5 @@ return false; }); }; + +})(jQuery); Index: modules/book/book.module =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.module,v retrieving revision 1.454 diff -u -r1.454 book.module --- modules/book/book.module 8 Jan 2008 10:35:41 -0000 1.454 +++ modules/book/book.module 31 Jan 2008 06:15:42 -0000 @@ -362,7 +362,7 @@ function _book_add_form_elements(&$form, $node) { // Need this for AJAX. $form['#cache'] = TRUE; - drupal_add_js("if (Drupal.jsEnabled) { $(document).ready(function() { $('#edit-book-pick-book').css('display', 'none'); }); }", 'inline'); + drupal_add_js("if (Drupal.jsEnabled) { jQuery(document).ready(function($) { $('#edit-book-pick-book').css('display', 'none'); }); }", 'inline'); $form['book'] = array( '#type' => 'fieldset', Index: modules/system/system.js =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.js,v retrieving revision 1.14 diff -u -r1.14 system.js --- modules/system/system.js 17 Dec 2007 23:43:43 -0000 1.14 +++ modules/system/system.js 31 Jan 2008 06:15:42 -0000 @@ -1,5 +1,7 @@ // $Id: system.js,v 1.14 2007/12/17 23:43:43 goba Exp $ +(function($) { + /** * Internal function to check using Ajax if clean URLs can be enabled on the * settings page. @@ -108,3 +110,5 @@ // Trigger the event handler to show the form input if necessary. $('select.date-format', context).trigger('change'); }; + +})(jQuery); Index: modules/user/user.js =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.js,v retrieving revision 1.6 diff -u -r1.6 user.js --- modules/user/user.js 12 Sep 2007 18:29:32 -0000 1.6 +++ modules/user/user.js 31 Jan 2008 06:15:43 -0000 @@ -1,5 +1,7 @@ // $Id: user.js,v 1.6 2007/09/12 18:29:32 goba Exp $ +(function($) { + /** * Attach handlers to evaluate the strength of any password fields and to check * that its confirmation is correct. @@ -186,3 +188,4 @@ }); }; +})(jQuery); Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.891 diff -u -r1.891 user.module --- modules/user/user.module 29 Jan 2008 18:56:56 -0000 1.891 +++ modules/user/user.module 31 Jan 2008 06:15:44 -0000 @@ -2388,7 +2388,7 @@ drupal_add_js(' // Global Killswitch if (Drupal.jsEnabled) { - $(document).ready(function() { + jQuery(document).ready(function($) { Drupal.setDefaultTimezone(); }); }', 'inline'); Index: modules/poll/poll.module =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v retrieving revision 1.263 diff -u -r1.263 poll.module --- modules/poll/poll.module 15 Jan 2008 07:57:46 -0000 1.263 +++ modules/poll/poll.module 31 Jan 2008 06:15:42 -0000 @@ -669,7 +669,7 @@ */ function theme_poll_choices($form) { // Change the button title to reflect the behavior when using JavaScript. - drupal_add_js('if (Drupal.jsEnabled) { $(document).ready(function() { $("#edit-poll-more").val("'. t('Add another choice') .'"); }); }', 'inline'); + drupal_add_js('if (Drupal.jsEnabled) { jQuery(document).ready(function($) { $("#edit-poll-more").val("'. t('Add another choice') .'"); }); }', 'inline'); $rows = array(); $headers = array( Index: modules/taxonomy/taxonomy.js =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.js,v retrieving revision 1.2 diff -u -r1.2 taxonomy.js --- modules/taxonomy/taxonomy.js 16 Dec 2007 10:36:53 -0000 1.2 +++ modules/taxonomy/taxonomy.js 31 Jan 2008 06:15:43 -0000 @@ -1,5 +1,7 @@ // $Id: taxonomy.js,v 1.2 2007/12/16 10:36:53 goba Exp $ +(function($) { + /** * Move a block in the blocks table from one region to another via select list. * @@ -34,3 +36,5 @@ } }; }; + +})(jQuery);