Changeset 2276

Timestamp:

01/12/2016 03:56:43 PM (11 years ago)

Author:

iandunn

Message:

WordCamp Budgets: Rename wordcamp-budgets script to payment-requests.

It only deals with payment requests, rather than having functionality common to all modules.

Location:

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments

Files:

• includes/wordcamp-budgets.php (modified) (4 diffs)
• javascript/attached-files.js (modified) (8 diffs)
• javascript/payment-requests.js (moved) (moved from sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/wordcamp-budgets.js ) (8 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php

@@ -24 +24 @@
                 // Register our assets
                 wp_register_script(
-                        'wordcamp-budgets',
-                        plugins_url( 'javascript/wordcamp-budgets.js', __DIR__ ),
+                        'payment-requests',
+                        plugins_url( 'javascript/payment-requests.js', __DIR__ ),
                         array( 'jquery', 'jquery-ui-datepicker', 'media-upload', 'media-views' ),
                         self::VERSION,
@@ -34 +34 @@
                         'wcp-attached-files',
                         plugins_url( 'javascript/attached-files.js', __DIR__ ),
-                        array( 'wordcamp-budgets', 'backbone', 'wp-util' ),
+                        array( 'payment-requests', 'backbone', 'wp-util' ),
                         self::VERSION,
                         true
@@ -56 +56 @@
 
                 if ( in_array( $current_screen->id, array( 'edit-wcp_payment_request', 'wcp_payment_request' ) ) ) {
-                        wp_enqueue_script( 'wordcamp-budgets' );
+                        wp_enqueue_script( 'payment-requests' );
                         wp_enqueue_style( 'wordcamp-budgets' );
 
@@ -65 +65 @@
 
                         wp_localize_script(
-                                'wordcamp-budgets',
+                                'payment-requests',
                                 'wcpLocalizedStrings',          // todo merge into wordcampBudgets var
                                 array(

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/attached-files.js

@@ -4 +4 @@
          * Model for an attached file
          */
-        $.wordcampBudgets.AttachedFile = Backbone.Model.extend( {
+        $.paymentRequests.AttachedFile = Backbone.Model.extend( {
                 defaults: {
                         'ID':          0,
@@ -16 +16 @@
          * Collection of attached files
          */
-        $.wordcampBudgets.AttachedFiles = Backbone.Collection.extend( {
-                model: $.wordcampBudgets.AttachedFile
+        $.paymentRequests.AttachedFiles = Backbone.Collection.extend( {
+                model: $.paymentRequests.AttachedFile
         } );
 
@@ -23 +23 @@
          * View for a single attached file
          */
-        $.wordcampBudgets.AttachedFileView = Backbone.View.extend( {
+        $.paymentRequests.AttachedFileView = Backbone.View.extend( {
                 tagName: 'li',
                 template: wp.template( 'wcp-attached-file' ),
@@ -40 +40 @@
          * View for a collection of attached files
          */
-        $.wordcampBudgets.AttachedFilesView = Backbone.View.extend( {
+        $.paymentRequests.AttachedFilesView = Backbone.View.extend( {
                 el: $( '#wcp_files' ),
 
@@ -46 +46 @@
                         _.bindAll( this, 'render', 'appendFile' );
 
-                        this.collection = new $.wordcampBudgets.AttachedFiles( wcpAttachedFiles );
+                        this.collection = new $.paymentRequests.AttachedFiles( wcpAttachedFiles );
                         this.collection.bind( 'add', this.appendFile );
 
@@ -62 +62 @@
                 appendFile: function( file ) {
                         var noFilesUploaded  = $( '.wcp_no_files_uploaded' );
-                        var attachedFileView = new $.wordcampBudgets.AttachedFileView( { model: file } );
+                        var attachedFileView = new $.paymentRequests.AttachedFileView( { model: file } );
 
                         $( '.wcp_files_list' ).append( attachedFileView.render().el );
@@ -79 +79 @@
                  * Files that are already attached to other posts are ignored.
                  *
-                 * @param {wordcampBudgets.AttachedFile} file
+                 * @param {paymentRequests.AttachedFile} file
                  */
                 attachExistingFile: function( file ) {
@@ -98 +98 @@
         } );
 
-        $.wordcampBudgets.attachedFilesView = new $.wordcampBudgets.AttachedFilesView();
+        $.paymentRequests.attachedFilesView = new $.paymentRequests.AttachedFilesView();
 
 } );

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/payment-requests.js

@@ -1 +1 @@
 jQuery( document ).ready( function( $ ) {
 
-        $.wordcampBudgets = {
+        $.paymentRequests = {
 
                 /**
@@ -7 +7 @@
                  */
                 init: function () {
-                        $.wordcampBudgets.registerEventHandlers();
-                        $.wordcampBudgets.setupDatePicker();
+                        $.paymentRequests.registerEventHandlers();
+                        $.paymentRequests.setupDatePicker();
                 },
 
@@ -15 +15 @@
                  */
                 registerEventHandlers : function() {
-                        $( '#wcp_payment_details' ).find( 'input[name=payment_method]' ).change( $.wordcampBudgets.togglePaymentMethodFields );
-                        $( '#payment_category' ).change( $.wordcampBudgets.toggleOtherCategoryDescription );
-                        $( '#wcp_files' ).find( 'a.wcp-insert-media' ).click( $.wordcampBudgets.showUploadModal );
-                        $( '#wcp_mark_incomplete_checkbox' ).click( $.wordcampBudgets.requireNotes );
+                        $( '#wcp_payment_details' ).find( 'input[name=payment_method]' ).change( $.paymentRequests.togglePaymentMethodFields );
+                        $( '#payment_category' ).change( $.paymentRequests.toggleOtherCategoryDescription );
+                        $( '#wcp_files' ).find( 'a.wcp-insert-media' ).click( $.paymentRequests.showUploadModal );
+                        $( '#wcp_mark_incomplete_checkbox' ).click( $.paymentRequests.requireNotes );
                 },
 
@@ -61 +61 @@
                  */
                 showUploadModal : function( event ) {
-                        if ( 'undefined' == typeof $.wordcampBudgets.fileUploadFrame ) {
+                        if ( 'undefined' == typeof $.paymentRequests.fileUploadFrame ) {
                                 // Create the frame
-                                $.wordcampBudgets.fileUploadFrame = wp.media( {
+                                $.paymentRequests.fileUploadFrame = wp.media( {
                                         title: wcpLocalizedStrings.uploadModalTitle,
                                         multiple: true,
@@ -72 +72 @@
 
                                 // Add models to the collection for each selected attachment
-                                $.wordcampBudgets.fileUploadFrame.on( 'select', $.wordcampBudgets.addSelectedFilesToCollection );
+                                $.paymentRequests.fileUploadFrame.on( 'select', $.paymentRequests.addSelectedFilesToCollection );
                         }
 
-                        $.wordcampBudgets.fileUploadFrame.open();
+                        $.paymentRequests.fileUploadFrame.open();
                         return false;
                 },
@@ -83 +83 @@
                  */
                 addSelectedFilesToCollection : function() {
-                        var attachments = $.wordcampBudgets.fileUploadFrame.state().get( 'selection' ).toJSON();
+                        var attachments = $.paymentRequests.fileUploadFrame.state().get( 'selection' ).toJSON();
 
                         $.each( attachments, function( index, attachment ) {
-                                var newFile = new $.wordcampBudgets.AttachedFile( {
+                                var newFile = new $.paymentRequests.AttachedFile( {
                                         'ID':          attachment.id,
                                         'post_parent': attachment.uploadedTo,
@@ -93 +93 @@
                                 } );
 
-                                $.wordcampBudgets.attachedFilesView.collection.add( newFile );
+                                $.paymentRequests.attachedFilesView.collection.add( newFile );
                         } );
                 },
@@ -127 +127 @@
         };
 
-        $.wordcampBudgets.init();
+        $.paymentRequests.init();
 } );