twisterarmy/twister-html
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-html.git synced 2025-01-26 22:54:45 +00:00
Code Issues Projects Releases Wiki Activity

add a quick hack to not execute loadModalFromHash() until the basic initialization is finished

Browse Source
This commit is contained in:
Simon Grim 2019-02-02 12:57:30 +05:00
parent 01aed4bba7
commit 987090bd27
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/interface_common.js
View File

@ -24,6 +24,7 @@ var twister = {
return req.toString().replace(/GMT.*/g, '');
}
},
initializated: false,
isCurrentInputSplittable: false,
localAccounts: [],
updatesCheckClient: {}
@ -1316,6 +1317,11 @@ function loadModalFromHash() {
}
var hashdata = hashstring.split(':');
if (!twister.var.initializated) {
setTimeout(loadModalFromHash, 1000);
return;
}
// FIXME rework hash scheme from '#following?user=twister' to something like '#/@twister/following'
if (hashdata[0] !== '#web+twister')
hashdata = hashstring.match(/(hashtag|profile|mentions|directmessages|followers|following|conversation|favs)\?(?:group|user|hashtag|post)=(.+)/);

2
js/interface_home.js
View File

@ -58,6 +58,7 @@ var InterfaceFunctions = function() {
$(".dropdown-menu-following").attr("href","#");
$('.dropdown-menu-following').on('click', function ()
{ alert(polyglot.t("You are not following anyone because you are not logged in."))} );
twister.var.initializated = true;
} else {
$miniProfile.find("a.mini-profile-name").attr("href",$.MAL.userUrl(defaultScreenName));
$miniProfile.find("a.open-profile-modal").attr("href",$.MAL.userUrl(defaultScreenName));
@ -71,6 +72,7 @@ var InterfaceFunctions = function() {
getFollowers( defaultScreenName, $miniProfile.find(".followers-count") );
loadFollowing( function(args) {
twister.var.initializated = true;
$(".mini-profile .following-count").text(followingUsers.length-1);
requestLastHave();
setInterval(requestLastHave, 1000);