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

fixed an event propagation issue

Browse Source
This commit is contained in:
Julian Steinwachs 2015-01-22 16:43:25 +01:00
parent 12ec501d8d
commit c42965de88
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/interface_common.js
View File

@ -141,6 +141,8 @@ function newProfileModal(username) {
return profileModalContent; return profileModalContent;
} }
/*
function openProfileModal(e) function openProfileModal(e)
{ {
e.stopPropagation(); e.stopPropagation();
@ -161,6 +163,8 @@ function openProfileModalWithUsername(username)
window.location.hash = '#profile?user=' + username; window.location.hash = '#profile?user=' + username;
} }
*/
function openProfileModalWithUsernameHandler(username) function openProfileModalWithUsernameHandler(username)
{ {
var profileModalClass = "profile-modal"; var profileModalClass = "profile-modal";
@ -404,13 +408,18 @@ function watchHashChange(e)
hashstring = decodeURIComponent(hashstring); hashstring = decodeURIComponent(hashstring);
if(e!=null){ if(e!=null){
var prevhashstring = e.oldURL.split('#'); var prevurlsplit = e.oldURL.split('#');
prevhashstring=prevhashstring[1]; var newurlsplit = e.newURL.split('#');
if(prevhashstring.length>0 && prevhashstring!=undefined){ prevhashstring=prevurlsplit[1];
if(prevurlsplit[0]==newurlsplit[0] && prevhashstring.length>0 && prevhashstring!=undefined){
$('.modal-back').css('display','inline'); $('.modal-back').css('display','inline');
$('.modal-back').on('click', function(e){ $('.modal-back').on('click', function(e){
e.stopPropagation();
e.preventDefault(); e.preventDefault();
//window.location.hash = '#' + prevhashstring;
history.back(1); history.back(1);
}); });
} else { } else {
$('.modal-back').css('display','none'); $('.modal-back').css('display','none');
@ -1451,10 +1460,10 @@ function initInterfaceCommon() {
var $replyText = $( ".post-area-new textarea" ); var $replyText = $( ".post-area-new textarea" );
$replyText.on("keyup", replyTextKeypress ); $replyText.on("keyup", replyTextKeypress );
//$( ".open-profile-modal").bind( "click", openProfileModal ); $( ".open-profile-modal").bind( "click", function(e){ e.stopPropagation(); } );
//$( ".open-hashtag-modal").bind( "click", openHashtagModal ); //$( ".open-hashtag-modal").bind( "click", openHashtagModal );
//$( ".open-following-modal").bind( "click", openFollowingModal ); //$( ".open-following-modal").bind( "click", openFollowingModal );
//$( ".userMenu-connections a").bind( "click", openMentionsModal ); $( ".userMenu-connections a").bind( "click", openMentionsModal );
$( ".mentions-from-user").bind( "click", openMentionsModal ); $( ".mentions-from-user").bind( "click", openMentionsModal );
replaceDashboards(); replaceDashboards();