wamo/Qvitter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
[fix][partial] External profil cards are not shown

See merge request !89
This commit is contained in:
hannes 2017-04-10 18:17:04 +00:00
commit d06790bffc
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/dom-functions.js
View File

@ -488,7 +488,6 @@ function buildProfileCard(data) {
· · · · · · · · · */ · · · · · · · · · */
function buildExternalProfileCard(data) { function buildExternalProfileCard(data) {
// follows me? // follows me?
var follows_you = ''; var follows_you = '';
if(data.local !== null && data.local.follows_you === true && window.loggedIn.id != data.local.id) { if(data.local !== null && data.local.follows_you === true && window.loggedIn.id != data.local.id) {
@ -497,7 +496,7 @@ function buildExternalProfileCard(data) {
// follow button // follow button
var followButton = ''; var followButton = '';
if(window.loggedIn !== false && typeof data.local != 'undefined' && data.local !== null) { if(window.loggedIn !== false && typeof data.local != 'undefined' && data.local) {
var followButton = buildFollowBlockbutton(data.local); var followButton = buildFollowBlockbutton(data.local);
} }

6
js/qvitter.js
View File

@ -285,7 +285,6 @@ $('body').on('mouseover',function (e) {
possibleNickname = $(e.target).text(); possibleNickname = $(e.target).text();
} }
} }
// see if we have it in cache, otherwise query server // see if we have it in cache, otherwise query server
getUserArrayData(hrefAttr, possibleNickname, timeNow, targetElement, function(userArray, timeOut){ getUserArrayData(hrefAttr, possibleNickname, timeNow, targetElement, function(userArray, timeOut){
@ -328,9 +327,8 @@ $('body').on('mouseover',function (e) {
// we query it for the lastest data // we query it for the lastest data
if((typeof window.userArrayLastRetrieved[hrefAttr] == 'undefined') || (timeNow - window.userArrayLastRetrieved[hrefAttr]) > 60000) { if((typeof window.userArrayLastRetrieved[hrefAttr] == 'undefined') || (timeNow - window.userArrayLastRetrieved[hrefAttr]) > 60000) {
window.userArrayLastRetrieved[hrefAttr] = timeNow; window.userArrayLastRetrieved[hrefAttr] = timeNow;
// local users // local users
if(userArray.local !== null && userArray.local.is_local === true) { if(userArray.local && userArray.local.is_local === true) {
getFromAPI('users/show.json?id=' + userArray.local.screen_name, function(data){ getFromAPI('users/show.json?id=' + userArray.local.screen_name, function(data){
if(data) { if(data) {
var newProfileCard = buildProfileCard(data); var newProfileCard = buildProfileCard(data);
@ -341,7 +339,7 @@ $('body').on('mouseover',function (e) {
} }
// external users // external users
else if(userArray.local === null || userArray.local.is_local === false) { else if(!userArray.local || userArray.local.is_local === false) {
getFromAPI('qvitter/external_user_show.json?profileurl=' + encodeURIComponent(hrefAttr),function(data){ getFromAPI('qvitter/external_user_show.json?profileurl=' + encodeURIComponent(hrefAttr),function(data){
if(data && data.external !== null) { if(data && data.external !== null) {
var newProfileCard = buildExternalProfileCard(data); var newProfileCard = buildExternalProfileCard(data);