Ticket #5148: 5148.2.patch

bp-notifications/bp-notifications-template.php

@@ -241 +241 @@
                 $this->search_terms = $r['search_terms'];
                 $this->page_arg     = $r['page_arg'];
                 $this->order_by     = $r['order_by'];
-                $this->sort_order   = $r['sort_order'];
+                $this->sort_order   = in_array( $_GET['sort_order'], array( 'ASC', 'DESC' ) ) ? $_GET['sort_order'] :$r['sort_order'];
 
                 // Get the notifications
                 $notifications      = BP_Notifications_Notification::get_current_notifications_for_user( array(
@@ -272 +272 @@
                         } else {
                                 $this->notification_count = count( $this->notifications );
                         }
+                        
+                        //we have notifications, so we enqueue the sort behavior handling JS
+                        wp_enqueue_script( 'bp-notifications-behavior', BP_PLUGIN_URL . '/bp-notifications/js/bp-notifications-behavior.js', array('jquery'), '0.1', TRUE );
                 }
 
                 if ( (int) $this->total_notification_count && (int) $this->pag_num ) {
@@ -287 +290 @@
                 }
         }
 
+        public function enqueue_scripts() {
+                //wp_enqueue_script( 'bp-notifications-behavior', __DIR__ . '/js/bp-notifications-behavior.js', array('jquery'), '0.1', TRUE );
+        }
+
         /**
          * Whether there are notifications available in the loop.
          *

bp-notifications/js/bp-notifications-behavior.js

@@ +1 @@
+(function( $ ) {
+        $.fn.reverse = [].reverse;
+        
+        function reverse_sort() {
+                if( is_paginated() ) {
+                        var sort_order = new_sort_order( get_query_vars() );
+                        document.location.href = document.location.origin + document.location.pathname + '?sort_order=' + sort_order;
+                }
+        
+                var $notification_tbody = $('table.notifications tbody');
+                $notification_tbody.html($notification_tbody.find('tr').reverse());
+        }
+        
+        function new_sort_order(qv) {
+                return !qv['sort_order'] || 'DESC' == qv['sort_order'] ? 'ASC' : 'DESC';
+        }
+        
+        function get_current_page() {
+                var qv = get_query_vars();      
+                return !qv['npage'] ? 1 : parseInt( qv['npage'] );
+        }
+        
+        function is_paginated() {
+                return !!$('.pagination-links .page-numbers').length;
+        }
+        
+        function get_query_vars() {
+                var vars = [], hash;
+            var q = document.URL.split('?')[1];
+            if(q != undefined){
+                q = q.split('&');
+                for(var i = 0; i < q.length; i++){
+                    hash = q[i].split('=');
+                    vars.push(hash[1]);
+                    vars[hash[0]] = hash[1];
+                }
+                }
+                return vars;
+        }
+        
+        $('#members-friends').on('change', reverse_sort);
+}(jQuery));
+ No newline at end of file

bp-templates/bp-legacy/buddypress/members/single/notifications/notifications-loop.php

@@ -21 +21 @@
 
                 <?php endwhile; ?>
 
-        <tbody>
+        </tbody>
 </table>
+ No newline at end of file

bp-templates/bp-legacy/buddypress/members/single/notifications.php

@@ -18 +18 @@
                         <label for="members-friends"><?php _e( 'Order By:', 'buddypress' ); ?></label>
                         <select id="members-friends">
                                 <option value="newest"><?php _e( 'Newest First', 'buddypress' ); ?></option>
-                                <option value="oldest"><?php _e( 'Oldest First', 'buddypress' ); ?></option>
+                                <option value="oldest" <?php selected( $_GET['sort_order'], 'ASC' ); ?>><?php _e( 'Oldest First', 'buddypress' ); ?></option>
                         </select>
                 </li>
         </ul>