diff --git a/plugins/missions.css b/plugins/missions.css index 34725eb9..6e021b49 100644 --- a/plugins/missions.css +++ b/plugins/missions.css @@ -34,7 +34,7 @@ margin-bottom: 5px; } -.plugin-mission-summary > a, .plugin-mission-summary > h4 { +.plugin-mission-summary > a { display: block; font-weight: bold; font-size: 1.3em; @@ -70,8 +70,9 @@ vertical-align: top; } -.plugin-mission-summary description { - white-space: pre; +.plugin-mission-details .plugin-mission-summary > a, +.plugin-mission-details .plugin-mission-summary .description { + white-space: pre-line; margin-left: 110px; } diff --git a/plugins/missions.user.js b/plugins/missions.user.js index edfb0680..8b37800f 100644 --- a/plugins/missions.user.js +++ b/plugins/missions.user.js @@ -136,7 +136,7 @@ window.plugin.missions = { var me = this; var markers = this.highlightMissionPortals(mission); dialog({ - // id: 'mission-' + mission.guid, + id: 'plugin-mission-details-' + mission.guid.replace(/\./g, '_') /* dots irritate the dialog framework */, title: mission.title, height: 'auto', html: this.renderMission(mission), @@ -145,7 +145,7 @@ window.plugin.missions = { me.unhighlightMissionPortals(markers); }, collapseCallback: this.collapseFix, - expandCallback: this.collapseFix + expandCallback: this.collapseFix, }).dialog('option', 'buttons', { 'Zoom to mission': function() { me.zoomToMission(mission); @@ -304,13 +304,13 @@ window.plugin.missions = { var title = container.appendChild(document.createElement('a')); title.textContent = mission.title; - title.href = '/mission/' + mission.guid; // TODO make IITC load on mission permalinks as well + title.href = '/mission/' + mission.guid; title.addEventListener('click', function(ev) { - plugin.missions.openMission(mission.guid); + this.openMission(mission.guid); // prevent browser from following link ev.preventDefault(); return false; - }, false); + }.bind(this), false); if(cachedMission) { var span = container.appendChild(document.createElement('span')); @@ -406,17 +406,10 @@ window.plugin.missions = { var summary = container.appendChild(this.renderMissionSummary(mission)); - // replace link with heading - var title = summary.getElementsByTagName('a')[0]; - var newtitle = document.createElement('h4'); - newtitle.textContent = mission.title; - title.parentNode.replaceChild(newtitle, title); - var desc = summary.appendChild(document.createElement('p')); desc.className = 'description'; desc.textContent = mission.description; - var list = container.appendChild(document.createElement('ol')) mission.waypoints.forEach(function(waypoint, index) { list.appendChild(this.renderMissionWaypoint(waypoint, index, mission));