<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [2436] trunk/bp-themes/bp-default/_inc/global.js:
Moving hash url detection out of filter function.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2436</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-24 22:53:59 +0000 (Sun, 24 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Moving hash url detection out of filter function.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (2435 => 2436)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2010-01-24 22:47:52 UTC (rev 2435)
+++ trunk/bp-themes/bp-default/_inc/global.js 2010-01-24 22:53:59 UTC (rev 2436)
</span><span class="lines">@@ -6,9 +6,16 @@
</span><span class="cx"> /**** Page Load Actions *******************************************************/
</span><span class="cx">
</span><span class="cx"> /* Activity */
</span><del>- if ( j('div.activity').length && !j('div.activity').hasClass('no-ajax') )
- bp_activity_request( j.cookie('bp-activity-scope'), j.cookie('bp-activity-filter') );
</del><ins>+ 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');
</ins><span class="cx">
</span><ins>+ bp_activity_request( scope, j.cookie('bp-activity-filter') );
+ }
+
</ins><span class="cx"> /* Members */
</span><span class="cx"> if ( j('div.members').length )
</span><span class="cx"> bp_filter_request( 'members', j.cookie('bp-members-filter'), j.cookie('bp-members-scope'), 'div.members' );
</span><span class="lines">@@ -251,10 +258,6 @@
</span><span class="cx"> if ( null == filter )
</span><span class="cx"> var filter = '-1';
</span><span class="cx">
</span><del>- /* If there's a hash URL, try and use it. */
- if ( location.hash.length )
- var scope = location.hash.substr( 1, location.hash.length - 2 );
-
</del><span class="cx"> /* Save the type and filter to a session cookie */
</span><span class="cx"> j.cookie( 'bp-activity-scope', scope, null );
</span><span class="cx"> j.cookie( 'bp-activity-filter', filter, null );
</span></span></pre>
</div>
</div>
</body>
</html>