Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/RapidHtmlResources.php |
— | — | @@ -6,6 +6,7 @@ |
7 | 7 | */ |
8 | 8 | |
9 | 9 | $wgPayflowRapidHtmlRemoteExtPath = 'DonationInterface/gateway_forms/rapidhtml'; |
| 10 | +$wgGlobalCollectRapidHtmlRemoteExtPath = 'DonationInterface/globalcollect_gateway/forms'; |
10 | 11 | |
11 | 12 | /** |
12 | 13 | * LIGHTBOX |
— | — | @@ -60,6 +61,16 @@ |
61 | 62 | 'localBasePath' => dirname( __FILE__ ), |
62 | 63 | 'remoteExtPath' => $wgPayflowRapidHtmlRemoteExtPath, |
63 | 64 | ); |
| 65 | +$wgResourceModules[ 'gc.form.rapidhtml.webitects_2_3step' ] = array( |
| 66 | + 'scripts' => array( |
| 67 | + 'js/webitects_2_3step.js', |
| 68 | + ), |
| 69 | + 'dependencies' => array( |
| 70 | + 'pfp.form.rapidhtml.webitects' |
| 71 | + ), |
| 72 | + 'localBasePath' => dirname( __FILE__ ).'/../../globalcollect_gateway/forms', |
| 73 | + 'remoteExtPath' => $wgGlobalCollectRapidHtmlRemoteExtPath, |
| 74 | +); |
64 | 75 | |
65 | 76 | /** |
66 | 77 | * globalcollect_test |
Index: trunk/extensions/DonationInterface/gateway_forms/rapidhtml/css/Webitects.css |
— | — | @@ -37,7 +37,7 @@ |
38 | 38 | /* Specifics |
39 | 39 | ======================================================================*/ |
40 | 40 | /* Buttons */ |
41 | | -.btn { display: inline-block; padding: 0.3em 0.5em; vertical-align: middle; font-size: 12px; } |
| 41 | +.btn { display: inline-block; font-size: 12px; } |
42 | 42 | |
43 | 43 | /* Donate options */ |
44 | 44 | .donate-options input { width: 15em; } |
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/html/webitects_2_3step.html |
— | — | @@ -1,7 +1,5 @@ |
2 | 2 | <script type="text/javascript"> |
3 | | - mw.loader.load('pfp.form.rapidhtml.webitects'); |
4 | | - var extensionPath = mw.config.get( 'wgServer' ) + mw.config.get( 'wgScriptPath' ) + '/extensions/DonationInterface'; |
5 | | - mw.loader.load( extensionPath + '/globalcollect_gateway/forms/js/webitects_2_3step.js', 'text/javascript' ); |
| 3 | + mw.loader.load('gc.form.rapidhtml.webitects_2_3step'); |
6 | 4 | // these must go through RapidHTML and thus are inline |
7 | 5 | var amountErrors = ['#general|escape','#retryMsg|escape','#amount|escape'], |
8 | 6 | billingErrors = ['#fname|escape','#lname|escape','#city|escape','#country|escape', |
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/js/webitects_2_3step.js |
— | — | @@ -121,7 +121,7 @@ |
122 | 122 | setAmount( $( this ) ); |
123 | 123 | } ); |
124 | 124 | // reset the amount field when "other" is changed |
125 | | - $( "#other-amount" ).change( function() { |
| 125 | + $( "#other-amount" ).keyup( function() { |
126 | 126 | setAmount( $( this ) ); |
127 | 127 | } ); |
128 | 128 | |
— | — | @@ -291,4 +291,4 @@ |
292 | 292 | error = true; |
293 | 293 | } |
294 | 294 | return !error; |
295 | | -} |
\ No newline at end of file |
| 295 | +} |
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/js/lightbox1.js |
— | — | @@ -23,7 +23,7 @@ |
24 | 24 | |
25 | 25 | /* Set selected amount to amount */ |
26 | 26 | $( "input[name='amountRadio']" ).click( function() { setAmount( $( this ) ); } ); |
27 | | - $( "#other-amount" ).change( function() { setAmount( $( this ) ); } ); |
| 27 | + $( "#other-amount" ).keyup( function() { setAmount( $( this ) ); } ); |
28 | 28 | function setAmount(e) { $("input[name='amount']").val( e.val() ); } |
29 | 29 | |
30 | 30 | /* number of fieldsets */ |