Index: README.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/jquery_update/README.txt,v retrieving revision 1.1.4.1 diff -u -p -r1.1.4.1 README.txt --- README.txt 2 May 2008 21:05:06 -0000 1.1.4.1 +++ README.txt 29 May 2008 18:54:55 -0000 @@ -1,27 +1,32 @@ -This module facilitates the upgrade of JQuery in Drupal 5. JQuery 1.0.1 is -included with Drupal 5, however it is not very well supported in the JQuery -community. In order to use most current and advanced JQuery functionality -you will want to build off a newer version of JQuery. This module includes -John Resig's compat-1.0.js and compat-1.1js plugins compiled into a compat.js file -that provides backwards compatiblity for newer versions of JQuery to work with the JS -code in Drupal 5. +/* $Id$ */ -The main issue with this module is that you will need to *copy* all files from the jquery_update/misc folder -and place them in Drupal core's misc/ folder, replacing each file with these new updated js files. +This module facilitates the upgrade of jQuery in Drupal 5. jQuery 1.0.1 is +included with Drupal 5, however it is not very well supported in the jQuery +community. In order to use most current and advanced jQuery functionality +you will want to build off a newer version of jQuery. This module includes +John Resig's compat-1.0.js and compat-1.1js plugins compiled into a compat.js +file that provides backwards compatiblity for newer versions of jQuery to work +with JavaScript code in Drupal 5. + +The main issue with this module is that you will need to *copy* all *.js files +from the jquery_update/misc folder and place them in Drupal core's misc/ folder, +replacing each file with these updated JavaScript files. -If you fail to do this, the JQuery Update module will warn you about this problem. +If you fail to do this, the jQuery Update module will warn you about this +problem. INSTALLATION: 1) Place this module directory in your modules folder (this will usually be -"sites/all/modules/"). + "sites/all/modules/"). 2) Enable the module. -3) Copy all js files from the jquery_update/misc folder and place them in Drupal core's misc/ folder replacing the files -that already exist. +3) Copy all *.js files from the jquery_update/misc folder and place them in + Drupal core's misc/ folder, replacing the files that already exist. -Note: You will receive a warning message in the Drupal administration area if you do not perform -this step correctly. + Note: You will receive a warning message in Drupal's administration area if + you do not perform this step correctly. + +You will need to repeat step #3 whenever you update your Drupal installation. -You will need to repeat step #3 if/when you update your Drupal installation. Index: jquery_update.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/jquery_update/jquery_update.info,v retrieving revision 1.1.2.1.2.1 diff -u -p -r1.1.2.1.2.1 jquery_update.info --- jquery_update.info 2 May 2008 21:05:06 -0000 1.1.2.1.2.1 +++ jquery_update.info 29 May 2008 18:54:27 -0000 @@ -1,4 +1,4 @@ -; $Id: $ -name = JQuery Update -description = Updates Drupal to use the latest version of JQuery. +; $Id$ +name = jQuery Update +description = Updates Drupal to use the latest version of jQuery. package = User Interface Index: jquery_update.install =================================================================== RCS file: jquery_update.install diff -N jquery_update.install --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ jquery_update.install 29 May 2008 18:57:22 -0000 @@ -0,0 +1,41 @@ + $t('Please copy jQuery'), + 'description' => $t('In order for the jQuery Update module to work correctly, please copy the file at %mod and use it to replace %core.', array('%core' => 'misc/jquery.js', '%mod' => $path)), + 'severity' => $phase == 'install' ? REQUIREMENT_WARNING : REQUIREMENT_ERROR, + 'value' => $t('Copy jquery.js'), + ); + } + elseif (!file_exists($path)) { + $requirements['jquery'] = array( + 'title' => $t('jquery.js no longer exists in the jQuery Update directory'), + 'description' => $t('You probably moved rather than copied the jquery.js file from %mod to %core. You should leave a copy of this file in the module directory so that will not lose this file when you upgrade to another revision of Drupal.', array('%core' => 'misc/jquery.js', '%mod' => $path)), + 'severity' => $phase == 'install' ? REQUIREMENT_WARNING : REQUIREMENT_ERROR, + 'value' => $t('Copy jquery.js'), + ); + } + elseif ($phase == 'runtime') { + $requirements['jquery'] = array( + 'title' => $t('jQuery Update'), + 'description' => $t('The current installed version of jQuery is !version', array('%core' => 'misc/jquery.js', '%mod' => $path, '!version' => '')), + 'severity' => REQUIREMENT_OK, + 'value' => $t('Installed correctly'), + ); + } + } + return $requirements; +} Index: jquery_update.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/jquery_update/jquery_update.module,v retrieving revision 1.1.2.3.2.1 diff -u -p -r1.1.2.3.2.1 jquery_update.module --- jquery_update.module 2 May 2008 21:05:06 -0000 1.1.2.3.2.1 +++ jquery_update.module 29 May 2008 18:54:12 -0000 @@ -3,58 +3,21 @@ /** * @abstract - * This Drupal module helps with updating core JQuery. - * Drupal 5 comes with JQuery 1.0.1 + * This Drupal module helps with updating core jQuery. + * Drupal 5.x is shipped with jQuery 1.0.1. * This module helps you to install a later version. + * + * @see jquery_update.install */ /** - * Implementation of hook_menu() + * Implementation of hook_menu(). */ function jquery_update_menu($may_cache) { $items = array(); if (!$may_cache) { - $path = drupal_get_path('module', 'jquery_update'); - drupal_add_js($path .'/compat.js'); + drupal_add_js(drupal_get_path('module', 'jquery_update') . '/compat.js'); } return $items; } -/** - * Implementation of hook_requirements() - */ -function jquery_update_requirements($phase) { - $requirements = array(); - $t = get_t(); - switch ($phase) { - case 'install' : - case 'runtime' : - $path = drupal_get_path('module', 'jquery_update') .'/misc/jquery.js'; - if (file_exists($path) && file_exists('misc/jquery.js') && md5_file($path) != md5_file('misc/jquery.js')) { - $requirements['jquery'] = array( - 'title' => $t('Please copy JQuery'), - 'description' => $t('In order for the JQuery Update module to work correctly, please copy the file at %mod and use it to replace %core.', array('%core' => 'misc/jquery.js', '%mod' => $path)), - 'severity' => $phase == 'install' ? REQUIREMENT_WARNING : REQUIREMENT_ERROR, - 'value' => $t('Copy jquery.js'), - ); - } - elseif (!file_exists($path)) { - $requirements['jquery'] = array( - 'title' => $t('jquery.js no longer exists in the JQuery Update directory'), - 'description' => $t('You probably moved rather than copied the jquery.js file from %mod to %core. You should leave a copy of this file in the module directory so that will not lose this file when you upgrade to another revision of Drupal.', array('%core' => 'misc/jquery.js', '%mod' => $path)), - 'severity' => $phase == 'install' ? REQUIREMENT_WARNING : REQUIREMENT_ERROR, - 'value' => $t('Copy jquery.js'), - ); - } - elseif ($phase == 'runtime') { - $requirements['jquery'] = array( - 'title' => $t('JQuery Update'), - 'description' => t('The current installed version of JQuery is !version', - array('%core' => 'misc/jquery.js', '%mod' => $path, '!version' => '')), - 'severity' => REQUIREMENT_OK, - 'value' => $t('Installed correctly'), - ); - } - } - return $requirements; -} Index: misc/collapse.js =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/jquery_update/misc/Attic/collapse.js,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 collapse.js --- misc/collapse.js 2 May 2008 21:05:06 -0000 1.1.2.1 +++ misc/collapse.js 30 May 2008 15:39:15 -0000 @@ -72,6 +72,7 @@ if (Drupal.jsEnabled) { } return false; })).after($('
').append(fieldset.children(':not(legend)'))); + $('fieldset.collapsed > div.fieldset-wrapper').not(':has(div.fieldset-wrapper)').css({height: 'auto'}); }); }); } Index: misc/jquery.js =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/jquery_update/misc/Attic/jquery.js,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 jquery.js --- misc/jquery.js 2 May 2008 21:05:06 -0000 1.1.2.1 +++ misc/jquery.js 29 May 2008 19:08:08 -0000 @@ -1,11 +1,11 @@ /* - * jQuery 1.2.3 - New Wave Javascript + * jQuery 1.2.6 - New Wave Javascript * * Copyright (c) 2008 John Resig (jquery.com) * Dual licensed under the MIT (MIT-LICENSE.txt) * and GPL (GPL-LICENSE.txt) licenses. * - * $Date: 2008/05/02 21:05:06 $ - * $Rev: 4663 $ + * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $ + * $Rev: 5685 $ */ -eval(function(p,a,c,k,e,r){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(J(){7(1e.3N)L w=1e.3N;L E=1e.3N=J(a,b){K 1B E.2l.4T(a,b)};7(1e.$)L D=1e.$;1e.$=E;L u=/^[^<]*(<(.|\\s)+>)[^>]*$|^#(\\w+)$/;L G=/^.[^:#\\[\\.]*$/;E.1n=E.2l={4T:J(d,b){d=d||T;7(d.15){6[0]=d;6.M=1;K 6}N 7(1o d=="25"){L c=u.2O(d);7(c&&(c[1]||!b)){7(c[1])d=E.4a([c[1]],b);N{L a=T.5J(c[3]);7(a)7(a.2w!=c[3])K E().2s(d);N{6[0]=a;6.M=1;K 6}N d=[]}}N K 1B E(b).2s(d)}N 7(E.1q(d))K 1B E(T)[E.1n.21?"21":"3U"](d);K 6.6E(d.1k==1M&&d||(d.5h||d.M&&d!=1e&&!d.15&&d[0]!=10&&d[0].15)&&E.2I(d)||[d])},5h:"1.2.3",87:J(){K 6.M},M:0,22:J(a){K a==10?E.2I(6):6[a]},2F:J(b){L a=E(b);a.54=6;K a},6E:J(a){6.M=0;1M.2l.1g.1i(6,a);K 6},R:J(a,b){K E.R(6,a,b)},4X:J(b){L a=-1;6.R(J(i){7(6==b)a=i});K a},1J:J(c,a,b){L d=c;7(c.1k==4e)7(a==10)K 6.M&&E[b||"1J"](6[0],c)||10;N{d={};d[c]=a}K 6.R(J(i){Q(c 1p d)E.1J(b?6.W:6,c,E.1l(6,d[c],b,i,c))})},1j:J(b,a){7((b==\'27\'||b==\'1R\')&&2M(a)<0)a=10;K 6.1J(b,a,"2o")},1u:J(b){7(1o b!="3V"&&b!=V)K 6.4x().3t((6[0]&&6[0].2i||T).5r(b));L a="";E.R(b||6,J(){E.R(6.3p,J(){7(6.15!=8)a+=6.15!=1?6.6K:E.1n.1u([6])})});K a},5m:J(b){7(6[0])E(b,6[0].2i).5k().3o(6[0]).2c(J(){L a=6;2b(a.1C)a=a.1C;K a}).3t(6);K 6},8w:J(a){K 6.R(J(){E(6).6z().5m(a)})},8p:J(a){K 6.R(J(){E(6).5m(a)})},3t:J(){K 6.3O(18,P,S,J(a){7(6.15==1)6.38(a)})},6q:J(){K 6.3O(18,P,P,J(a){7(6.15==1)6.3o(a,6.1C)})},6o:J(){K 6.3O(18,S,S,J(a){6.1a.3o(a,6)})},5a:J(){K 6.3O(18,S,P,J(a){6.1a.3o(a,6.2B)})},3h:J(){K 6.54||E([])},2s:J(b){L c=E.2c(6,J(a){K E.2s(b,a)});K 6.2F(/[^+>] [^+>]/.17(b)||b.1f("..")>-1?E.57(c):c)},5k:J(e){L f=6.2c(J(){7(E.14.1d&&!E.3E(6)){L a=6.69(P),4Y=T.3s("1x");4Y.38(a);K E.4a([4Y.3d])[0]}N K 6.69(P)});L d=f.2s("*").4R().R(J(){7(6[F]!=10)6[F]=V});7(e===P)6.2s("*").4R().R(J(i){7(6.15==3)K;L c=E.O(6,"2R");Q(L a 1p c)Q(L b 1p c[a])E.16.1b(d[i],a,c[a][b],c[a][b].O)});K f},1E:J(b){K 6.2F(E.1q(b)&&E.3y(6,J(a,i){K b.1P(a,i)})||E.3e(b,6))},56:J(b){7(b.1k==4e)7(G.17(b))K 6.2F(E.3e(b,6,P));N b=E.3e(b,6);L a=b.M&&b[b.M-1]!==10&&!b.15;K 6.1E(J(){K a?E.33(6,b)<0:6!=b})},1b:J(a){K!a?6:6.2F(E.37(6.22(),a.1k==4e?E(a).22():a.M!=10&&(!a.12||E.12(a,"3u"))?a:[a]))},3H:J(a){K a?E.3e(a,6).M>0:S},7j:J(a){K 6.3H("."+a)},5O:J(b){7(b==10){7(6.M){L c=6[0];7(E.12(c,"2k")){L e=c.3T,5I=[],11=c.11,2X=c.U=="2k-2X";7(e<0)K V;Q(L i=2X?e:0,2f=2X?e+1:11.M;i<2f;i++){L d=11[i];7(d.2p){b=E.14.1d&&!d.9J.1A.9y?d.1u:d.1A;7(2X)K b;5I.1g(b)}}K 5I}N K(6[0].1A||"").1r(/\\r/g,"")}K 10}K 6.R(J(){7(6.15!=1)K;7(b.1k==1M&&/5u|5t/.17(6.U))6.3k=(E.33(6.1A,b)>=0||E.33(6.31,b)>=0);N 7(E.12(6,"2k")){L a=b.1k==1M?b:[b];E("98",6).R(J(){6.2p=(E.33(6.1A,a)>=0||E.33(6.1u,a)>=0)});7(!a.M)6.3T=-1}N 6.1A=b})},3q:J(a){K a==10?(6.M?6[0].3d:V):6.4x().3t(a)},6S:J(a){K 6.5a(a).1V()},6Z:J(i){K 6.2K(i,i+1)},2K:J(){K 6.2F(1M.2l.2K.1i(6,18))},2c:J(b){K 6.2F(E.2c(6,J(a,i){K b.1P(a,i,a)}))},4R:J(){K 6.1b(6.54)},O:J(d,b){L a=d.23(".");a[1]=a[1]?"."+a[1]:"";7(b==V){L c=6.5n("8P"+a[1]+"!",[a[0]]);7(c==10&&6.M)c=E.O(6[0],d);K c==V&&a[1]?6.O(a[0]):c}N K 6.1N("8K"+a[1]+"!",[a[0],b]).R(J(){E.O(6,d,b)})},35:J(a){K 6.R(J(){E.35(6,a)})},3O:J(g,f,h,d){L e=6.M>1,3n;K 6.R(J(){7(!3n){3n=E.4a(g,6.2i);7(h)3n.8D()}L b=6;7(f&&E.12(6,"1O")&&E.12(3n[0],"4v"))b=6.3S("1U")[0]||6.38(6.2i.3s("1U"));L c=E([]);E.R(3n,J(){L a=e?E(6).5k(P)[0]:6;7(E.12(a,"1m")){c=c.1b(a)}N{7(a.15==1)c=c.1b(E("1m",a).1V());d.1P(b,a)}});c.R(6A)})}};E.2l.4T.2l=E.2l;J 6A(i,a){7(a.3Q)E.3P({1c:a.3Q,3l:S,1H:"1m"});N E.5g(a.1u||a.6x||a.3d||"");7(a.1a)a.1a.34(a)}E.1s=E.1n.1s=J(){L b=18[0]||{},i=1,M=18.M,5c=S,11;7(b.1k==8d){5c=b;b=18[1]||{};i=2}7(1o b!="3V"&&1o b!="J")b={};7(M==1){b=6;i=0}Q(;i