http://www.mediawiki.org/wiki/Special:Code/MediaWiki/99124
Revision: 99124
Author: awjrichards
Date: 2011-10-06 17:55:23 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
MFT r99044 through r99121
Modified Paths:
--------------
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/Form.php
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html/globalcollect_test.html
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html/globalcollect_test_2.html
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.php
Property Changed:
----------------
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/extras/minfraud/ccfd/CreditCardFraudDetection.php
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/extras/recaptcha/recaptcha-php/recaptchalib.php
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html/
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html/webitects_2_3step.html
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.alias.php
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/validate_input.js
Property changes on:
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/extensions/DonationInterface:75657-77440,77442-79147,79149-79286,79288-79296,79298-79299,79301-79303,79305-86440,92825,96120-96121,96125,97945-99042
+
/trunk/extensions/DonationInterface:75657-77440,77442-79147,79149-79286,79288-79296,79298-79299,79301-79303,79305-86440,92825,96120-96121,96125,97945-99042,99045-99121
Property changes on:
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/extensions/DonationInterface/payflowpro_gateway:75657-77440,77442-79147,79149-79286,79288-79296,79298-79299,79301-79303,79305-86440,92825,96120-96121,96125,96127-97926,97945-99042
+
/trunk/extensions/DonationInterface/payflowpro_gateway:75657-77440,77442-79147,79149-79286,79288-79296,79298-79299,79301-79303,79305-86440,92825,96120-96121,96125,96127-97926,97945-99042,99045-99121
Property changes on:
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/extras/minfraud/ccfd/CreditCardFraudDetection.php
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/extensions/DonationInterface/payflowpro_gateway/extras/minfraud/ccfd/CreditCardFraudDetection.php:75657-96106,96125,96127-97926,97945-99042
+
/trunk/extensions/DonationInterface/payflowpro_gateway/extras/minfraud/ccfd/CreditCardFraudDetection.php:75657-96106,96125,96127-97926,97945-99042,99045-99121
Property changes on:
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/extras/recaptcha/recaptcha-php/recaptchalib.php
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/extensions/DonationInterface/payflowpro_gateway/extras/recaptcha/recaptcha-php/recaptchalib.php:75657-96108,96125,96127-97926,97945-99042
+
/trunk/extensions/DonationInterface/payflowpro_gateway/extras/recaptcha/recaptcha-php/recaptchalib.php:75657-96108,96125,96127-97926,97945-99042,99045-99121
Property changes on:
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/extensions/DonationInterface/payflowpro_gateway/forms:75657-77440,77442-79147,79149-79286,79288-79296,79298-79299,79301-79303,79305-96114,96125,96127-97926,97945-99042
+
/trunk/extensions/DonationInterface/payflowpro_gateway/forms:75657-77440,77442-79147,79149-79286,79288-79296,79298-79299,79301-79303,79305-96114,96125,96127-97926,97945-99042,99045-99121
Modified:
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/Form.php
===================================================================
---
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/Form.php
2011-10-06 17:33:23 UTC (rev 99123)
+++
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/Form.php
2011-10-06 17:55:23 UTC (rev 99124)
@@ -652,10 +652,8 @@
}
protected function loadValidateJs() {
- global $wgOut, $wgScriptPath;
- $wgOut->addHeadItem( 'validatescript', '<script
type="text/javascript" src="' .
- $wgScriptPath .
-
'/extensions/DonationInterface/payflowpro_gateway/validate_input.js?284"></script>'
);
+ global $wgOut;
+ $wgOut->addModules( 'pfp.form.core.validate' );
}
protected function loadApiJs() {
Property changes on:
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html:75657-77440,77442-79147,79149-79286,79288-79296,79298-79299,79301-79303,79305-96114,96125,96127-97926,97928,97945-99042
+
/trunk/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html:75657-77440,77442-79147,79149-79286,79288-79296,79298-79299,79301-79303,79305-96114,96125,96127-97926,97928,97945-99042,99045-99121
Modified:
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html/globalcollect_test.html
===================================================================
---
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html/globalcollect_test.html
2011-10-06 17:33:23 UTC (rev 99123)
+++
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html/globalcollect_test.html
2011-10-06 17:55:23 UTC (rev 99124)
@@ -1,6 +1,6 @@
-<link rel="stylesheet" href="@script_path/skins/vector/main-ltr.css" />
-<link rel="stylesheet"
href="@script_path/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnLetter3.css"
/>
-<link rel="stylesheet"
href="@script_path/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.css"
/>
+<script type="text/javascript">
+mw.loader.load('pfp.form.rapidhtml.globalcollect_test');
+</script>
<style>
.step2hidden{ display:none; }
#footer-places { display:none; }
Modified:
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html/globalcollect_test_2.html
===================================================================
---
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html/globalcollect_test_2.html
2011-10-06 17:33:23 UTC (rev 99123)
+++
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html/globalcollect_test_2.html
2011-10-06 17:55:23 UTC (rev 99124)
@@ -1,6 +1,6 @@
-<link rel="stylesheet" href="@script_path/skins/vector/main-ltr.css" />
-<link rel="stylesheet"
href="@script_path/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnLetter3.css"
/>
-<link rel="stylesheet"
href="@script_path/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.css"
/>
+<script type="text/javascript">
+mw.loader.load('pfp.form.rapidhtml.globalcollect_test');
+</script>
<style>
.step2hidden{ display:none; }
#footer-places { display:none; }
Property changes on:
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html/webitects_2_3step.html
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html/webitects_2_3step.html:75657-77440,77442-79147,79149-79286,79288-79296,79298-79299,79301-79303,79305-96114,96125,96127-97926,97928,97943,97945-99042
+
/trunk/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html/webitects_2_3step.html:75657-77440,77442-79147,79149-79286,79288-79296,79298-79299,79301-79303,79305-96114,96125,96127-97926,97928,97943,97945-99042,99045-99121
Property changes on:
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.alias.php
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.alias.php:75657-96113,96125,96127-97926,97945-99042
+
/trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.alias.php:75657-96113,96125,96127-97926,97945-99042,99045-99121
Modified:
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
===================================================================
---
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
2011-10-06 17:33:23 UTC (rev 99123)
+++
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
2011-10-06 17:55:23 UTC (rev 99124)
@@ -54,15 +54,6 @@
$wgPayFlowProGatewayCSSVersion,
$wgPayflowGatewaySalt;
- $wgOut->addExtensionStyle(
-
"{$wgScriptPath}/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.css?284"
.
- $wgPayFlowProGatewayCSSVersion );
-
- // Hide unneeded interface elements
- $wgOut->addExtensionStyle(
-
"{$wgScriptPath}/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.css?284"
.
- $wgPayFlowProGatewayCSSVersion );
-
$scriptVars = array(
'payflowproGatewayErrorMsgJs' => wfMsg(
'payflowpro_gateway-error-msg-js' ),
'payflowproGatewayErrorMsgEmail' => wfMsg(
'payflowpro_gateway-error-msg-email' ),
Property changes on:
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php:75657-77440,77442-79286,79288-79296,79298-79299,79301-79303,79305-86440,92825,92827-96116,96125,96127-97926,97945-99042
+
/trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php:75657-77440,77442-79286,79288-79296,79298-79299,79301-79303,79305-86440,92825,92827-96116,96125,96127-97926,97945-99042,99045-99121
Modified:
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.php
===================================================================
---
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.php
2011-10-06 17:33:23 UTC (rev 99123)
+++
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.php
2011-10-06 17:55:23 UTC (rev 99124)
@@ -183,6 +183,37 @@
'remoteExtPath' => 'DonationInterface/payflowpro_gateway'
);
+// RapidHtml globalcollect_test form resources
+$wgResourceModules[ 'pfp.form.rapidhtml.globalcollect_test' ] = array(
+ 'styles' => array(
+ 'forms/css/TwoStepTwoColumnLetter3.css',
+ 'payflowpro_gateway.css',
+ ),
+ 'scripts' => array(),
+ 'dependencies' => array(),
+ 'localBasePath' => dirname( __FILE__ ),
+ 'remoteExtPath' => 'DonationInterface/payflowpro_gateway'
+);
+
+// form validation resource
+$wgResourceModules[ 'pfp.form.core.validate' ] = array(
+ 'styles' => array(),
+ 'scripts' => 'validate_input.js',
+ 'dependencies' => 'pfp.form.core.pfp_css',
+ 'localBasePath' => dirname( __FILE__ ),
+ 'remoteExtPath' => 'DonationInterface/payflowpro_gateway'
+);
+
+// general PFP css
+$wgResourceModules[ 'pfp.form.core.pfp_css' ] = array(
+ 'styles' => 'payflowpro_gateway.css',
+ 'scripts' => array(),
+ 'dependencies' => array(),
+ 'localBasePath' => dirname( __FILE__ ),
+ 'remoteExtPath' => 'DonationInterface/payflowpro_gateway'
+);
+
+// RapidHtml lightbox form resources
$wgResourceModules[ 'pfp.form.rapidhtml.lightbox.js' ] = array(
'scripts' => array(
'forms/rapidhtml/js/lightbox1.js',
@@ -202,6 +233,9 @@
'position' => 'top',
);
+// RapidHtml lightbox form css resources (these are separate from the js
+// resources for a good reason but I forget what - I believe to facilitate
+// ensuring proper load order?
$wgResourceModules[ 'pfp.form.rapidhtml.lightbox.css' ] = array(
'styles' => array(
'forms/rapidhtml/css/lightbox1.css',
Property changes on:
branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/payflowpro_gateway/validate_input.js
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/extensions/DonationInterface/payflowpro_gateway/validate_input.js:75657-77440,77442-79147,79149-79286,79288-79296,79298-79299,79301-79303,79305-86440,91572,92825,96125,96127-97926,97945-99042
+
/trunk/extensions/DonationInterface/payflowpro_gateway/validate_input.js:75657-77440,77442-79147,79149-79286,79288-79296,79298-79299,79301-79303,79305-86440,91572,92825,96125,96127-97926,97945-99042,99045-99121
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
