twisterarmy/twister-html
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-html.git synced 2025-02-05 03:24:17 +00:00
Code Issues Projects Releases Wiki Activity

router also following modal navigation through watchHashChange

Browse Source
This commit is contained in:
Julian Steinwachs 2015-01-21 14:13:45 +01:00
parent 01823434a8
commit fd26787549
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/interface_common.js
View File

@ -253,13 +253,13 @@ function newFollowingModal(username) {
return followingModalContent;
}
function openFollowingModal(e)
function openFollowingModal(username)
{
e.stopPropagation();
e.preventDefault();
//e.stopPropagation();
//e.preventDefault();
var $this = $( this );
var username = $.MAL.followingUrlToUser( $this.attr("href") );
//var $this = $( this );
//var username = $.MAL.followingUrlToUser( $this.attr("href") );
var followingModalClass = "following-modal";
openModal( followingModalClass );
@ -406,7 +406,7 @@ function watchHashChange(e)
var hashdata = hashstring.split(':');
if (hashdata[0] != '#web+twister') {
hashdata = hashstring.match(/(hashtag|profile|mentions|directmessages)\?(?:user|hashtag)=(.+)/);
hashdata = hashstring.match(/(hashtag|profile|mentions|directmessages|following)\?(?:user|hashtag)=(.+)/);
}
//console.log(hashdata);
@ -419,6 +419,8 @@ function watchHashChange(e)
openMentionsModalHandler(hashdata[2]);
}else if (hashdata[1] == 'directmessages') {
openDmWithUserModal(hashdata[2]);
}else if (hashdata[1] == 'following') {
openFollowingModal(hashdata[2]);
}
} else if (hashstring == '#directmessages') {
directMessagesPopup();
@ -1424,7 +1426,7 @@ function initInterfaceCommon() {
$( ".open-profile-modal").bind( "click", openProfileModal );
$( ".open-hashtag-modal").bind( "click", openHashtagModal );
$( ".open-following-modal").bind( "click", openFollowingModal );
//$( ".open-following-modal").bind( "click", openFollowingModal );
$( ".userMenu-connections a").bind( "click", openMentionsModal );
$( ".mentions-from-user").bind( "click", openMentionsModal );