Ticket #2151: globaljs.patch

bp-themes/bp-default/_inc/global.js

@@ -1 +1 @@
 // AJAX Functions
-var j = jQuery;
 
 // Global variable to prevent multiple AJAX requests
 var bp_ajax_request = null;
 
 j(document).ready( function() {
+        var j = jQuery;
         /**** Page Load Actions *******************************************************/
 
         /* Hide Forums Post Form */
@@ -1042 +1042 @@
 
 /* Setup activity scope and filter based on the current cookie settings. */
 function bp_init_activity() {
+        var j = jQuery;
         /* Reset the page */
         j.cookie( 'bp-activity-oldestpage', 1, {path: '/'} );
 
@@ -1059 +1060 @@
 
 /* Setup object scope and filter based on the current cookie settings for the object. */
 function bp_init_objects(objects) {
+        var j = jQuery;
         j(objects).each( function(i) {
                 if ( null != j.cookie('bp-' + objects[i] + '-filter') && j('li#' + objects[i] + '-order-select select').length )
                         j('li#' + objects[i] + '-order-select select option[value=' + j.cookie('bp-' + objects[i] + '-filter') + ']').attr( 'selected', 'selected' );
@@ -1074 +1076 @@
 
 /* Filter the current content list (groups/members/blogs/topics) */
 function bp_filter_request( object, filter, scope, target, search_terms, page, extras ) {
+        var j = jQuery;
         if ( 'activity' == object )
                 return false;
 
@@ -1124 +1127 @@
 
 /* Activity Loop Requesting */
 function bp_activity_request(scope, filter) {
+        var j = jQuery;
         /* Save the type and filter to a session cookie */
         j.cookie( 'bp-activity-scope', scope, {path: '/'} );
         j.cookie( 'bp-activity-filter', filter, {path: '/'} );
@@ -1174 +1178 @@
 
 /* Hide long lists of activity comments, only show the latest five root comments. */
 function bp_dtheme_hide_comments() {
+        var j = jQuery;
         var comments_divs = j('div.activity-comments');
 
         if ( !comments_divs.length )