diff --git a/NEWS.md b/NEWS.md
index 69e63666..45e0205e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,6 +1,36 @@
-CHANGES IN 0.5 / 0.51
+CHANGES IN 0.6 / 0.61
=====================
+0.6 had a broken link to style sheets. Fixed in 0.61.
+
+- **SECURITY**: Chat was vulnerable to XSS attacks. Update as soon as
+ possible.
+
+- Feature: [**more plugins**](https://github.com/breunigs/ingress-intel-total-conversion/tree/gh-pages/plugins#readme)
+ - weakened portals: highlights portals with few resonators or ones
+ that are decayed, making it easier to see where
+ to attack or defend
+ - draw tools: allow you to draw things on the map, making it easier
+ to plan your next big field
+- Feature: chat now has a tab that shows all automated messages, not
+ only the last one per user
+- Feature: render lines between portals and their resonators
+- Change: resonators are only re-rendered on demand, could improve per-
+ formance
+- Change: AP Gain now also includes gains by deploying resonators
+- Change: portal images are not shrinked instead of cut in preview
+- Bugfix: styling issues in sidebar (by cmrn)
+- Bugfix: “field decayed” and similar messages were not shown
+- Bugfix: tooltips have broken alignment sometimes (by saithis)
+- Bugfix: chat sometimes didn’t warn if message didn’t went through
+- Bugfix: base layer was not saved properly
+- Bugfix: avoid zooming to invalid lat/lng, crashing the browser
+
+
+
+CHANGES IN 0.5 / 0.51
+---------------------
+
- Feature: draw resonators on map on high zoom levels (by Xelio)
- Feature: show AP if portal is taken down (by Pirozek)
- Feature: collapsible sidebar (by cmrn)
@@ -15,7 +45,7 @@ CHANGES IN 0.5 / 0.51
backgrouds (by jonatkins)
- Change: increased hack range from 35m to 40m
- Change: Sidebar now semi-transparent, just like chat (by cmrn)
-- Change: portals are now sizes according to their level (by OshiHidra)
+- Change: portals are now sized according to their level (by OshiHidra)
- Change: resonators are now more aligned to their octant (thanks
Worros for helping confirming the slot-to-octant matching)
- Change: release versions are now put in `dist/`. This should avoid
diff --git a/README.md b/README.md
index 4a6d476e..31dc5567 100644
--- a/README.md
+++ b/README.md
@@ -20,8 +20,8 @@ Features
- feels faster. (Likely because [leaflet](http://leafletjs.com/) is faster, although there are some other tricks.)
- full view of portal images
- better chat
- - separated automated/public/faction
- - only showing the last automated message for each user. Makes a great “where are they now” guide.
+ - separated full/compact/public/faction
+ - compact only shows the last automated message for each user. Makes a great “where are they now” guide.
- nick tab completion
- clickable links
- automatic idle resume
@@ -38,7 +38,7 @@ Features
Install
-------
-Current version is 0.51. See [NEWS.md](https://github.com/breunigs/ingress-intel-total-conversion/blob/gh-pages/NEWS.md) for details.
+Current version is 0.61. See [NEWS.md](https://github.com/breunigs/ingress-intel-total-conversion/blob/gh-pages/NEWS.md) for details. **THIS VERSION CONTAINS A SECURITY UPDATE.** Please update as soon as possible and also alert friends about it.
[**INSTALL**](https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/dist/total-conversion-build.user.js)
diff --git a/code/boot.js b/code/boot.js
index e0397ebe..1d9ef3c8 100644
--- a/code/boot.js
+++ b/code/boot.js
@@ -6,21 +6,20 @@
// be run once.
window.setupLargeImagePreview = function() {
- $('#portaldetails').on('click', '.imgpreview img', function() {
+ $('#portaldetails').on('click', '.imgpreview', function() {
var ex = $('#largepreview');
if(ex.length > 0) {
ex.remove();
return;
}
- var img = $(this).parent().html();
- var w = $(this)[0].naturalWidth/2;
- var h = $(this)[0].naturalHeight/2;
+ var img = $(this).html();
+ var w = $(this).find('img')[0].naturalWidth/2;
+ var h = $(this).find('img')[0].naturalHeight/2;
var c = $('#portaldetails').attr('class');
$('body').append(
'
' + img + '
'
);
$('#largepreview').click(function() { $(this).remove() });
- $('#largepreview img').attr('title', '');
});
}
@@ -280,13 +279,23 @@ function asyncLoadScript(a){return function(b,c){var d=document.createElement("s
// modified version of https://github.com/shramov/leaflet-plugins. Also
// contains the default Ingress map style.
-var LLGMAPS = 'http://breunigs.github.com/ingress-intel-total-conversion/dist/leaflet_google.js';
+var LEAFLETGOOGLE = 'http://breunigs.github.com/ingress-intel-total-conversion/dist/leaflet_google.js';
var JQUERY = 'https://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js';
var JQUERYUI = 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.0/jquery-ui.min.js';
var LEAFLET = 'http://cdn.leafletjs.com/leaflet-0.5/leaflet.js';
var AUTOLINK = 'http://breunigs.github.com/ingress-intel-total-conversion/dist/autolink.js';
+var EMPTY = 'data:text/javascript;base64,';
+
+// don’t download resources which have been injected already
+var ir = window && window.internalResources ? window.internalResources : [];
+if(ir.indexOf('jquery') !== -1) JQUERY = EMPTY;
+if(ir.indexOf('jqueryui') !== -1) JQUERYUI = EMPTY;
+if(ir.indexOf('leaflet') !== -1) LEAFLET = EMPTY;
+if(ir.indexOf('autolink') !== -1) AUTOLINK = EMPTY;
+if(ir.indexOf('leafletgoogle') !== -1) LEAFLETGOOGLE = EMPTY;
+
// after all scripts have loaded, boot the actual app
-load(JQUERY, LEAFLET, AUTOLINK).then(LLGMAPS, JQUERYUI).onError(function (err) {
+load(JQUERY, LEAFLET, AUTOLINK).then(LEAFLETGOOGLE, JQUERYUI).onError(function (err) {
alert('Could not all resources, the script likely won’t work.\n\nIf this happend the first time for you, it’s probably a temporary issue. Just wait a bit and try again.\n\nIf you installed the script for the first time and this happens:\n– try disabling NoScript if you have it installed\n– press CTRL+SHIFT+K in Firefox or CTRL+SHIFT+I in Chrome/Opera and reload the page. Additional info may be available in the console.\n– Open an issue at https://github.com/breunigs/ingress-intel-total-conversion/issues');
}).thenRun(boot);
diff --git a/code/map_data.js b/code/map_data.js
index 072c8259..15b5c5e0 100644
--- a/code/map_data.js
+++ b/code/map_data.js
@@ -347,15 +347,16 @@ window.renderResonators = function(ent, portalLayer) {
weight: 1,
fillColor: COLORS_LVL[rdata.level],
fillOpacity: rdata.energyTotal/RESO_NRG[rdata.level],
+ clickable: false,
guid: resoGuid // need this here as well for add/remove events
});
// line connecting reso to portal
- var conn = L.polyline([Rlatlng, portalLatLng], {
+ var conn = L.polyline([portalLatLng, Rlatlng], {
weight: 2,
- color: '#FFFFFF',
- opacity: 0.2,
- dashArray: '10,4',
+ color: '#FFA000',
+ opacity: 0.25,
+ dashArray: '0,10,8,4,8,4,8,4,8,4,8,4,8,4,8,4,8,4,8,4',
fill: false,
clickable: false});
diff --git a/code/portal_detail_display.js b/code/portal_detail_display.js
index 703af772..1645b639 100644
--- a/code/portal_detail_display.js
+++ b/code/portal_detail_display.js
@@ -57,13 +57,16 @@ window.renderPortalDetails = function(guid) {
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(''
+ '