#193274 by dmitrig01 and quicksketch: send submit button data with AHAH submissions

includes/form.inc

@@ -1614,7 +1614,6 @@ function expand_radios($element) {
  */
 function form_expand_ahah($element) {
   static $js_added = array();
-
   // Add a reasonable default event handler if none specified.
   if (isset($element['#ahah']['path']) && !isset($element['#ahah']['event'])) {
     switch ($element['#type']) {
@@ -1643,13 +1642,14 @@ function form_expand_ahah($element) {
     drupal_add_js('misc/ahah.js');
 
     $ahah_binding = array(
-      'url'   => url($element['#ahah']['path']),
-      'event' => $element['#ahah']['event'],
-      'wrapper' => empty($element['#ahah']['wrapper']) ? NULL : $element['#ahah']['wrapper'],
+      'url'      => url($element['#ahah']['path']),
+      'event'    => $element['#ahah']['event'],
+      'wrapper'  => empty($element['#ahah']['wrapper']) ? NULL : $element['#ahah']['wrapper'],
       'selector' => empty($element['#ahah']['selector']) ? '#'. $element['#id'] : $element['#ahah']['selector'],
       'effect'   => empty($element['#ahah']['effect']) ? 'none' : $element['#ahah']['effect'],
       'method'   => empty($element['#ahah']['method']) ? 'replace' : $element['#ahah']['method'],
       'progress' => empty($element['#ahah']['progress']) ? array('type' => 'throbber') : $element['#ahah']['progress'],
+      'button'   => $element['#type'] == 'submit' ? array($element['#name'] => $element['#value']) : FALSE,
     );
 
     // Convert a simple #ahah[progress] type string into an array.

misc/ahah.js

@@ -43,6 +43,8 @@ Drupal.ahah = function(base, element_settings) {
   this.effect = element_settings.effect;
   this.method = element_settings.method;
   this.progress = element_settings.progress;
+  this.button = element_settings.button || { };
+
   if (this.effect == 'none') {
     this.showEffect = 'show';
     this.hideEffect = 'hide';
@@ -70,6 +72,7 @@ Drupal.ahah = function(base, element_settings) {
   var ahah = this;
   var options = {
     url: ahah.url,
+    data: ahah.button,
     beforeSubmit: function(form_values, element_settings, options) {
       return ahah.beforeSubmit(form_values, element_settings, options);
     },

misc/jquery.form.js

 // $Id$
 
 /*
- * jQuery form plugin
+ * jQuery Form Plugin
+ * version: 2.01 (10/31/2007)
  * @requires jQuery v1.1 or later
  *
  * Examples at: http://malsup.com/jquery/form/
  * Dual licensed under the MIT and GPL licenses:
  *   http://www.opensource.org/licenses/mit-license.php
  *   http://www.gnu.org/licenses/gpl.html
- *
- * Version: 1.0.3
  */
-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}('(5($){$.7.1f=5(o){3(H o==\'5\')o={K:o};o=$.25({1b:4.R(\'1J\')||1i.2q,P:4.R(\'2b\')||\'27\'},o||{});2 a=4.1v(o.2V);3(o.1M&&o.1M(a,4,o)===F)6 4;2 p={};$.N.O(\'Y.G.2m\',[a,4,o,p]);3(p.3s)6 4;2 q=$.1A(a);3(o.P.3j()==\'27\'){o.1b+=(o.1b.3g(\'?\')>=0?\'&\':\'?\')+q;o.19=B}A o.19=q;2 r=4,M=[];3(o.1p)M.C(5(){r.1p()});3(o.1o)M.C(5(){r.1o()});3(!o.16&&o.15){2 u=o.K;M.C(5(a){$(o.15).R("1K",a).2I().Q(u,2C)})}A 3(o.K)M.C(o.K);o.K=5(a,b){J(2 i=0,D=M.E;i<D;i++)M[i](a,b,r)};2 v=$(\'12:2p\',4).11();2 w=F;J(2 j=0;j<v.E;j++)3(v[j])w=18;3(o.2h||w)2d();A $.3p(o);$.N.O(\'Y.G.3o\',[4,o]);6 4;5 2d(){2 d=r[0];2 f=$.25({},$.3i,o);2 h=\'3e\'+$.7.1f.1e++;2 i=$(\'<2h 3a="\'+h+\'" 8="\'+h+\'" />\');2 j=i[0];2 k=$.1w.1Z&&1i.1Z.32()<9;3($.1w.1W||k)j.2Z=\'2Y:F;1l.2X("");\';i.2W({2U:\'2T\',1Q:\'-1R\',1N:\'-1R\'});2 l={X:B,1d:B,2O:0,2N:\'n/a\',2J:5(){},2H:5(){},2F:5(){}};2 g=f.2E;3(g&&!$.2c++)$.N.O("2z");3(g)$.N.O("2y",[l,f]);2 m=0;2 n=0;1a(5(){i.2u(\'1j\');j.1I?j.1I(\'1H\',V):j.2t(\'1G\',V,F);2 a=d.1F?\'1F\':\'2s\';2 t=r.R(\'15\');r.R({15:h,2b:\'2r\',2o:\'2n/Y-19\',1J:f.1b});3(f.1h)1a(5(){n=18;V()},f.1h);d.G();r.R(\'15\',t)},10);5 V(){3(m++)6;j.1C?j.1C(\'1H\',V):j.2l(\'1G\',V,F);2 a=18;2k{3(n)2j\'1h\';2 b,I;I=j.2i?j.2i.1l:j.2g?j.2g:j.1l;l.X=I.1j?I.1j.1K:B;l.1d=I.2f?I.2f:I;3(f.16==\'2e\'||f.16==\'3r\'){2 c=I.1B(\'1z\')[0];b=c?c.z:l.X;3(f.16==\'2e\')3n("19 = "+b);A $.3k(b)}A 3(f.16==\'2a\'){b=l.1d;3(!b&&l.X!=B)b=29(l.X)}A{b=l.X}}3h(e){a=F;$.3f(f,l,\'26\',e)}3(a){f.K(b,\'K\');3(g)$.N.O("3d",[l,f])}3(g)$.N.O("3c",[l,f]);3(g&&!--$.2c)$.N.O("3b");3(f.24)f.24(l,a?\'K\':\'26\');1a(5(){i.39();l.1d=B},38)};5 29(s,a){3(1i.22){a=21 22(\'37.36\');a.35=\'F\';a.34(s)}A a=(21 33()).31(s,\'1u/2a\');6(a&&a.1X&&a.1X.1t!=\'30\')?a:B}}};$.7.1f.1e=0;$.7.T=5(a){6 4.1V().G(1s).Q(5(){4.1r=$.7.T.1e++;$.7.T.1q[4.1r]=a;$(":G,12:U",4).1U(1m)})};$.7.T.1e=1;$.7.T.1q={};5 1m(e){2 a=4.Y;a.L=4;3(4.P==\'U\'){3(e.1T!=17){a.S=e.1T;a.Z=e.2S}A 3(H $.7.1P==\'5\'){2 b=$(4).1P();a.S=e.1S-b.1N;a.Z=e.1O-b.1Q}A{a.S=e.1S-4.2R;a.Z=e.1O-4.2Q}}1a(5(){a.L=a.S=a.Z=B},10)};5 1s(){2 a=4.1r;2 b=$.7.T.1q[a];$(4).1f(b);6 F};$.7.1V=5(){4.1Y(\'G\',1s);6 4.Q(5(){$(":G,12:U",4).1Y(\'1U\',1m)})};$.7.1v=5(b){2 a=[];3(4.E==0)6 a;2 c=4[0];2 d=b?c.1B(\'*\'):c.2P;3(!d)6 a;J(2 i=0,D=d.E;i<D;i++){2 e=d[i];2 n=e.8;3(!n)1x;3(b&&c.L&&e.P=="U"){3(!e.1n&&c.L==e)a.C({8:n+\'.x\',z:c.S},{8:n+\'.y\',z:c.Z});1x}2 v=$.11(e,18);3(v&&v.1c==1g){J(2 j=0,1L=v.E;j<1L;j++)a.C({8:n,z:v[j]})}A 3(v!==B&&H v!=\'17\')a.C({8:n,z:v})}3(!b&&c.L){2 f=c.1B("12");J(2 i=0,D=f.E;i<D;i++){2 g=f[i];2 n=g.8;3(n&&!g.1n&&g.P=="U"&&c.L==g)a.C({8:n+\'.x\',z:c.S},{8:n+\'.y\',z:c.Z})}}6 a};$.7.2M=5(a){6 $.1A(4.1v(a))};$.7.2L=5(b){2 a=[];4.Q(5(){2 n=4.8;3(!n)6;2 v=$.11(4,b);3(v&&v.1c==1g){J(2 i=0,D=v.E;i<D;i++)a.C({8:n,z:v[i]})}A 3(v!==B&&H v!=\'17\')a.C({8:4.8,z:v})});6 $.1A(a)};$.7.11=5(a){J(2 b=[],i=0,D=4.E;i<D;i++){2 c=4[i];2 v=$.11(c,a);3(v===B||H v==\'17\'||(v.1c==1g&&!v.E))1x;v.1c==1g?$.2K(b,v):b.C(v)}6 b};$.11=5(b,c){2 n=b.8,t=b.P,W=b.1t.20();3(H c==\'17\')c=18;3(c&&(!n||b.1n||t==\'14\'||t==\'2G\'||(t==\'23\'||t==\'1E\')&&!b.1D||(t==\'G\'||t==\'U\')&&b.Y&&b.Y.L!=b||W==\'13\'&&b.1k==-1))6 B;3(W==\'13\'){2 d=b.1k;3(d<0)6 B;2 a=[],1y=b.2D;2 e=(t==\'13-2B\');2 f=(e?d+1:1y.E);J(2 i=(e?d:0);i<f;i++){2 g=1y[i];3(g.2A){2 v=$.1w.1W&&!(g.3l[\'z\'].3m)?g.1u:g.z;3(e)6 v;a.C(v)}}6 a}6 b.z};$.7.1o=5(){6 4.Q(5(){$(\'12,13,1z\',4).28()})};$.7.28=$.7.2x=5(){6 4.Q(5(){2 t=4.P,W=4.1t.20();3(t==\'1u\'||t==\'2w\'||W==\'1z\')4.z=\'\';A 3(t==\'23\'||t==\'1E\')4.1D=F;A 3(W==\'13\')4.1k=-1})};$.7.1p=5(){6 4.Q(5(){3(H 4.14==\'5\'||(H 4.14==\'3q\'&&!4.14.2v))4.14()})}})(3t);',62,216,'||var|if|this|function|return|fn|name|||||||||||||||||||||||||||value|else|null|push|max|length|false|submit|typeof|doc|for|success|clk|callbacks|event|trigger|type|each|attr|clk_x|ajaxForm|image|cb|tag|responseText|form|clk_y||fieldValue|input|select|reset|target|dataType|undefined|true|data|setTimeout|url|constructor|responseXML|counter|ajaxSubmit|Array|timeout|window|body|selectedIndex|document|clickHandler|disabled|clearForm|resetForm|optionHash|formPluginId|submitHandler|tagName|text|formToArray|browser|continue|ops|textarea|param|getElementsByTagName|detachEvent|checked|radio|encoding|load|onload|attachEvent|action|innerHTML|jmax|beforeSubmit|left|pageY|offset|top|1000px|pageX|offsetX|click|ajaxFormUnbind|msie|documentElement|unbind|opera|toLowerCase|new|ActiveXObject|checkbox|complete|extend|error|GET|clearFields|toXml|xml|method|active|fileUpload|json|XMLDocument|contentDocument|iframe|contentWindow|throw|try|removeEventListener|validate|multipart|encAttr|file|location|POST|enctype|addEventListener|appendTo|nodeType|password|clearInputs|ajaxSend|ajaxStart|selected|one|arguments|options|global|setRequestHeader|button|getResponseHeader|evalScripts|getAllResponseHeaders|merge|fieldSerialize|formSerialize|statusText|status|elements|offsetTop|offsetLeft|offsetY|absolute|position|semantic|css|write|javascript|src|parsererror|parseFromString|version|DOMParser|loadXML|async|XMLDOM|Microsoft|100|remove|id|ajaxStop|ajaxComplete|ajaxSuccess|jqFormIO|handleError|indexOf|catch|ajaxSettings|toUpperCase|globalEval|attributes|specified|eval|notify|ajax|object|script|veto|jQuery'.split('|'),0,{}))
+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}('(5($){$.7.1j=5(o){2(P o==\'5\')o={L:o};o=$.2h({1h:4.X(\'2i\')||1E.2u.3D(),I:4.X(\'2g\')||\'29\'},o||{});3 p={};$.M.N(\'R.2P.2L\',[4,o,p]);2(p.1Q)6 4;3 a=4.1z(o.2r);2(o.V){H(3 n 3u o.V)a.C({z:n,A:o.V[n]})}2(o.28&&o.28(a,4,o)===E)6 4;$.M.N(\'R.K.36\',[a,4,o,p]);2(p.1Q)6 4;3 q=$.1x(a);2(o.I.31()==\'29\'){o.1h+=(o.1h.2Z(\'?\')>=0?\'&\':\'?\')+q;o.V=B}8 o.V=q;3 r=4,U=[];2(o.1r)U.C(5(){r.1r()});2(o.1o)U.C(5(){r.1o()});2(!o.18&&o.14){3 u=o.L||5(){};U.C(5(a){2(4.1N)$(o.14).X("1M",a).1N().D(u,1L);8 $(o.14).2t(a).D(u,1L)})}8 2(o.L)U.C(o.L);o.L=5(a,b){H(3 i=0,F=U.G;i<F;i++)U[i](a,b,r)};3 v=$(\'19:3v\',4).15();3 w=E;H(3 j=0;j<v.G;j++)2(v[j])w=T;2(o.2f||w){2($.1i.3o&&o.2a)$.3l(o.2a,1l);8 1l()}8 $.3h(o);$.M.N(\'R.K.3f\',[4,o]);6 4;5 1l(){3 d=r[0];3 f=$.2h({},$.39,o);3 h=\'35\'+$.7.1j.1a++;3 i=$(\'<2f 33="\'+h+\'" z="\'+h+\'" />\');3 j=i[0];3 k=$.1i.20&&1E.20.30()<9;2($.1i.1X||k)j.2Y=\'2W:E;1w.2U("");\';i.2S({2R:\'2Q\',23:\'-24\',1R:\'-24\'});3 l={Z:B,1b:B,2K:0,2J:\'n/a\',2H:5(){},2F:5(){},2E:5(){}};3 g=f.2B;2(g&&!$.1O++)$.M.N("2x");2(g)$.M.N("2w",[l,f]);3 m=0;3 n=0;1f(5(){i.2v(\'1n\');j.1K?j.1K(\'1J\',12):j.2s(\'1I\',12,E);3 a=d.1H?\'1H\':\'2q\';3 t=r.X(\'14\');r.X({14:h,2g:\'3C\',2i:f.1h});d[a]=\'3B/R-V\';2(f.1G)1f(5(){n=T;12()},f.1G);d.K();r.X(\'14\',t)},10);5 12(){2(m++)6;j.2o?j.2o(\'1J\',12):j.3A(\'1I\',12,E);3 a=T;3z{2(n)3x\'1G\';3 b,O;O=j.2n?j.2n.1w:j.2l?j.2l:j.1w;l.Z=O.1n?O.1n.1M:B;l.1b=O.2k?O.2k:O;2(f.18==\'2j\'||f.18==\'3s\'){3 c=O.1D(\'1C\')[0];b=c?c.A:l.Z;2(f.18==\'2j\')3r("V = "+b);8 $.3q(b)}8 2(f.18==\'2m\'){b=l.1b;2(!b&&l.Z!=B)b=2d(l.Z)}8{b=l.Z}}3p(e){a=E;$.3n(f,l,\'2b\',e)}2(a){f.L(b,\'L\');2(g)$.M.N("3m",[l,f])}2(g)$.M.N("3k",[l,f]);2(g&&!--$.1O)$.M.N("3j");2(f.27)f.27(l,a?\'L\':\'2b\');1f(5(){i.3i();l.1b=B},3g)};5 2d(s,a){2(1E.26){a=25 26(\'3d.3c\');a.3b=\'E\';a.3a(s)}8 a=(25 38()).37(s,\'1A/2m\');6(a&&a.22&&a.22.1e!=\'34\')?a:B}}};$.7.1j.1a=0;$.7.W=5(a){6 4.21().K(1m).D(5(){4.1u=$.7.W.1a++;$.7.W.1t[4.1u]=a;$(":K,19:Y",4).1Z(1s)})};$.7.W.1a=1;$.7.W.1t={};5 1s(e){3 a=4.R;a.Q=4;2(4.I==\'Y\'){2(e.1Y!=S){a.11=e.1Y;a.16=e.2X}8 2(P $.7.1U==\'5\'){3 b=$(4).1U();a.11=e.1V-b.1R;a.16=e.1W-b.23}8{a.11=e.1V-4.2V;a.16=e.1W-4.32}}1f(5(){a.Q=a.11=a.16=B},10)};5 1m(){3 a=4.1u;3 b=$.7.W.1t[a];$(4).1j(b);6 E};$.7.21=5(){4.1T(\'K\',1m);6 4.D(5(){$(":K,19:Y",4).1T(\'1Z\',1s)})};$.7.1z=5(b){3 a=[];2(4.G==0)6 a;3 c=4[0];3 d=b?c.1D(\'*\'):c.2T;2(!d)6 a;H(3 i=0,F=d.G;i<F;i++){3 e=d[i];3 n=e.z;2(!n)1v;2(b&&c.Q&&e.I=="Y"){2(!e.1d&&c.Q==e)a.C({z:n+\'.x\',A:c.11},{z:n+\'.y\',A:c.16});1v}3 v=$.15(e,T);2(v&&v.1c==1g){H(3 j=0,1S=v.G;j<1S;j++)a.C({z:n,A:v[j]})}8 2(v!==B&&P v!=\'S\')a.C({z:n,A:v})}2(!b&&c.Q){3 f=c.1D("19");H(3 i=0,F=f.G;i<F;i++){3 g=f[i];3 n=g.z;2(n&&!g.1d&&g.I=="Y"&&c.Q==g)a.C({z:n+\'.x\',A:c.11},{z:n+\'.y\',A:c.16})}}6 a};$.7.2O=5(a){6 $.1x(4.1z(a))};$.7.2N=5(b){3 a=[];4.D(5(){3 n=4.z;2(!n)6;3 v=$.15(4,b);2(v&&v.1c==1g){H(3 i=0,F=v.G;i<F;i++)a.C({z:n,A:v[i]})}8 2(v!==B&&P v!=\'S\')a.C({z:4.z,A:v})});6 $.1x(a)};$.7.15=5(a){H(3 b=[],i=0,F=4.G;i<F;i++){3 c=4[i];3 v=$.15(c,a);2(v===B||P v==\'S\'||(v.1c==1g&&!v.G))1v;v.1c==1g?$.3e(b,v):b.C(v)}6 b};$.15=5(b,c){3 n=b.z,t=b.I,13=b.1e.1F();2(P c==\'S\')c=T;2(c&&(!n||b.1d||t==\'17\'||t==\'2M\'||(t==\'1q\'||t==\'1B\')&&!b.1p||(t==\'K\'||t==\'Y\')&&b.R&&b.R.Q!=b||13==\'J\'&&b.1y==-1))6 B;2(13==\'J\'){3 d=b.1y;2(d<0)6 B;3 a=[],1k=b.2I;3 e=(t==\'J-2e\');3 f=(e?d+1:1k.G);H(3 i=(e?d:0);i<f;i++){3 g=1k[i];2(g.2c){3 v=$.1i.1X&&!(g.2G[\'A\'].3t)?g.1A:g.A;2(e)6 v;a.C(v)}}6 a}6 b.A};$.7.1o=5(){6 4.D(5(){$(\'19,J,1C\',4).2p()})};$.7.2p=$.7.2D=5(){6 4.D(5(){3 t=4.I,13=4.1e.1F();2(t==\'1A\'||t==\'3w\'||13==\'1C\')4.A=\'\';8 2(t==\'1q\'||t==\'1B\')4.1p=E;8 2(13==\'J\')4.1y=-1})};$.7.1r=5(){6 4.D(5(){2(P 4.17==\'5\'||(P 4.17==\'2C\'&&!4.17.3y))4.17()})};$.7.2A=5(b){2(b==S)b=T;6 4.D(5(){4.1d=!b})};$.7.J=5(b){2(b==S)b=T;6 4.D(5(){3 t=4.I;2(t==\'1q\'||t==\'1B\')4.1p=b;8 2(4.1e.1F()==\'1P\'){3 a=$(4).2z(\'J\');2(b&&a[0]&&a[0].I==\'J-2e\'){a.2y(\'1P\').J(E)}4.2c=b}})}})(3E);',62,227,'||if|var|this|function|return|fn|else|||||||||||||||||||||||||||name|value|null|push|each|false|max|length|for|type|select|submit|success|event|trigger|doc|typeof|clk|form|undefined|true|callbacks|data|ajaxForm|attr|image|responseText||clk_x|cb|tag|target|fieldValue|clk_y|reset|dataType|input|counter|responseXML|constructor|disabled|tagName|setTimeout|Array|url|browser|ajaxSubmit|ops|fileUpload|submitHandler|body|clearForm|checked|checkbox|resetForm|clickHandler|optionHash|formPluginId|continue|document|param|selectedIndex|formToArray|text|radio|textarea|getElementsByTagName|window|toLowerCase|timeout|encoding|load|onload|attachEvent|arguments|innerHTML|evalScripts|active|option|veto|left|jmax|unbind|offset|pageX|pageY|msie|offsetX|click|opera|ajaxFormUnbind|documentElement|top|1000px|new|ActiveXObject|complete|beforeSubmit|GET|closeKeepAlive|error|selected|toXml|one|iframe|method|extend|action|json|XMLDocument|contentDocument|xml|contentWindow|detachEvent|clearFields|enctype|semantic|addEventListener|html|location|appendTo|ajaxSend|ajaxStart|find|parent|enable|global|object|clearInputs|setRequestHeader|getResponseHeader|attributes|getAllResponseHeaders|options|statusText|status|serialize|button|fieldSerialize|formSerialize|pre|absolute|position|css|elements|write|offsetLeft|javascript|offsetY|src|indexOf|version|toUpperCase|offsetTop|id|parsererror|jqFormIO|validate|parseFromString|DOMParser|ajaxSettings|loadXML|async|XMLDOM|Microsoft|merge|notify|100|ajax|remove|ajaxStop|ajaxComplete|get|ajaxSuccess|handleError|safari|catch|globalEval|eval|script|specified|in|file|password|throw|nodeType|try|removeEventListener|multipart|POST|toString|jQuery'.split('|'),0,{}))