Commit b179a944 authored by webchick's avatar webchick
Browse files

#350275 by Rob Loach, starbow, and quicksketch: Upgrade to jQuery 1.3.2 and jQuery Forms 2.21.

parent 53ef28ec
......@@ -91,6 +91,8 @@ Drupal 7.0, xxxx-xx-xx (development version)
- Added RDF support:
* Modules can declare RDF namespaces which are serialized in the <html> tag
for RDFa support.
- Upgraded the core JavaScript library to jQuery version 1.3.2.
- Upgraded the jQuery Forms library to 2.21.
Drupal 6.0, 2008-02-13
----------------------
......
......@@ -184,12 +184,8 @@ Drupal.ahah.prototype.success = function (response, status) {
}
// Determine what effect use and what content will receive the effect, then
// show the new content. For browser compatibility, Safari is excluded from
// using effects on table rows.
if (($.browser.safari && $("tr.ahah-new-content", new_content).size() > 0)) {
new_content.show();
}
else if ($('.ahah-new-content', new_content).size() > 0) {
// show the new content.
if ($('.ahah-new-content', new_content).size() > 0) {
$('.ahah-new-content', new_content).hide();
new_content.show();
$(".ahah-new-content", new_content)[this.showEffect](this.showSpeed);
......
......@@ -2,7 +2,7 @@
/*
* jQuery Form Plugin
* version: 2.16 (17-OCT-2008)
* version: 2.21 (08-FEB-2009)
* @requires jQuery v1.2.2 or later
*
* Examples and documentation at: http://malsup.com/jquery/form/
......@@ -10,4 +10,4 @@
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl.html
*/
eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?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}(';(7($){$.p.Q=7(6){2(!4.B){R(\'Q: 2T r 2U - 2V 2W 19\');8 4}2(M 6==\'7\')6={N:6};6=$.1k({1l:4.I(\'1m\')||1a.2X.2Y(),C:4.I(\'24\')||\'25\'},6||{});3 S={};4.H(\'5-26-27\',[4,6,S]);2(S.S){R(\'Q: r 28 1x 5-26-27 H\');8 4}3 a=4.1y(6.T);2(6.h){6.J=6.h;F(3 n 1z 6.h){2(6.h[n]2Z 11){F(3 k 1z 6.h[n])a.u({9:n,o:6.h[n][k]})}w a.u({9:n,o:6.h[n]})}}2(6.1A&&6.1A(a,4,6)===G){R(\'Q: r 1n 1x 1A 30\');8 4}4.H(\'5-r-29\',[a,4,6,S]);2(S.S){R(\'Q: r 28 1x 5-r-29 H\');8 4}3 q=$.1B(a);2(6.C.31()==\'25\'){6.1l+=(6.1l.32(\'?\')>=0?\'&\':\'?\')+q;6.h=z}w 6.h=q;3 $5=4,U=[];2(6.1C)U.u(7(){$5.1C()});2(6.1D)U.u(7(){$5.1D()});2(!6.12&&6.13){3 2a=6.N||7(){};U.u(7(h){$(6.13).33(h).K(2a,2b)})}w 2(6.N)U.u(6.N);6.N=7(h,1E){F(3 i=0,D=U.B;i<D;i++)U[i].34(6,[h,1E,$5])};3 1F=$(\'E:35\',4).14();3 1G=G;F(3 j=0;j<1F.B;j++)2(1F[j])1G=L;2(6.2c||1G){2($.1b.36&&6.2d)$.37(6.2d,1H);w 1H()}w $.38(6);4.H(\'5-r-39\',[4,6]);8 4;7 1H(){3 5=$5[0];2($(\':E[@9=r]\',5).B){3a(\'3b: 3c 2e 3d 3e 3f 3g "r".\');8}3 l=$.1k({},$.2f,6);3 s=1I.1k(L,{},$.1k(L,{},$.2f),l);3 1c=\'3h\'+(1J 3i().3j());3 $d=$(\'<2c 1c="\'+1c+\'" 9="\'+1c+\'" />\');3 d=$d[0];2($.1b.2g||$.1b.2h)d.2i=\'3k:G;1K.3l("");\';$d.3m({3n:\'3o\',2j:\'-2k\',2l:\'-2k\'});3 f={1n:0,15:z,1d:z,1E:0,3p:\'n/a\',3q:7(){},2m:7(){},3r:7(){},3s:7(){4.1n=1;$d.I(\'2i\',\'3t:3u\')}};3 g=l.2n;2(g&&!$.1L++)$.1e.H("3v");2(g)$.1e.H("3w",[f,l]);2(s.2o&&s.2o(f,s)===G){s.2n&&1I.1L--;8}2(f.1n)8;3 1M=0;3 1N=0;3 16=5.O;2(16){3 n=16.9;2(n&&!16.1f){6.J=6.J||{};6.J[n]=16.o;2(16.C=="V"){6.J[9+\'.x\']=5.W;6.J[9+\'.y\']=5.X}}}1g(7(){3 t=$5.I(\'13\'),a=$5.I(\'1m\');$5.I({13:1c,24:\'3x\',1m:l.1l});2(!6.3y){$5.I({3z:\'2p/5-h\',3A:\'2p/5-h\'})}2(l.1O)1g(7(){1N=L;Y()},l.1O);3 1P=[];2q{2(6.J)F(3 n 1z 6.J)1P.u($(\'<E C="3B" 9="\'+n+\'" o="\'+6.J[n]+\'" />\').2r(5)[0]);$d.2r(\'1o\');d.2s?d.2s(\'2t\',Y):d.3C(\'2u\',Y,G);5.r()}3D{$5.I(\'1m\',a);t?$5.I(\'13\',t):$5.3E(\'13\');$(1P).2v()}},10);7 Y(){2(1M++)8;d.2w?d.2w(\'2t\',Y):d.3F(\'2u\',Y,G);3 1Q=0;3 1p=L;2q{2(1N)3G\'1O\';3 h,m;m=d.2x?d.2x.1K:d.2y?d.2y:d.1K;2(m.1o==z&&!1Q&&$.1b.2h){1Q=1;1M--;1g(Y,2z);8}f.15=m.1o?m.1o.3H:z;f.1d=m.2A?m.2A:m;f.2m=7(2B){3 2C={\'3I-C\':l.12};8 2C[2B]};2(l.12==\'3J\'||l.12==\'3K\'){3 1R=m.1S(\'1T\')[0];f.15=1R?1R.o:f.15}w 2(l.12==\'2D\'&&!f.1d&&f.15!=z){f.1d=2E(f.15)}h=$.3L(f,l.12)}3M(e){1p=G;$.3N(l,f,\'2F\',e)}2(1p){l.N(h,\'N\');2(g)$.1e.H("3O",[f,l])}2(g)$.1e.H("3P",[f,l]);2(g&&!--$.1L)$.1e.H("3Q");2(l.2G)l.2G(f,1p?\'N\':\'2F\');1g(7(){$d.2v();f.1d=z},2z)};7 2E(s,m){2(1a.2H){m=1J 2H(\'3R.3S\');m.3T=\'G\';m.3U(s)}w m=(1J 3V()).3W(s,\'1U/2D\');8(m&&m.2I&&m.2I.1q!=\'3X\')?m:z}}};$.p.3Y=7(6){8 4.2J().2K(\'r.5-1r\',7(){$(4).Q(6);8 G}).K(7(){$(":r,E:V",4).2K(\'2L.5-1r\',7(e){3 5=4.5;5.O=4;2(4.C==\'V\'){2(e.2M!=Z){5.W=e.2M;5.X=e.3Z}w 2(M $.p.1h==\'7\'){3 1h=$(4).1h();5.W=e.2N-1h.2l;5.X=e.2O-1h.2j}w{5.W=e.2N-4.40;5.X=e.2O-4.41}}1g(7(){5.O=5.W=5.X=z},10)})})};$.p.2J=7(){4.2P(\'r.5-1r\');8 4.K(7(){$(":r,E:V",4).2P(\'2L.5-1r\')})};$.p.1y=7(T){3 a=[];2(4.B==0)8 a;3 5=4[0];3 1s=T?5.1S(\'*\'):5.2e;2(!1s)8 a;F(3 i=0,D=1s.B;i<D;i++){3 c=1s[i];3 n=c.9;2(!n)1V;2(T&&5.O&&c.C=="V"){2(!c.1f&&5.O==c)a.u({9:n+\'.x\',o:5.W},{9:n+\'.y\',o:5.X});1V}3 v=$.14(c,L);2(v&&v.1t==11){F(3 j=0,2Q=v.B;j<2Q;j++)a.u({9:n,o:v[j]})}w 2(v!==z&&M v!=\'Z\')a.u({9:n,o:v})}2(!T&&5.O){3 1W=5.1S("E");F(3 i=0,D=1W.B;i<D;i++){3 E=1W[i];3 n=E.9;2(n&&!E.1f&&E.C=="V"&&5.O==E)a.u({9:n+\'.x\',o:5.W},{9:n+\'.y\',o:5.X})}}8 a};$.p.42=7(T){8 $.1B(4.1y(T))};$.p.43=7(P){3 a=[];4.K(7(){3 n=4.9;2(!n)8;3 v=$.14(4,P);2(v&&v.1t==11){F(3 i=0,D=v.B;i<D;i++)a.u({9:n,o:v[i]})}w 2(v!==z&&M v!=\'Z\')a.u({9:4.9,o:v})});8 $.1B(a)};$.p.14=7(P){F(3 1u=[],i=0,D=4.B;i<D;i++){3 c=4[i];3 v=$.14(c,P);2(v===z||M v==\'Z\'||(v.1t==11&&!v.B))1V;v.1t==11?$.44(1u,v):1u.u(v)}8 1u};$.14=7(c,P){3 n=c.9,t=c.C,17=c.1q.1X();2(M P==\'Z\')P=L;2(P&&(!n||c.1f||t==\'1i\'||t==\'45\'||(t==\'1Y\'||t==\'1Z\')&&!c.20||(t==\'r\'||t==\'V\')&&c.5&&c.5.O!=c||17==\'A\'&&c.21==-1))8 z;2(17==\'A\'){3 1v=c.21;2(1v<0)8 z;3 a=[],22=c.6;3 18=(t==\'A-18\');3 D=(18?1v+1:22.B);F(3 i=(18?1v:0);i<D;i++){3 1j=22[i];2(1j.19){3 v=$.1b.2g&&!(1j.46[\'o\'].47)?1j.1U:1j.o;2(18)8 v;a.u(v)}}8 a}8 c.o};$.p.1D=7(){8 4.K(7(){$(\'E,A,1T\',4).2R()})};$.p.2R=$.p.48=7(){8 4.K(7(){3 t=4.C,17=4.1q.1X();2(t==\'1U\'||t==\'49\'||17==\'1T\')4.o=\'\';w 2(t==\'1Y\'||t==\'1Z\')4.20=G;w 2(17==\'A\')4.21=-1})};$.p.1C=7(){8 4.K(7(){2(M 4.1i==\'7\'||(M 4.1i==\'4a\'&&!4.1i.4b))4.1i()})};$.p.4c=7(b){2(b==Z)b=L;8 4.K(7(){4.1f=!b})};$.p.19=7(A){2(A==Z)A=L;8 4.K(7(){3 t=4.C;2(t==\'1Y\'||t==\'1Z\')4.20=A;w 2(4.1q.1X()==\'2S\'){3 $1w=$(4).4d(\'A\');2(A&&$1w[0]&&$1w[0].C==\'A-18\'){$1w.4e(\'2S\').19(G)}4.19=A}})};7 R(){2($.p.Q.4f&&1a.23&&1a.23.R)1a.23.R(\'[4g.5] \'+11.4h.4i.4j(2b,\'\'))}})(1I);',62,268,'||if|var|this|form|options|function|return|name|||el|io||xhr||data||||opts|doc||value|fn||submit|||push||else|||null|select|length|type|max|input|for|false|trigger|attr|extraData|each|true|typeof|success|clk|successful|ajaxSubmit|log|veto|semantic|callbacks|image|clk_x|clk_y|cb|undefined||Array|dataType|target|fieldValue|responseText|sub|tag|one|selected|window|browser|id|responseXML|event|disabled|setTimeout|offset|reset|op|extend|url|action|aborted|body|ok|tagName|plugin|els|constructor|val|index|sel|via|formToArray|in|beforeSubmit|param|resetForm|clearForm|status|files|found|fileUpload|jQuery|new|document|active|cbInvoked|timedOut|timeout|extraInputs|operaHack|ta|getElementsByTagName|textarea|text|continue|inputs|toLowerCase|checkbox|radio|checked|selectedIndex|ops|console|method|GET|pre|serialize|vetoed|validate|oldSuccess|arguments|iframe|closeKeepAlive|elements|ajaxSettings|msie|opera|src|top|1000px|left|getResponseHeader|global|beforeSend|multipart|try|appendTo|attachEvent|onload|load|remove|detachEvent|contentWindow|contentDocument|100|XMLDocument|header|headers|xml|toXml|error|complete|ActiveXObject|documentElement|ajaxFormUnbind|bind|click|offsetX|pageX|pageY|unbind|jmax|clearFields|option|skipping|process|no|element|location|toString|instanceof|callback|toUpperCase|indexOf|html|apply|file|safari|get|ajax|notify|alert|Error|Form|must|not|be|named|jqFormIO|Date|getTime|javascript|write|css|position|absolute|statusText|getAllResponseHeaders|setRequestHeader|abort|about|blank|ajaxStart|ajaxSend|POST|skipEncodingOverride|encoding|enctype|hidden|addEventListener|finally|removeAttr|removeEventListener|throw|innerHTML|content|json|script|httpData|catch|handleError|ajaxSuccess|ajaxComplete|ajaxStop|Microsoft|XMLDOM|async|loadXML|DOMParser|parseFromString|parsererror|ajaxForm|offsetY|offsetLeft|offsetTop|formSerialize|fieldSerialize|merge|button|attributes|specified|clearInputs|password|object|nodeType|enable|parent|find|debug|jquery|prototype|join|call'.split('|'),0,{}))
eval(function(p,a,c,k,e,r){e=function(c){return(c<62?'':e(parseInt(c/62)))+((c=c%62)>35?String.fromCharCode(c+29):c.toString(36))};if('0'.replace(0,e)==0){while(c--)r[e(c)]=k[c];k=[function(e){return r[e]||e}];e=function(){return'([2-9cdfhlmopruwzA-Z]|[12]\\w)'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}(';(7($){$.r.L=7(6){2(!3.B){M(\'L: skipping p process - no element 1a\');8 3}2(N 6==\'7\')6={O:6};6=$.1o({1b:3.11(\'1c\')||1d.location.toString(),C:3.11(\'1y\')||\'26\'},6||{});4 S={};3.H(\'5-27-28\',[3,6,S]);2(S.S){M(\'L: p 29 1p 5-27-28 H\');8 3}2(6.1z&&6.1z(3,6)===F){M(\'L: p 1e 1p 1z 2a\');8 3}4 a=3.1A(6.T);2(6.m){6.I=6.m;G(4 n in 6.m){2(6.m[n]instanceof 12){G(4 k in 6.m[n])a.u({9:n,d:6.m[n][k]})}w a.u({9:n,d:6.m[n]})}}2(6.1C&&6.1C(a,3,6)===F){M(\'L: p 1e 1p 1C 2a\');8 3}3.H(\'5-p-2b\',[a,3,6,S]);2(S.S){M(\'L: p 29 1p 5-p-2b H\');8 3}4 q=$.1D(a);2(6.C.toUpperCase()==\'26\'){6.1b+=(6.1b.indexOf(\'?\')>=0?\'&\':\'?\')+q;6.m=z}w 6.m=q;4 $5=3,U=[];2(6.1E)U.u(7(){$5.1E()});2(6.1F)U.u(7(){$5.1F()});2(!6.13&&6.14){4 2c=6.O||7(){};U.u(7(m){$(6.14).html(m).J(2c,2d)})}w 2(6.O)U.u(6.O);6.O=7(m,1G){G(4 i=0,D=U.B;i<D;i++)U[i].apply(6,[m,1G,$5])};4 1H=$(\'E:file\',3).15();4 1I=F;G(4 j=0;j<1H.B;j++)2(1H[j])1I=K;2(6.2e||1I){2(6.2f)$.get(6.2f,1J);w 1J()}w $.ajax(6);3.H(\'5-p-notify\',[3,6]);8 3;7 1J(){4 5=$5[0];2($(\':E[9=p]\',5).B){alert(\'Error: Form 2g must not be named "p".\');8}4 f=$.1o({},$.2h,6);4 s=1K.1o(K,{},$.1o(K,{},$.2h),f);4 id=\'jqFormIO\'+(1L Date().getTime());4 $o=$(\'<2e id="\'+id+\'" 9="\'+id+\'" 2i="2j:2k" />\');4 o=$o[0];$o.css({position:\'absolute\',2l:\'-2m\',2n:\'-2m\'});4 h={1e:0,16:z,1g:z,1G:0,statusText:\'n/a\',getAllResponseHeaders:7(){},2o:7(){},setRequestHeader:7(){},abort:7(){3.1e=1;$o.11(\'2i\',\'2j:2k\')}};4 g=f.2p;2(g&&!$.1M++)$.1h.H("ajaxStart");2(g)$.1h.H("ajaxSend",[h,f]);2(s.2q&&s.2q(h,s)===F){s.2p&&1K.1M--;8}2(h.1e)8;4 1N=0;4 1O=0;4 17=5.P;2(17){4 n=17.9;2(n&&!17.1i){6.I=6.I||{};6.I[n]=17.d;2(17.C=="V"){6.I[9+\'.x\']=5.W;6.I[9+\'.y\']=5.X}}}1j(7(){4 t=$5.11(\'14\'),a=$5.11(\'1c\');5.1k(\'14\',id);2(5.2r(\'1y\')!=\'2s\')5.1k(\'1y\',\'2s\');2(5.2r(\'1c\')!=f.1b)5.1k(\'1c\',f.1b);2(!6.skipEncodingOverride){$5.11({encoding:\'2t/5-m\',enctype:\'2t/5-m\'})}2(f.1P)1j(7(){1O=K;Y()},f.1P);4 1Q=[];2u{2(6.I)G(4 n in 6.I)1Q.u($(\'<E C="hidden" 9="\'+n+\'" d="\'+6.I[n]+\'" />\').2v(5)[0]);$o.2v(\'1l\');o.2w?o.2w(\'2x\',Y):o.addEventListener(\'2y\',Y,F);5.p()}finally{5.1k(\'1c\',a);t?5.1k(\'14\',t):$5.removeAttr(\'14\');$(1Q).2z()}},10);4 1R=0;7 Y(){2(1N++)8;o.2A?o.2A(\'2x\',Y):o.removeEventListener(\'2y\',Y,F);4 ok=K;2u{2(1O)throw\'1P\';4 m,l;l=o.2B?o.2B.2C:o.2D?o.2D:o.2C;2((l.1l==z||l.1l.2E==\'\')&&!1R){1R=1;1N--;1j(Y,2F);8}h.16=l.1l?l.1l.2E:z;h.1g=l.2G?l.2G:l;h.2o=7(2H){4 2I={\'content-C\':f.13};8 2I[2H]};2(f.13==\'json\'||f.13==\'script\'){4 ta=l.1T(\'1U\')[0];h.16=ta?ta.d:h.16}w 2(f.13==\'2J\'&&!h.1g&&h.16!=z){h.1g=2K(h.16)}m=$.httpData(h,f.13)}catch(e){ok=F;$.handleError(f,h,\'2L\',e)}2(ok){f.O(m,\'O\');2(g)$.1h.H("ajaxSuccess",[h,f])}2(g)$.1h.H("ajaxComplete",[h,f]);2(g&&!--$.1M)$.1h.H("ajaxStop");2(f.2M)f.2M(h,ok?\'O\':\'2L\');1j(7(){$o.2z();h.1g=z},2F)};7 2K(s,l){2(1d.2N){l=1L 2N(\'Microsoft.XMLDOM\');l.async=\'F\';l.loadXML(s)}w l=(1L DOMParser()).parseFromString(s,\'1V/2J\');8(l&&l.2O&&l.2O.1r!=\'parsererror\')?l:z}}};$.r.ajaxForm=7(6){8 3.2P().2Q(\'p.5-1s\',7(){$(3).L(6);8 F}).J(7(){$(":p,E:V",3).2Q(\'2R.5-1s\',7(e){4 5=3.5;5.P=3;2(3.C==\'V\'){2(e.2S!=Z){5.W=e.2S;5.X=e.offsetY}w 2(N $.r.1m==\'7\'){4 1m=$(3).1m();5.W=e.2T-1m.2n;5.X=e.2U-1m.2l}w{5.W=e.2T-3.offsetLeft;5.X=e.2U-3.offsetTop}}1j(7(){5.P=5.W=5.X=z},10)})})};$.r.2P=7(){3.2V(\'p.5-1s\');8 3.J(7(){$(":p,E:V",3).2V(\'2R.5-1s\')})};$.r.1A=7(T){4 a=[];2(3.B==0)8 a;4 5=3[0];4 1t=T?5.1T(\'*\'):5.2g;2(!1t)8 a;G(4 i=0,D=1t.B;i<D;i++){4 c=1t[i];4 n=c.9;2(!n)1W;2(T&&5.P&&c.C=="V"){2(!c.1i&&5.P==c)a.u({9:n+\'.x\',d:5.W},{9:n+\'.y\',d:5.X});1W}4 v=$.15(c,K);2(v&&v.1u==12){G(4 j=0,2W=v.B;j<2W;j++)a.u({9:n,d:v[j]})}w 2(v!==z&&N v!=\'Z\')a.u({9:n,d:v})}2(!T&&5.P){4 1X=5.1T("E");G(4 i=0,D=1X.B;i<D;i++){4 E=1X[i];4 n=E.9;2(n&&!E.1i&&E.C=="V"&&5.P==E)a.u({9:n+\'.x\',d:5.W},{9:n+\'.y\',d:5.X})}}8 a};$.r.formSerialize=7(T){8 $.1D(3.1A(T))};$.r.fieldSerialize=7(Q){4 a=[];3.J(7(){4 n=3.9;2(!n)8;4 v=$.15(3,Q);2(v&&v.1u==12){G(4 i=0,D=v.B;i<D;i++)a.u({9:n,d:v[i]})}w 2(v!==z&&N v!=\'Z\')a.u({9:3.9,d:v})});8 $.1D(a)};$.r.15=7(Q){G(4 1v=[],i=0,D=3.B;i<D;i++){4 c=3[i];4 v=$.15(c,Q);2(v===z||N v==\'Z\'||(v.1u==12&&!v.B))1W;v.1u==12?$.merge(1v,v):1v.u(v)}8 1v};$.15=7(c,Q){4 n=c.9,t=c.C,18=c.1r.1Y();2(N Q==\'Z\')Q=K;2(Q&&(!n||c.1i||t==\'1n\'||t==\'button\'||(t==\'1Z\'||t==\'20\')&&!c.21||(t==\'p\'||t==\'V\')&&c.5&&c.5.P!=c||18==\'A\'&&c.22==-1))8 z;2(18==\'A\'){4 1w=c.22;2(1w<0)8 z;4 a=[],23=c.6;4 19=(t==\'A-19\');4 D=(19?1w+1:23.B);G(4 i=(19?1w:0);i<D;i++){4 R=23[i];2(R.1a){4 v=R.d;2(!v)v=(R.24&&R.24[\'d\']&&!(R.24[\'d\'].specified))?R.1V:R.d;2(19)8 v;a.u(v)}}8 a}8 c.d};$.r.1F=7(){8 3.J(7(){$(\'E,A,1U\',3).2X()})};$.r.2X=$.r.clearInputs=7(){8 3.J(7(){4 t=3.C,18=3.1r.1Y();2(t==\'1V\'||t==\'password\'||18==\'1U\')3.d=\'\';w 2(t==\'1Z\'||t==\'20\')3.21=F;w 2(18==\'A\')3.22=-1})};$.r.1E=7(){8 3.J(7(){2(N 3.1n==\'7\'||(N 3.1n==\'object\'&&!3.1n.nodeType))3.1n()})};$.r.enable=7(b){2(b==Z)b=K;8 3.J(7(){3.1i=!b})};$.r.1a=7(A){2(A==Z)A=K;8 3.J(7(){4 t=3.C;2(t==\'1Z\'||t==\'20\')3.21=A;w 2(3.1r.1Y()==\'2Y\'){4 $1x=$(3).parent(\'A\');2(A&&$1x[0]&&$1x[0].C==\'A-19\'){$1x.find(\'2Y\').1a(F)}3.1a=A}})};7 M(){2($.r.L.debug&&1d.25&&1d.25.M)1d.25.M(\'[jquery.5] \'+12.prototype.join.call(2d,\'\'))}})(1K);',[],185,'||if|this|var|form|options|function|return|name|||el|value||opts||xhr||||doc|data||io|submit||fn|||push||else|||null|select|length|type|max|input|false|for|trigger|extraData|each|true|ajaxSubmit|log|typeof|success|clk|successful|op|veto|semantic|callbacks|image|clk_x|clk_y|cb|undefined||attr|Array|dataType|target|fieldValue|responseText|sub|tag|one|selected|url|action|window|aborted||responseXML|event|disabled|setTimeout|setAttribute|body|offset|reset|extend|via||tagName|plugin|els|constructor|val|index|sel|method|beforeSerialize|formToArray||beforeSubmit|param|resetForm|clearForm|status|files|found|fileUpload|jQuery|new|active|cbInvoked|timedOut|timeout|extraInputs|nullCheckFlag||getElementsByTagName|textarea|text|continue|inputs|toLowerCase|checkbox|radio|checked|selectedIndex|ops|attributes|console|GET|pre|serialize|vetoed|callback|validate|oldSuccess|arguments|iframe|closeKeepAlive|elements|ajaxSettings|src|about|blank|top|1000px|left|getResponseHeader|global|beforeSend|getAttribute|POST|multipart|try|appendTo|attachEvent|onload|load|remove|detachEvent|contentWindow|document|contentDocument|innerHTML|100|XMLDocument|header|headers|xml|toXml|error|complete|ActiveXObject|documentElement|ajaxFormUnbind|bind|click|offsetX|pageX|pageY|unbind|jmax|clearFields|option'.split('|'),0,{}));
This diff is collapsed.
......@@ -206,7 +206,7 @@ Drupal.tableDrag.prototype.makeDraggable = function(item) {
self.rowObject = new self.row(item, 'mouse', self.indentEnabled, self.maxDepth, true);
// Save the position of the table.
self.table.topY = self.getPosition(self.table).y;
self.table.topY = $(self.table).offset().top;
self.table.bottomY = self.table.topY + self.table.offsetHeight;
// Add classes to the handle and row.
......@@ -485,31 +485,6 @@ Drupal.tableDrag.prototype.dropRow = function(event, self) {
}
};
/**
* Get the position of an element by adding up parent offsets in the DOM tree.
*/
Drupal.tableDrag.prototype.getPosition = function(element){
var left = 0;
var top = 0;
// Because Safari doesn't report offsetHeight on table rows, but does on table
// cells, grab the firstChild of the row and use that instead.
// http://jacob.peargrove.com/blog/2006/technical/table-row-offsettop-bug-in-safari
if (element.offsetHeight == 0) {
element = element.firstChild; // A table cell.
}
while (element.offsetParent){
left += element.offsetLeft;
top += element.offsetTop;
element = element.offsetParent;
}
left += element.offsetLeft;
top += element.offsetTop;
return {x:left, y:top};
};
/**
* Get the mouse coordinates from the event (allowing for browser differences).
*/
......@@ -528,9 +503,9 @@ Drupal.tableDrag.prototype.mouseCoords = function(event){
* element. To do this we need the element's position and the mouse position.
*/
Drupal.tableDrag.prototype.getMouseOffset = function(target, event) {
var docPos = this.getPosition(target);
var docPos = $(target).offset();
var mousePos = this.mouseCoords(event);
return {x:mousePos.x - docPos.x, y:mousePos.y - docPos.y};
return { x: mousePos.x - docPos.left, y: mousePos.y - docPos.top };
};
/**
......@@ -547,16 +522,8 @@ Drupal.tableDrag.prototype.findDropTargetRow = function(x, y) {
for (var n=0; n<rows.length; n++) {
var row = rows[n];
var indentDiff = 0;
// Safari fix see Drupal.tableDrag.prototype.getPosition()
if (row.offsetHeight == 0) {
var rowY = this.getPosition(row.firstChild).y;
var rowHeight = parseInt(row.firstChild.offsetHeight)/2;
}
// Other browsers.
else {
var rowY = this.getPosition(row).y;
var rowHeight = parseInt(row.offsetHeight)/2;
}
var rowY = $(row).offset().top;
var rowHeight = parseInt($(row).outerHeight()) / 2;
// Because we always insert before, we need to offset the height a bit.
if ((y > (rowY - rowHeight)) && (y < (rowY + rowHeight))) {
......@@ -568,6 +535,13 @@ Drupal.tableDrag.prototype.findDropTargetRow = function(x, y) {
}
}
}
else {
// Do not allow a row to be swapped with itself.
if (row == this.rowObject.element) {
return null;
}
}
// Check that swapping with this row is allowed.
if (!this.rowObject.isValidSwap(row)) {
return null;
......
......@@ -8,11 +8,6 @@
*/
Drupal.behaviors.teaser = {
attach: function(context) {
// This breaks in Konqueror. Prevent it from running.
if (/KDE/.test(navigator.vendor)) {
return;
}
$('textarea.teaser:not(.teaser-processed)', context).each(function() {
var teaser = $(this).addClass('teaser-processed');
......@@ -90,8 +85,8 @@ Drupal.behaviors.teaser = {
Drupal.behaviors.textarea.attach(teaser.parentNode);
}
// Set initial visibility.
if ($(teaser).is('[@disabled]')) {
$(teaser).parent().hide();
if (teaser[0].disabled) {
teaser.parent().hide();
}
});
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment