Merge branch 'upstream' into redeem_dlg

Conflicts: code/redeeming.js
2013-03-07 08:35:44 +01:00 · 2013-03-07 08:35:44 +01:00 · 0824334d5f
commit 0824334d5f
parent 1623c3fa9a 19cd197cd4
8 changed files with 19 additions and 17 deletions
--- a/USERGUIDE.md
+++ b/USERGUIDE.md
@ -77,7 +77,7 @@ Map Status / Updates

 It shows if there are operations currently pending. This includes chat updates as well as map data requests. Updates happen every 45s to 90s, depending on how far zoomed in you are. Zoom in closer for faster updates.

-It also shows which portals are being loaded/shown. Zoom in to see lower level portals. This is a limit of the server and not IITC. Portals levels that cannot be shown are also striked through in the layer chooser.
+It also shows which portals are being loaded/shown. Zoom in to see lower level portals. This is a limit of both the server and IITC. The server will only send low level portals if zoomed in enough. IITC will only show low level portals if there are few enough to not hit the render limit. The render limit is required, otherwise the map would be veryslow. Portals levels that cannot be shown are also striked through in the layer chooser.

 **Failures:** If a data request failed, it is retried once. Only if the retry fails as well, a “failure” message is shown in the map status. You can either wait for the next automatic update or move the map a little. Also try to zoom in to request less data, which makes it less likely that the servers fail. The failure counter is reset on the next auto update or if you move the map.

--- a/code/map_data.js
+++ b/code/map_data.js
@ -81,7 +81,7 @@ window.handleDataResponse = function(data, textStatus, jqXHR) {
  var ppp = [];
  var p2f = {};
  $.each(m, function(qk, val) {
-    $.each(val.deletedGameEntityGuids, function(ind, guid) {
+    $.each(val.deletedGameEntityGuids || [], function(ind, guid) {
      if(getTypeByGuid(guid) === TYPE_FIELD && window.fields[guid] !== undefined) {
        $.each(window.fields[guid].options.vertices, function(ind, vertex) {
          if(window.portals[vertex.guid] === undefined) return true;
@ -92,7 +92,7 @@ window.handleDataResponse = function(data, textStatus, jqXHR) {
      window.removeByGuid(guid);
    });

-    $.each(val.gameEntities, function(ind, ent) {
+    $.each(val.gameEntities || [], function(ind, ent) {
      // ent = [GUID, id(?), details]
      // format for links: { controllingTeam, creator, edge }
      // format for portals: { controllingTeam, turret }
@ -453,6 +453,7 @@ window.isResonatorsShow = function() {

 window.isSameResonator = function(oldRes, newRes) {
  if(!oldRes && !newRes) return true;
+  if(!oldRes || !newRes) return false;
  if(typeof oldRes !== typeof newRes) return false;
  if(oldRes.level !== newRes.level) return false;
  if(oldRes.energyTotal !== newRes.energyTotal) return false;
--- a/code/redeeming.js
+++ b/code/redeeming.js
@ -14,7 +14,7 @@ window.handleRedeemResponse = function(data, textStatus, jqXHR) {
    } else {
      error = 'There was a problem redeeming the passcode. Try again?';
    }
-    alert('<strong>' + data.error + "</strong>\n" + error);
+    alert('<strong>' + data.error + '</strong>\n' + error);
  } else if (data.result) {
    var tblResult = $('<table class="redeem-result" />');
    tblResult.append($('<tr><th colspan="2">Passcode accepted!</th></tr>'));
@ -84,13 +84,13 @@ window.setupRedeem = function() {
        var extra = '';
        if (response && response.status) {
          if (response.status === 429) {
-            extra = "You have been rate-limited by the server. Wait a bit and try again.";
+            extra = 'You have been rate-limited by the server. Wait a bit and try again.';
          } else {
-            extra = "The server indicated an error.";
+            extra = 'The server indicated an error.';
          }
-          extra += "\n" + 'Response: HTTP <a href="http://httpstatus.es/' + jq.status + '" alt="HTTP ' + jq.status + '"target="_blank">' + jq.status + "</a>.";
+          extra += '\nResponse: HTTP <a href="http://httpstatus.es/' + response.status + '" alt="HTTP ' + response.status + '">' + response.status + '</a>.';
        } else {
-          extra = "No status code was returned.";
+          extra = 'No status code was returned.';
        }
        alert('<strong>The HTTP request failed.</strong> ' + extra);
      });
--- a/main.js
+++ b/main.js
@ -42,7 +42,7 @@ if(!d) {
  // page doesn’t have a script tag with player information.
  if(document.getElementById('header_email')) {
    // however, we are logged in.
-    setTimeout('location.reload();', 10*1000);
+    setTimeout('location.reload();', 3*1000);
    throw('Page doesn’t have player data, but you are logged in. Reloading in 10s.');
  }
  // FIXME: handle nia takedown in progress
@ -67,7 +67,7 @@ document.getElementsByTagName('head')[0].innerHTML = ''
  + '<style>@@INCLUDESTRING:external/leaflet.css@@</style>'
  // this navigator check is also used in code/smartphone.js
  + (navigator.userAgent.match(/Android.*Mobile/)
-      ? + '<style>@@INCLUDESTRING:mobile/smartphone.css@@</style>'
+      ? '<style>@@INCLUDESTRING:mobile/smartphone.css@@</style>'
      : '')
  + '<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Coda"/>';

--- a/plugins/README.md
+++ b/plugins/README.md
@ -18,8 +18,7 @@ Available Plugins
 - [**Render Limit Increase**](https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/render-limit-increase.user.js) increases render limits. Good for high density areas (e.g. London, UK) and faster PCs.
 - [**Resonator Display Zoom Level Decrease**](https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/resonator-display-zoom-level-decrease.user.js) Resonator start displaying earlier.
 - [**Resonator Energy in Portal Detail**](https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/reso-energy-pct-in-portal-detail.user.js) Resonator energy in percent is displayed in the portal detals.
- [**Scale Bar**](https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/scale-bar.user.js) Shows a scale bar in the top left corner. [View screenshot](http://breunigs.github.com/ingress-intel-total-conversion/scre
-enshots/plugin_scale_bar.png)
+- [**Scale Bar**](https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/scale-bar.user.js) Shows a scale bar in the top left corner. [View screenshot](http://breunigs.github.com/ingress-intel-total-conversion/screenshots/plugin_scale_bar.png)
 - [**Show Portal Address**](https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/show-address.user.js) Shows portal address in the side panel.

 ### available only with the development version
--- a/plugins/player-tracker.user.js
+++ b/plugins/player-tracker.user.js
@ -1,7 +1,7 @@
 // ==UserScript==
 // @id             iitc-plugin-player-tracker@breunigs
 // @name           iitc: player tracker
-// @version        0.6.1
+// @version        0.7
 // @namespace      https://github.com/breunigs/ingress-intel-total-conversion
 // @updateURL      https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/player-tracker.user.js
 // @downloadURL    https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/player-tracker.user.js
@ -80,7 +80,8 @@ window.plugin.playerTracker.processNewData = function(data) {
        // field was originally created. Therefore it’s not clear which
        // portal the player is at, so ignore it.
        if(markup[1].plain.indexOf('destroyed the Link') !== -1
-          || markup[1].plain.indexOf('destroyed a Control Field') !== -1) {
+          || markup[1].plain.indexOf('destroyed a Control Field') !== -1
+          || markup[1].plain.indexOf('Your Link') !== -1) {
          skipThisMessage = true;
          return false;
        }
--- a/plugins/show-portal-weakness.user.js
+++ b/plugins/show-portal-weakness.user.js
@ -1,7 +1,7 @@
 // ==UserScript==
 // @id             iitc-plugin-show-portal-weakness@vita10gy
 // @name           iitc: show portal weakness
-// @version        0.5
+// @version        0.6
 // @namespace      https://github.com/breunigs/ingress-intel-total-conversion
 // @updateURL      https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/show-portal-weakness.user.js
 // @downloadURL    https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/show-portal-weakness.user.js
@ -35,7 +35,7 @@ window.plugin.portalWeakness.portalAdded = function(data) {
    $.each(d.portalV2.linkedModArray, function(ind, mod) {
      if(mod === null) {
        missing_shields++;
-        portal_weakness += .08;
+        portal_weakness += .03;
      }
    });
    //Ding the portal for every missing resonator.
--- a/style.css
+++ b/style.css
@ -727,7 +727,8 @@ aside {
  text-align: right;
 }

-.ui-dialog-buttonset button {
+.ui-dialog-buttonset button,
+.ui-dialog-content button {
  padding: 2px;
  min-width: 80px;
  color: #FFCE00;