Changeset 2436

Timestamp:

01/24/2010 10:53:59 PM (16 years ago)

Author:

apeatling

Message:

Moving hash url detection out of filter function.

File:

• trunk/bp-themes/bp-default/_inc/global.js (modified) (2 diffs)

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

@@ -7 +7 @@
 
     /* Activity */
-    if ( j('div.activity').length && !j('div.activity').hasClass('no-ajax') )
-        bp_activity_request( j.cookie('bp-activity-scope'), j.cookie('bp-activity-filter') );
+    if ( j('div.activity').length && !j('div.activity').hasClass('no-ajax') ) {
+        /* If there's a hash URL, try and use it. */
+        if ( location.hash.length )
+            var scope = location.hash.substr( 1, location.hash.length - 2 );
+        else
+            var scope = j.cookie('bp-activity-scope');
+
+        bp_activity_request( scope, j.cookie('bp-activity-filter') );
+    }
 
     /* Members */
@@ -251 +258 @@
         if ( null == filter )
             var filter = '-1';
-
-        /* If there's a hash URL, try and use it. */
-        if ( location.hash.length )
-            var scope = location.hash.substr( 1, location.hash.length - 2 );
 
         /* Save the type and filter to a session cookie */