diff --git a/code/portal_detail_display.js b/code/portal_detail_display.js index 7d1851bc..f863d7ca 100644 --- a/code/portal_detail_display.js +++ b/code/portal_detail_display.js @@ -41,46 +41,13 @@ window.renderPortalDetails = function(guid) { var img = fixPortalImageUrl(details ? details.image : data.image); - var title = data.title; + var title = (details && details.title) || (data && data.title) || '(untitled)'; var lat = data.latE6/1E6; var lng = data.lngE6/1E6; - var imgTitle = details ? getPortalDescriptionFromDetails(details) : data.title; - imgTitle += '\n\nClick to show full image.'; - var portalDetailObj = details ? window.getPortalDescriptionFromDetailsExtended(details) : undefined; + var imgTitle = title+'\n\nClick to show full image.'; - var portalDetailedDescription = ''; - - if(portalDetailObj) { - portalDetailedDescription = ''; - - // TODO (once the data supports it) - portals can have multiple photos. display all, with navigation between them - // (at this time the data isn't returned from the server - although a count of images IS returned!) - - if(portalDetailObj.submitter.name.length > 0) { - if(portalDetailObj.submitter.team) { - submitterSpan = ''; - } else { - submitterSpan = ''; - } - portalDetailedDescription += ''; - } - if(portalDetailObj.submitter.link.length > 0) { - portalDetailedDescription += ''; - } - - if(portalDetailObj.description) { - portalDetailedDescription += ''; - } -// if(d.descriptiveText.map.ADDRESS) { -// portalDetailedDescription += ''; -// } - - portalDetailedDescription += '
Photo by:' + submitterSpan - + escapeHtmlSpecialChars(portalDetailObj.submitter.name) + ''+(portalDetailObj.submitter.voteCount !== undefined ? ' (' + portalDetailObj.submitter.voteCount + ' votes)' : '')+'
Photo from:' + escapeHtmlSpecialChars(portalDetailObj.submitter.link) + '
Description:' + escapeHtmlSpecialChars(portalDetailObj.description) + '
Address:' + escapeHtmlSpecialChars(d.descriptiveText.map.ADDRESS) + '
'; - } // portal level. start with basic data - then extend with fractional info in tooltip if available var levelInt = (teamStringToId(data.team) == TEAM_NONE) ? 0 : data.level; @@ -127,7 +94,7 @@ window.renderPortalDetails = function(guid) { .html('') //to ensure it's clear .attr('class', TEAM_TO_CSS[teamStringToId(data.team)]) .append( - $('

').attr({class:'title'}).text(data.title), + $('

').attr({class:'title'}).text(title), $('').attr({ class: 'close', @@ -141,7 +108,6 @@ window.renderPortalDetails = function(guid) { .attr({class:'imgpreview', title:imgTitle, style:"background-image: url('"+img+"')"}) .append( $('').attr({id:'level', title: levelDetails}).text(levelInt), - $('
').attr({class:'portalDetails'}).html(portalDetailedDescription), $('').attr({class:'hide', src:img}) ), diff --git a/code/portal_detail_display_tools.js b/code/portal_detail_display_tools.js index 10daac5a..3df146c8 100644 --- a/code/portal_detail_display_tools.js +++ b/code/portal_detail_display_tools.js @@ -23,59 +23,6 @@ window.getRangeText = function(d) { title]; } -// generates description text from details for portal -window.getPortalDescriptionFromDetails = function(details) { - return details.title || '(untitled)'; - -// var descObj = details.descriptiveText.map; -// // FIXME: also get real description? -// var desc = descObj.TITLE; -// if(descObj.ADDRESS) -// desc += '\n' + descObj.ADDRESS; -//// if(descObj.ATTRIBUTION) -//// desc += '\nby '+descObj.ATTRIBUTION+' ('+descObj.ATTRIBUTION_LINK+')'; -// return desc; -} - -// Grabs more info, including the submitter name for the current main -// portal image -window.getPortalDescriptionFromDetailsExtended = function(details) { - var descObj = details.title; - var photoStreamObj = details.photoStreamInfo; - - var submitterObj = new Object(); - submitterObj.type = ""; - submitterObj.name = ""; - submitterObj.team = ""; - submitterObj.link = ""; - submitterObj.voteCount = undefined; - - if(photoStreamObj && photoStreamObj.hasOwnProperty("coverPhoto") && photoStreamObj.coverPhoto.hasOwnProperty("attributionMarkup")) { - submitterObj.name = "Unknown"; - - var attribution = photoStreamObj.coverPhoto.attributionMarkup; - submitterObj.type = attribution[0]; - if(attribution[1].hasOwnProperty("plain")) - submitterObj.name = attribution[1].plain; - if(attribution[1].hasOwnProperty("team")) - submitterObj.team = attribution[1].team; - if(attribution[1].hasOwnProperty("attributionLink")) - submitterObj.link = attribution[1].attributionLink; - if(photoStreamObj.coverPhoto.hasOwnProperty("voteCount")) - submitterObj.voteCount = photoStreamObj.coverPhoto.voteCount; - } - - - var portalDetails = { - title: descObj.TITLE, - description: descObj.DESCRIPTION, - address: descObj.ADDRESS, - submitter: submitterObj - }; - - return portalDetails; -} - // given portal details, returns html code to display mod details. window.getModDetails = function(d) {