diff --git a/code/boot.js b/code/boot.js
index 61450938..9ef90ec7 100644
--- a/code/boot.js
+++ b/code/boot.js
@@ -274,7 +274,7 @@ function boot() {
// sidebar is now at final height. Adjust scrollwrapper so scrolling
// is possible for small screens and it doesn’t block the area below
// it.
- $('#scrollwrapper').css('max-height', $('#sidebar').get(0).scrollHeight + 'px');
+ $('#scrollwrapper').css('max-height', ($('#sidebar').get(0).scrollHeight+3) + 'px');
// workaround for #129. Not sure why this is required.
setTimeout('window.map.invalidateSize(false);', 500);
diff --git a/code/portal_detail_display.js b/code/portal_detail_display.js
index fee95de1..92e8054e 100644
--- a/code/portal_detail_display.js
+++ b/code/portal_detail_display.js
@@ -33,50 +33,39 @@ window.renderPortalDetails = function(guid) {
var linkedFields = ['fields', d.portalV2.linkedFields.length];
// collect and html-ify random data
- var randDetails = [playerText, sinceText, getRangeText(d), getEnergyText(d), linksText, getAvgResoDistText(d), linkedFields, getDestroyAP(d)];
- randDetails = randDetails.map(function(detail) {
- if(!detail) return '';
- detail = ''+detail[0]+''+detail[1]+' ';
- return detail;
- }).join('\n');
+ var randDetails = [
+ playerText, sinceText, getRangeText(d), getEnergyText(d),
+ linksText, getAvgResoDistText(d), linkedFields, getDestroyAP(d)
+ ];
+ randDetails = '' + genFourColumnTable(randDetails) + '
';
- // replacing causes flicker, so if the selected portal does not
- // change, only update the data points that are likely to change.
- if(update) {
- console.log('Updating portal details');
- $('#level').text(Math.floor(getPortalLevel(d)));
- $('.mods').html(getModDetails(d));
- $('#randdetails').html(randDetails);
- $('#resodetails').html(getResonatorDetails(d));
- $('#portaldetails').attr('class', TEAM_TO_CSS[getTeam(d)]);
- } else {
- console.log('exchanging portal details');
- setPortalIndicators(d);
- var img = d.imageByUrl && d.imageByUrl.imageUrl ? d.imageByUrl.imageUrl : DEFAULT_PORTAL_IMG;
+ var resoDetails = '' + getResonatorDetails(d) + '
';
- var lat = d.locationE6.latE6;
- var lng = d.locationE6.lngE6;
- var perma = 'http://ingress.com/intel?latE6='+lat+'&lngE6='+lng+'&z=17&pguid='+guid;
- var imgTitle = 'title="'+getPortalDescriptionFromDetails(d)+'\n\nClick to show full image."';
+ setPortalIndicators(d);
+ var img = d.imageByUrl && d.imageByUrl.imageUrl ? d.imageByUrl.imageUrl : DEFAULT_PORTAL_IMG;
- $('#portaldetails')
- .attr('class', TEAM_TO_CSS[getTeam(d)])
- .html(''
- + ''+d.portalV2.descriptiveText.TITLE+' '
- // help cursor via “.imgpreview img”
- + ''
- + '
'
- + '
'+Math.floor(getPortalLevel(d))+' '
- + '
'+getModDetails(d)+'
'
- + ''+randDetails+'
'
- + ''+getResonatorDetails(d)+'
'
- + ''
- );
- }
+ var lat = d.locationE6.latE6;
+ var lng = d.locationE6.lngE6;
+ var perma = 'http://ingress.com/intel?latE6='+lat+'&lngE6='+lng+'&z=17&pguid='+guid;
+ var imgTitle = 'title="'+getPortalDescriptionFromDetails(d)+'\n\nClick to show full image."';
+
+ $('#portaldetails')
+ .attr('class', TEAM_TO_CSS[getTeam(d)])
+ .html(''
+ + ''+d.portalV2.descriptiveText.TITLE+' '
+ // help cursor via “.imgpreview img”
+ + ''
+ + '
'
+ + '
'+Math.floor(getPortalLevel(d))+' '
+ + '
'+getModDetails(d)+'
'
+ + randDetails
+ + resoDetails
+ + ''
+ );
// try to resolve names that were required for above functions, but
// weren’t available yet.
diff --git a/code/portal_detail_display_tools.js b/code/portal_detail_display_tools.js
index e4639cd4..556945c8 100644
--- a/code/portal_detail_display_tools.js
+++ b/code/portal_detail_display_tools.js
@@ -77,18 +77,18 @@ window.getAvgResoDistText = function(d) {
}
window.getResonatorDetails = function(d) {
- var resoDetails = '';
+ var resoDetails = [];
// octant=slot: 0=E, 1=NE, 2=N, 3=NW, 4=W, 5=SW, 6=S, SE=7
// resos in the display should be ordered like this:
// N NE Since the view is displayed in columns, they
// NW E need to be ordered like this: N, NW, W, SW, NE,
// W SE E, SE, S, i.e. 2 3 4 5 1 0 7 6
// SW S
- $.each([2, 3, 4, 5, 1, 0, 7, 6], function(ind, slot) {
- var isLeft = slot >= 2 && slot <= 5;
+
+ $.each([2, 1, 3, 0, 4, 7, 5, 6], function(ind, slot) {
var reso = d.resonatorArray.resonators[slot];
if(!reso) {
- resoDetails += renderResonatorDetails(slot, 0, 0, null, null, isLeft);
+ resoDetails.push(renderResonatorDetails(slot, 0, 0, null, null));
return true;
}
@@ -100,16 +100,16 @@ window.getResonatorDetails = function(d) {
// naming will still be correct.
slot = parseInt(reso.slot);
- resoDetails += renderResonatorDetails(slot, l, v, dist, nick, isLeft);
+ resoDetails.push(renderResonatorDetails(slot, l, v, dist, nick));
});
- return resoDetails;
+ return genFourColumnTable(resoDetails);
}
// helper function that renders the HTML for a given resonator. Does
// not work with raw details-hash. Needs digested infos instead:
// slot: which slot this resonator occupies. Starts with 0 (east) and
// rotates clockwise. So, last one is 7 (southeast).
-window.renderResonatorDetails = function(slot, level, nrg, dist, nick, isLeft) {
+window.renderResonatorDetails = function(slot, level, nrg, dist, nick) {
if(level === 0) {
var meter = '' + fill + lbar + ' ';
+ var meter = '' + fill + lbar + ' ';
}
- var cls = isLeft ? 'left' : 'right';
- var text = ''+(nick||'')+' ';
- return (isLeft ? text+meter : meter+text) + ''+detail[1]+' '+detail[0]+' ';
+ else
+ return ' '+detail[0]+' '+detail[1]+'