From 7a07f622de6c6d6c9a597c39bbf467766fa6f54e Mon Sep 17 00:00:00 2001
From: Mike Castle <dalgoda@gmail.com>
Date: Tue, 26 Nov 2013 23:55:08 -0800
Subject: [PATCH 1/2] Fix a variety of typos.

---
 code/chat.js                        |  2 +-
 code/hooks.js                       |  6 +++---
 mobile/smartphone.css               |  4 ++--
 plugins/portal-defense.user.js      |  4 ++--
 plugins/show-linked-portals.user.js | 18 +++++++++---------
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/code/chat.js b/code/chat.js
index 59e398bb..b5774ec6 100644
--- a/code/chat.js
+++ b/code/chat.js
@@ -106,7 +106,7 @@ window.chat.genPostData = function(isFaction, storageHash, getOlderMsgs) {
     // Currently this edge case is not handled. Let’s see if this is a
     // problem in crowded areas.
     $.extend(data, {minTimestampMs: min});
-    // when requesting with an acutal minimum timestamp, request oldest rather than newest first.
+    // when requesting with an actual minimum timestamp, request oldest rather than newest first.
     // this matches the stock intel site, and ensures no gaps when continuing after an extended idle period
     if (min > -1) $.extend(data, {ascendingTimestampOrder: true});
   }
diff --git a/code/hooks.js b/code/hooks.js
index b6a7ef6c..11c9b95c 100644
--- a/code/hooks.js
+++ b/code/hooks.js
@@ -64,18 +64,18 @@ window.runHooks = function(event, data) {
   if(VALID_HOOKS.indexOf(event) === -1) throw('Unknown event type: ' + event);
 
   if(!_hooks[event]) return true;
-  var interupted = false;
+  var interrupted = false;
   $.each(_hooks[event], function(ind, callback) {
     try {
       if (callback(data) === false) {
-        interupted = true;
+        interrupted = true;
         return false;  //break from $.each
       }
     } catch(err) {
       console.error('error running hook '+event+', error: '+err);
     }
   });
-  return !interupted;
+  return !interrupted;
 }
 
 
diff --git a/mobile/smartphone.css b/mobile/smartphone.css
index bec0a5e8..be95476e 100644
--- a/mobile/smartphone.css
+++ b/mobile/smartphone.css
@@ -198,14 +198,14 @@ body {
 .linkdetails aside  {
   padding: 5px;
   margin-top: 3px;
-  margin-botton: 3px;
+  margin-bottom: 3px;
   border: 2px outset #0e3d4e;
 }
 
 #toolbox > a {
   padding: 5px;
   margin-top: 3px;
-  margin-botton: 3px;
+  margin-bottom: 3px;
   border: 2px outset #0e3d4e;
 }
 
diff --git a/plugins/portal-defense.user.js b/plugins/portal-defense.user.js
index 9f95ce4d..574fb033 100644
--- a/plugins/portal-defense.user.js
+++ b/plugins/portal-defense.user.js
@@ -68,7 +68,7 @@ window.plugin.portalDefense.renderAttackRegion = function(portal) {
     }
     var region = L.marker(portal.getLatLng(), {
       icon: L.divIcon({
-        className: 'plugin-iic-defense',
+        className: 'plugin-iitc-defense',
         clickable: false,
         iconAnchor: [-10,10],
         html: "<div class='defense-label'>"+display+"</div>"
@@ -127,7 +127,7 @@ var setup =  function() {
   $('#toolbox').append(' <a onclick="window.plugin.portalDefense.reload()">Reload Defense</a>');
   $("<style>")
     .prop("type", "text/css")
-    .html(".plugin-iic-defense {\
+    .html(".plugin-iitc-defense {\
             font-size: 10px;\
             color: #FFFFBB;\
             font-family: monospace;\
diff --git a/plugins/show-linked-portals.user.js b/plugins/show-linked-portals.user.js
index 2c82409f..58023949 100644
--- a/plugins/show-linked-portals.user.js
+++ b/plugins/show-linked-portals.user.js
@@ -76,18 +76,18 @@ window.plugin.showLinkedPortal.getPortalByGuid = function (guid,isorigin) {
     if (window.portals[guid] !== undefined) {
         var portalDetails = window.portals[guid].options.details;
 
-        var portalNameAdressAlt = "'" + portalDetails.portalV2.descriptiveText.TITLE + "' (" + portalDetails.portalV2.descriptiveText.ADDRESS + ")";
-        var portalNameAdressTitle = $('<div/>').append($('<strong/>').text(portalDetails.portalV2.descriptiveText.TITLE))
-                                               .append($('<br/>'))
-                                               .append($('<em/>').text('(' + portalDetails.portalV2.descriptiveText.ADDRESS + ')'))
-                                               .append($('<br/>'))
-                                               .append(linkDirection)
-                                               .html();
+        var portalNameAddressAlt = "'" + portalDetails.portalV2.descriptiveText.TITLE + "' (" + portalDetails.portalV2.descriptiveText.ADDRESS + ")";
+        var portalNameAddressTitle = $('<div/>').append($('<strong/>').text(portalDetails.portalV2.descriptiveText.TITLE))
+                                                .append($('<br/>'))
+                                                .append($('<em/>').text('(' + portalDetails.portalV2.descriptiveText.ADDRESS + ')'))
+                                                .append($('<br/>'))
+                                                .append(linkDirection)
+                                                .html();
         var imageUrl = getPortalImageUrl(portalDetails);
         portalInfoString = $('<div/>').html($('<img/>').attr('src', imageUrl)
                                                        .attr('class', 'minImg')
-                                                       .attr('alt', portalNameAdressAlt)
-                                                       .attr('title', portalNameAdressTitle))
+                                                       .attr('alt', portalNameAddressAlt)
+                                                       .attr('title', portalNameAddressTitle))
                                       .html();
     } else {
         var title = $('<div/>').append($('<strong/>').text('Zoom out'))

From 135318022a17bfd7b04b5f0624996cbae7848d94 Mon Sep 17 00:00:00 2001
From: Mike Castle <dalgoda@gmail.com>
Date: Mon, 2 Dec 2013 02:25:08 -0800
Subject: [PATCH 2/2] Fix bad merge from upstream (git novice in action).

---
 plugins/portal-defense.user.js      | 160 ----------------------------
 plugins/show-linked-portals.user.js |  18 ++--
 2 files changed, 8 insertions(+), 170 deletions(-)

diff --git a/plugins/portal-defense.user.js b/plugins/portal-defense.user.js
index 0566a294..3d1f30fb 100644
--- a/plugins/portal-defense.user.js
+++ b/plugins/portal-defense.user.js
@@ -12,163 +12,3 @@
 // @match          https://www.ingress.com/intel*
 // @match          http://www.ingress.com/intel*
 // ==/UserScript==
-<<<<<<< HEAD
-
-@@PLUGINSTART@@
-
-// PLUGIN START ////////////////////////////////////////////////////////
-
-// use own namespace for plugin
-window.plugin.portalDefense = function() {};
-
-window.plugin.portalDefense.MIN_MAP_ZOOM = 15;
-window.plugin.portalDefense.DETAIL_MAP_ZOOM = 17;
-window.plugin.portalDefense.DisplayEnum = {
-  OFF : 0,
-  SIMPLE : 1,
-  DETAIL : 2
-};
-
-window.plugin.portalDefense.regionLayers = {};
-
-// Use portal add and remove event to control render of regions
-window.plugin.portalDefense.portalAdded = function(data) {
-  data.portal.on('add', function() {
-    plugin.portalDefense.renderAttackRegion(this);
-  });
-
-  data.portal.on('remove', function() {
-    plugin.portalDefense.removeAttackRegion(this);
-  });
-}
-
-window.plugin.portalDefense.getDisplay = function() {
-  if (map.getZoom() >= window.plugin.portalDefense.DETAIL_MAP_ZOOM) {
-    return window.plugin.portalDefense.DisplayEnum.DETAIL;
-  } else if (map.getZoom() >= window.plugin.portalDefense.MIN_MAP_ZOOM) {
-    return window.plugin.portalDefense.DisplayEnum.SIMPLE;
-  }
-  return window.plugin.portalDefense.DisplayEnum.OFF;
-}
-
-window.plugin.portalDefense.renderAttackRegion = function(portal) {
-  plugin.portalDefense.removeAttackRegion(portal);
-  if (window.plugin.portalDefense.currentDisplay == window.plugin.portalDefense.DisplayEnum.OFF) return;
-
-  plugin.portalDefense.regionLayers[portal.options.guid] = [];
-  var defense = window.getPortalMitigationDetails(portal.options.details);
-  if (defense.total) {
-    var display = defense.total;
-    if (window.plugin.portalDefense.currentDisplay == window.plugin.portalDefense.DisplayEnum.DETAIL) {
-      if (defense.shields) {
-        display += "<br>"+"\u2297"+defense.shields;
-      }
-      if(defense.links) {
-        display += "<br>"+"\u21b1"+defense.links;
-      }
-    }
-    var region = L.marker(portal.getLatLng(), {
-      icon: L.divIcon({
-        className: 'plugin-iitc-defense',
-        clickable: false,
-        iconAnchor: [-10,10],
-        html: "<div class='defense-label'>"+display+"</div>"
-        }),
-      guid: portal.options.guid
-    });
-    plugin.portalDefense.regionLayers[portal.options.guid].push(region);
-    region.addTo(plugin.portalDefense.regionLayerGroup);
-  }
-}
-
-window.plugin.portalDefense.reload = function() {
-  $.each(window.portals, function(ind, portal) {
-    // only render mitigation details for portals added to the map
-    if (portal._map) {
-      window.plugin.portalDefense.renderAttackRegion(portal)
-    }
-  });
-}
-
-window.plugin.portalDefense.removeAttackRegion = function(portal) {
-  var previousLayers = plugin.portalDefense.regionLayers[portal.options.guid];
-  if (previousLayers) {
-    for (var i = 0; i < previousLayers.length; i++) {
-      plugin.portalDefense.regionLayerGroup.removeLayer(previousLayers[i]);
-    }
-    delete plugin.portalDefense.regionLayers[portal.options.guid];
-  }
-}
-
-window.plugin.portalDefense.regions = {}
-
-window.plugin.portalDefense.showOrHide = function() {
-  var ctrl = $('.leaflet-control-layers-selector + span:contains("Portal Defense")').parent();
-  var display = window.plugin.portalDefense.getDisplay();
-  if (display != window.plugin.portalDefense.DisplayEnum.OFF) {
-    // show the layer
-    if(!window.plugin.portalDefense.regionLayerGroup.hasLayer(window.plugin.portalDefense.defenseLayerGroup)) {
-      window.plugin.portalDefense.regionLayerGroup.addLayer(window.plugin.portalDefense.defenseLayerGroup);
-    }
-    ctrl.removeClass('disabled').attr('title', '');
-  } else {
-    // hide the layer
-    if(window.plugin.portalDefense.regionLayerGroup.hasLayer(window.plugin.portalDefense.defenseLayerGroup)) {
-      window.plugin.portalDefense.regionLayerGroup.removeLayer(window.plugin.portalDefense.defenseLayerGroup);
-    }
-    ctrl.addClass('disabled').attr('title', 'Zoom in to show those.');
-  }
-  if (window.plugin.portalDefense.currentDisplay != display) {
-    window.plugin.portalDefense.currentDisplay = display;
-    window.plugin.portalDefense.reload()
-  }
-}
-
-var setup =  function() {
-  $('#toolbox').append(' <a onclick="window.plugin.portalDefense.reload()">Reload Defense</a>');
-  $("<style>")
-    .prop("type", "text/css")
-    .html(".plugin-iitc-defense {\
-            font-size: 10px;\
-            color: #FFFFBB;\
-            font-family: monospace;\
-            text-align: center;\
-            text-shadow: 0 0 0.5em black, 0 0 0.5em black, 0 0 0.5em black;\
-            pointer-events: none;\
-            -webkit-text-size-adjust:none;\
-           }\
-           .defense-label {\
-            position:relative;\
-            background-color:#1B3E59;\
-            opacity:.6;\
-            border:0.5px solid #FFCE00;\
-            width:22px;\
-            text-align:center;\
-            color:#FFFFFF;\
-            text-align:center;\
-            border-radius:6px;\
-           }")
-    .appendTo("head");
-
-  window.plugin.portalDefense.currentDisplay = window.plugin.portalDefense.getDisplay();
-  map.on('zoomend', window.plugin.portalDefense.showOrHide);
-    
-  // this layer is added to the layer chooser, to be toggled on/off
-  window.plugin.portalDefense.regionLayerGroup = new L.LayerGroup();
-
-  // this layer is added into the above layer, and removed from it when we zoom out too far
-  window.plugin.portalDefense.defenseLayerGroup = new L.LayerGroup();
-
-  window.plugin.portalDefense.regionLayerGroup.addLayer(window.plugin.portalDefense.defenseLayerGroup);
-  window.addLayerGroup('Portal Defense', window.plugin.portalDefense.regionLayerGroup, true);
-    
-  window.addHook('portalAdded', window.plugin.portalDefense.portalAdded);
-    
-  window.plugin.portalDefense.showOrHide();
-}
-
-// PLUGIN END //////////////////////////////////////////////////////////
-
-@@PLUGINEND@@
-=======
->>>>>>> 68ec278914ced792f20cbd133f9481d6078435a6
diff --git a/plugins/show-linked-portals.user.js b/plugins/show-linked-portals.user.js
index fdf813e8..8a7679a3 100644
--- a/plugins/show-linked-portals.user.js
+++ b/plugins/show-linked-portals.user.js
@@ -74,18 +74,16 @@ window.plugin.showLinkedPortal.getPortalByGuid = function (guid,isorigin) {
     if (window.portals[guid] !== undefined) {
         var portalData = window.portals[guid].options.data;
 
-        var portalNameAddressAlt = "'" + portalDetails.portalV2.descriptiveText.TITLE + "' (" + portalDetails.portalV2.descriptiveText.ADDRESS + ")";
-        var portalNameAddressTitle = $('<div/>').append($('<strong/>').text(portalDetails.portalV2.descriptiveText.TITLE))
-                                                .append($('<br/>'))
-                                                .append($('<em/>').text('(' + portalDetails.portalV2.descriptiveText.ADDRESS + ')'))
-                                                .append($('<br/>'))
-                                                .append(linkDirection)
-                                                .html();
-        var imageUrl = getPortalImageUrl(portalDetails);
+        var portalNameAdressAlt = "'" + portalData.title + "'";;
+        var portalNameAdressTitle = $('<div/>').append($('<strong/>').text(portalData.title))
+                                               .append($('<br/>'))
+                                               .append(linkDirection)
+                                               .html();
+        var imageUrl = fixPortalImageUrl(portalData.image);
         portalInfoString = $('<div/>').html($('<img/>').attr('src', imageUrl)
                                                        .attr('class', 'minImg')
-                                                       .attr('alt', portalNameAddressAlt)
-                                                       .attr('title', portalNameAddressTitle))
+                                                       .attr('alt', portalNameAdressAlt)
+                                                       .attr('title', portalNameAdressTitle))
                                       .html();
     } else {
         var title = $('<div/>').append($('<strong/>').text('Go to portal'))