<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[2277] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes: WordCamp Budgets: Move `payment-request` script enqueing into module.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/2277">2277</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/2277","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-01-12 16:36:29 +0000 (Tue, 12 Jan 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordCamp Budgets: Move `payment-request` script enqueing into module.
Since it's not shared across modules, it should live in the Payment Requests module.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludespaymentrequestphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludeswordcampbudgetsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludespaymentrequestphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php 2016-01-12 15:56:43 UTC (rev 2276)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php 2016-01-12 16:36:29 UTC (rev 2277)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,6 +11,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', array( $this, 'register_post_type' ));
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', array( __CLASS__, 'register_post_statuses' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'add_meta_boxes', array( $this, 'init_meta_boxes' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_assets' ), 11 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Miscellaneous
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'display_post_states', array( $this, 'display_post_states' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,6 +172,54 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Enqueue scripts and stylesheets
+ */
+ public function enqueue_assets() {
+ global $post;
+
+ // Register our assets
+ wp_register_script(
+ 'payment-requests',
+ plugins_url( 'javascript/payment-requests.js', __DIR__ ),
+ array( 'jquery', 'jquery-ui-datepicker', 'media-upload', 'media-views' ),
+ WordCamp_Budgets::VERSION,
+ true
+ );
+
+ wp_register_script(
+ 'wcp-attached-files',
+ plugins_url( 'javascript/attached-files.js', __DIR__ ),
+ array( 'payment-requests', 'backbone', 'wp-util' ),
+ WordCamp_Budgets::VERSION,
+ true
+ );
+
+ // Enqueue our assets if they're needed on the current screen
+ $current_screen = get_current_screen();
+
+ if ( 'wcp_payment_request' !== $current_screen->id ) {
+ return;
+ }
+
+ wp_enqueue_script( 'payment-requests' );
+ wp_enqueue_style( 'wordcamp-budgets' );
+
+ if ( isset( $post->ID ) ) {
+ wp_enqueue_media( array( 'post' => $post->ID ) );
+ wp_enqueue_script( 'wcp-attached-files' );
+ }
+
+ wp_localize_script(
+ 'payment-requests',
+ 'wcpLocalizedStrings', // todo merge into paymentRequests var
+ array(
+ 'uploadModalTitle' => __( 'Attach Supporting Documentation', 'wordcamporg' ),
+ 'uploadModalButton' => __( 'Attach Files', 'wordcamporg' ),
+ )
+ );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Render the Status metabox
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $post
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludeswordcampbudgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php 2016-01-12 15:56:43 UTC (rev 2276)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php 2016-01-12 16:36:29 UTC (rev 2277)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,34 +10,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Constructor
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_assets' ), 11 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_common_assets' ), 11 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Enqueue scripts and stylesheets
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Enqueue scripts and stylesheets common to all modules
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function enqueue_assets( $hook ) {
- global $post;
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function enqueue_common_assets() {
</ins><span class="cx" style="display: block; padding: 0 10px"> // todo setup grunt to concat/minify js and css?
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Register our assets
- wp_register_script(
- 'payment-requests',
- plugins_url( 'javascript/payment-requests.js', __DIR__ ),
- array( 'jquery', 'jquery-ui-datepicker', 'media-upload', 'media-views' ),
- self::VERSION,
- true
- );
-
- wp_register_script(
- 'wcp-attached-files',
- plugins_url( 'javascript/attached-files.js', __DIR__ ),
- array( 'payment-requests', 'backbone', 'wp-util' ),
- self::VERSION,
- true
- );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Let's still include our .css file even if these are unavailable.
</span><span class="cx" style="display: block; padding: 0 10px"> $soft_deps = array( 'jquery-ui', 'wp-datepicker-skins' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $soft_deps as $key => $handle )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,28 +31,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $soft_deps,
</span><span class="cx" style="display: block; padding: 0 10px"> self::VERSION
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // Enqueue our assets if they're needed on the current screen
- $current_screen = get_current_screen();
-
- if ( in_array( $current_screen->id, array( 'edit-wcp_payment_request', 'wcp_payment_request' ) ) ) {
- wp_enqueue_script( 'payment-requests' );
- wp_enqueue_style( 'wordcamp-budgets' );
-
- if ( in_array( $current_screen->id, array( 'wcp_payment_request' ) ) && isset( $post->ID ) ) {
- wp_enqueue_media( array( 'post' => $post->ID ) );
- wp_enqueue_script( 'wcp-attached-files' );
- }
-
- wp_localize_script(
- 'payment-requests',
- 'wcpLocalizedStrings', // todo merge into wordcampBudgets var
- array(
- 'uploadModalTitle' => __( 'Attach Supporting Documentation', 'wordcamporg' ),
- 'uploadModalButton' => __( 'Attach Files', 'wordcamporg' ),
- )
- );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>