Changeset 12058

Timestamp:

05/05/2018 06:21:08 AM (7 years ago)

Author:

imath

Message:

BP Nouveau: use a JS Template for the feedbacks of the Messages UI

Using a JS template avoids to transport common HTML tags inside the Ajax replies.

See #7794

Location:

trunk/src/bp-templates/bp-nouveau

Files:

• buddypress/common/js-templates/messages/index.php (modified) (1 diff)
• includes/messages/ajax.php (modified) (12 diffs)
• includes/messages/functions.php (modified) (1 diff)
• js/buddypress-messages.js (modified) (1 diff)

trunk/src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php

@@ -13 +13 @@
 <div class="bp-messages-feedback"></div>
 <div class="bp-messages-content"></div>
+
+<script type="text/html" id="tmpl-bp-messages-feedback">
+    <div class="bp-feedback {{data.type}}">
+        <span class="bp-icon" aria-hidden="true"></span>
+        <p>{{{data.message}}}</p>
+    </div>
+</script>
 
 <script type="text/html" id="tmpl-bp-messages-form">

trunk/src/bp-templates/bp-nouveau/includes/messages/ajax.php

@@ -108 +108 @@
 function bp_nouveau_ajax_messages_send_reply() {
     $response = array(
-        'feedback' => '<div class="bp-feedback error"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'There was a problem sending your reply. Please try again.', 'buddypress' ) . '</p></div>',
+        'feedback' => __( 'There was a problem sending your reply. Please try again.', 'buddypress' ),
         'type'     => 'error',
     );
@@ -187 +187 @@
     wp_send_json_success( array(
         'messages' => array( $reply ),
-        'feedback' => '<div class="bp-feedback success"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'Your reply was sent successfully', 'buddypress' ) . '</p></div>',
+        'feedback' => __( 'Your reply was sent successfully', 'buddypress' ),
         'type'     => 'success',
     ) );
@@ -200 +200 @@
     if ( empty( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'bp_nouveau_messages' ) ) {
         wp_send_json_error( array(
-            'feedback' => '<div class="bp-feedback error"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'Unauthorized request.', 'buddypress' ) . '</p></div>',
+            'feedback' => __( 'Unauthorized request.', 'buddypress' ),
             'type'     => 'error'
         ) );
@@ -215 +215 @@
     if ( ! bp_has_message_threads( bp_ajax_querystring( 'messages' ) ) ) {
         wp_send_json_error( array(
-            'feedback' => '<div class="bp-feedback info"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'Sorry, no messages were found.', 'buddypress' ) . '</p></div>',
+            'feedback' => __( 'Sorry, no messages were found.', 'buddypress' ),
             'type'     => 'info'
         ) );
@@ -342 +342 @@
     if ( empty( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'bp_nouveau_messages' ) ) {
         wp_send_json_error( array(
-            'feedback' => '<div class="bp-feedback error"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'Unauthorized request.', 'buddypress' ) . '</p></div>',
+            'feedback' => __( 'Unauthorized request.', 'buddypress' ),
             'type'     => 'error'
         ) );
@@ -348 +348 @@
 
     $response = array(
-        'feedback' => '<div class="bp-feedback info"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'Sorry, no messages were found.', 'buddypress' ) . '</p></div>',
+        'feedback' => __( 'Sorry, no messages were found.', 'buddypress' ),
         'type'     => 'info'
     );
@@ -435 +435 @@
 function bp_nouveau_ajax_delete_thread_messages() {
     $response = array(
-        'feedback' => '<div class="bp-feedback error"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'There was a problem deleting your message(s). Please try again.', 'buddypress' ) . '</p></div>',
+        'feedback' => __( 'There was a problem deleting your message(s). Please try again.', 'buddypress' ),
         'type'     => 'error',
     );
@@ -458 +458 @@
 
     wp_send_json_success( array(
-        'feedback' => '<div class="bp-feedback info"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'Message(s) deleted', 'buddypress' ) . '</p></div>',
+        'feedback' => __( 'Message(s) deleted', 'buddypress' ),
         'type'     => 'success',
     ) );
@@ -480 +480 @@
 
     $response = array(
-        'feedback' => '<div class="bp-feedback error"><span class="bp-icon" aria-hidden="true"></span><p>' . esc_html( $error_message ) . '</p></div>',
+        'feedback' => esc_html( $error_message ),
         'type'     => 'error',
     );
@@ -556 +556 @@
 
     wp_send_json_success( array(
-        'feedback' => '<div class="bp-feedback info"><span class="bp-icon" aria-hidden="true"></span><p>' . esc_html( $success_message ) . '</p></div>',
+        'feedback' => esc_html( $success_message ),
         'type'     => 'success',
         'messages' => $messages,
@@ -579 +579 @@
     if ( 'unread' === $action ) {
         $response = array(
-            'feedback' => '<div class="bp-feedback error"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'There was a problem marking your message(s) as unread. Please try again.', 'buddypress' ) . '</p></div>',
+            'feedback' => __( 'There was a problem marking your message(s) as unread. Please try again.', 'buddypress' ),
             'type'     => 'error',
         );
@@ -597 +597 @@
 
     if ( 'unread' === $action ) {
-        $response['feedback'] = '<div class="bp-feedback info"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'Message(s) marked as unread.', 'buddypress' ) . '</p></div>';
+        $response['feedback'] = __( 'Message(s) marked as unread.', 'buddypress' );
     } else {
-        $response['feedback'] = '<div class="bp-feedback info"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'Message(s) marked as read.', 'buddypress' ) . '</p></div>';
+        $response['feedback'] = __( 'Message(s) marked as read.', 'buddypress' );
     }
 

trunk/src/bp-templates/bp-nouveau/includes/messages/functions.php

@@ -99 +99 @@
             'send' => wp_create_nonce( 'messages_send_message' ),
         ),
-        'loading' => '<div class="bp-feedback info"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'Loading messages. Please wait.', 'buddypress' ) . '</p></div>',
+        'loading' => __( 'Loading messages. Please wait.', 'buddypress' ),
         'bulk_actions' => bp_nouveau_messages_get_bulk_actions(),
     );

trunk/src/bp-templates/bp-nouveau/js/buddypress-messages.js

@@ -453 +453 @@
         tagName: 'div',
         className: 'bp-messages bp-user-messages-feedback',
+        template  : bp.template( 'bp-messages-feedback' ),
 
         initialize: function() {
-            this.value = this.options.value;
-
-            if ( this.options.type ) {
-                this.el.className += ' ' + this.options.type;
-            }
-        },
-
-        render: function() {
-            this.$el.html( this.value );
-            return this;
+            this.model = new Backbone.Model( {
+                type: this.options.type || 'info',
+                message: this.options.value
+            } );
         }
     } );