phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'upstream' into redeem_dlg

Browse Source 
Conflicts:
	code/redeeming.js
This commit is contained in:
Florian Sundermann
2013-03-07 08:35:44 +01:00
parent 1623c3fa9a 19cd197cd4
commit 0824334d5f
8 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/map_data.js
View File

@ -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;

10
code/redeeming.js
View File

@ -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);
});