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

Merge pull request #657 from nexushoratio/to-push

Browse Source 
Spell checking, h-r.
This commit is contained in:
Jon Atkins 2013-11-23 19:35:54 -08:00
commit 1f25428388
16 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.py
View File

@ -121,7 +121,7 @@ def loaderMD(var):
filemd5 = hashlib.md5(file.encode('utf8')).hexdigest()
# check if file has already been parsed by the github api
if fn in files and filemd5 in files[fn]:
# use the stored copy if nothing has changed to avoid hiting the api more then the 60/hour when not signed in
# use the stored copy if nothing has changed to avoid hitting the api more then the 60/hour when not signed in
db.close()
return files[fn][filemd5]
else:

2
code/chat.js
View File

@ -90,7 +90,7 @@ window.chat.genPostData = function(isFaction, storageHash, getOlderMsgs) {
} else {
// ask for newer chat
var min = storageHash.newestTimestamp;
// the inital request will have both timestamp values set to -1,
// the initial request will have both timestamp values set to -1,
// thus we receive the newest desiredNumItems. After that, we will
// only receive messages with a timestamp greater or equal to min
// above.

2
code/game_status.js
View File

@ -11,7 +11,7 @@ window.updateGameScore = function(data) {
}
// hacky - but here is as good as any for a location
// the niantic servers have attempted to obsfucate the client/server protocol, by munging the request parameters
// the niantic servers have attempted to obfuscate the client/server protocol, by munging the request parameters
// detecting which munge set should be used is tricky - even the stock site gets it wrong sometimes
// to detect the problem and try a different set is easiest in a place where there's only a single request of that type
// sent at once, and it has no extra parameters. this method matches those requirements

10
code/map_data_request.js
View File

@ -27,7 +27,7 @@ window.MapDataRequest = function() {
// try to maintain at least this may tiles in each request, by reducing the number of requests as needed
this.MIN_TILES_PER_REQUEST = 4;
// number of times to retty a tile after a 'bad' error (i.e. not a timeout)
// number of times to retry a tile after a 'bad' error (i.e. not a timeout)
this.MAX_TILE_RETRIES = 3;
// refresh timers
@ -44,10 +44,10 @@ window.MapDataRequest = function() {
// this gives a chance of other requests finishing, allowing better grouping of retries in new requests
this.RUN_QUEUE_DELAY = 0.5;
// delay before re-queueing tiles in failed requests
// delay before requeuing tiles in failed requests
this.BAD_REQUEST_REQUEUE_DELAY = 5; // longer delay before retrying a completely failed request - as in this case the servers are struggling
// a delay before processing the queue after requeueing tiles. this gives a chance for other requests to finish
// a delay before processing the queue after requeuing tiles. this gives a chance for other requests to finish
// or other requeue actions to happen before the queue is processed, allowing better grouping of requests
// however, the queue may be processed sooner if a previous timeout was set
this.REQUEUE_DELAY = 1;
@ -267,7 +267,7 @@ window.MapDataRequest.prototype.refresh = function() {
// so as far as plugins are concerned, it should be treated as a finished request
window.runHooks('requestFinished', {success: true});
console.log ('done request preperation (cleared out-of-bounds and invalid for zoom, and rendered cached data)');
console.log ('done request preparation (cleared out-of-bounds and invalid for zoom, and rendered cached data)');
if (Object.keys(this.queuedTiles).length > 0) {
// queued requests - don't start processing the download queue immediately - start it after a short delay
@ -451,7 +451,7 @@ window.MapDataRequest.prototype.handleResponse = function (data, tiles, success)
var timeoutTiles = [];
if (!success || !data || !data.result) {
console.warn("Request.handleResponse: request failed - requeing...");
console.warn("Request.handleResponse: request failed - requeuing...");
//request failed - requeue all the tiles(?)

12
code/munge.js
View File

@ -16,7 +16,7 @@ var requestParameterMunges = [
// set 7 - 2013-11-06
{
'dashboard.getArtifactInfo': 'artifacts', // GET_ARTIFACT_INFO: new (and not obfsucated?!)
'dashboard.getArtifactInfo': 'artifacts', // GET_ARTIFACT_INFO: new (and not obfuscated?!)
'dashboard.getGameScore': 'yol4dxx5ufqolhk2', // GET_GAME_SCORE
'dashboard.getPaginatedPlextsV2': '7b83j2z81rtk6101', // GET_PAGINATED_PLEXTS
'dashboard.getThinnedEntitiesV4': '46su4lrisoq28gxh', // GET_THINNED_ENTITIES
@ -59,7 +59,7 @@ var requestParameterMunges = [
// set 8 - 2013-11-07
{
'dashboard.getArtifactInfo': 'artifacts', // GET_ARTIFACT_INFO: new (and not obfsucated?!)
'dashboard.getArtifactInfo': 'artifacts', // GET_ARTIFACT_INFO: new (and not obfuscated?!)
'dashboard.getGameScore': 'lls4clhel87apzpa', // GET_GAME_SCORE
'dashboard.getPaginatedPlextsV2': 'r6n2xgcd8wjsm4og', // GET_PAGINATED_PLEXTS
'dashboard.getThinnedEntitiesV4': '1ybigzcf2sifu34b', // GET_THINNED_ENTITIES
@ -102,7 +102,7 @@ var requestParameterMunges = [
// set 9 - 2013-11-1
{
'dashboard.getArtifactInfo': 'artifacts', // GET_ARTIFACT_INFO: new (and not obfsucated?!)
'dashboard.getArtifactInfo': 'artifacts', // GET_ARTIFACT_INFO: new (and not obfuscated?!)
'dashboard.getGameScore': '9w8phj2dccvns3t9', // GET_GAME_SCORE
'dashboard.getPaginatedPlextsV2': '3b1nc3ub0sd1704x', // GET_PAGINATED_PLEXTS
'dashboard.getThinnedEntitiesV4': '2xa55qj41qrhfhas', // GET_THINNED_ENTITIES
@ -149,9 +149,9 @@ var requestParameterMunges = [
var activeRequestMungeSet = undefined;
// in the recent stock site updates, their javascript code has been less obsfucated, but also the munge parameters
// in the recent stock site updates, their javascript code has been less obfuscated, but also the munge parameters
// change on every release. I can only assume it's now an integrated step in the build/release system, rather
// than continued efforts to block iitc. the lighter obsfucation on the code makes it easier to parse and find
// than continued efforts to block iitc. the lighter obfuscation on the code makes it easier to parse and find
// the munges in the code - so let's attempt that
function extractMungeFromStock() {
try {
@ -216,7 +216,7 @@ function extractMungeFromStock() {
foundMunges.latE6 = result[3] || result[4];
foundMunges.lngE6 = result[5] || result[6];
var chatTab = result[7] || result[8];
if (chatTab != foundMunges.chatTab) throw 'Error: inconsistant munge parsing for chatTab';
if (chatTab != foundMunges.chatTab) throw 'Error: inconsistent munge parsing for chatTab';
// LOOKUP_PLAYERS
var reg = new RegExp('LOOKUP_PLAYERS, {'+mungeRegExpLit+'a}');

2
code/utils_misc.js
View File

@ -283,7 +283,7 @@ window.getPortalDataZoom = function() {
// (mobile: a float somehow gets through in some cases!)
var z = parseInt(mapZoom);
// limiting the mazimum zoom level for data retrieval reduces the number of requests at high zoom levels
// limiting the maximum zoom level for data retrieval reduces the number of requests at high zoom levels
// (as all portal data is retrieved at z=17, why retrieve multiple z=18 tiles when fewer z=17 would do?)
// very effective along with the new cache code
if (z > 17) z=17;

6
external/leaflet.draw.js vendored
View File

@ -201,7 +201,7 @@ L.Draw.Polyline = L.Draw.Feature.extend({
fill: false,
clickable: true
},
metric: true, // Whether to use the metric meaurement system or imperial
metric: true, // Whether to use the metric measurement system or imperial
zIndexOffset: 2000 // This should be > than the highest z-index any map layers
},
@ -808,7 +808,7 @@ L.Draw.Circle = L.Draw.SimpleShape.extend({
fillOpacity: 0.2,
clickable: true
},
metric: true // Whether to use the metric meaurement system or imperial
metric: true // Whether to use the metric measurement system or imperial
},
initialize: function (map, options) {
@ -2523,7 +2523,7 @@ L.EditToolbar.Edit = L.Handler.extend({
pathOptions;
// Don't do anything if this layer is a marker but doesn't have an icon. Markers
// should usually have icons. If using Leaflet.draw with Leafler.markercluster there
// should usually have icons. If using Leaflet.draw with Leaflet.markercluster there
// is a chance that a marker doesn't.
if (isMarker && !layer._icon) {
return;

2
mobile/src/com/cradle/iitc_mobile/IITC_WebView.java
View File

@ -175,7 +175,7 @@ public class IITC_WebView extends WebView {
// if in edit text mode, don't load javascript otherwise the keyboard closes.
HitTestResult testResult = getHitTestResult();
if (testResult != null && testResult.getType() == HitTestResult.EDIT_TEXT_TYPE) {
// let window.show(...) interupt input
// let window.show(...) interrupt input
// window.show(...) is called if one of the action bar buttons
// is clicked
if (!js.startsWith("window.show(")) {

4
plugins/ap-list.user.js
View File

@ -592,7 +592,7 @@ window.plugin.apList.comparePortal = function(a,b) {
aProperty = aProperty[propertyName];
bProperty = bProperty[propertyName];
});
// compare next porperty if equal
// compare next property if equal
if(aProperty === bProperty) return true;
result = (aProperty > bProperty ? 1 : -1) * option.order;
@ -619,7 +619,7 @@ window.plugin.apList.disableCache = function() {
window.plugin.apList.selectPortal = function(guid) {
// Add error catching to avoid following link of portal if error
// occured in renderPortalDetails or hooked plugin
// occurred in renderPortalDetails or hooked plugin
try {
renderPortalDetails(guid);
} catch(e) {

2
plugins/bookmarks-by-zaso.user.js
View File

@ -916,7 +916,7 @@
// Fired when a bookmarks/folder is removed, added or sorted, also when a folder is opened/closed.
if($.inArray('pluginBkmrksEdit', window.VALID_HOOKS) < 0) { window.VALID_HOOKS.push('pluginBkmrksEdit'); }
// Fired when the "Bookmarks Options" panell is opened (you can add new options);
// Fired when the "Bookmarks Options" panel is opened (you can add new options);
if($.inArray('pluginBkmrksOpenOpt', window.VALID_HOOKS) < 0) { window.VALID_HOOKS.push('pluginBkmrksOpenOpt'); }
// Fired when the sync is finished;
if($.inArray('pluginBkmrksSyncEnd', window.VALID_HOOKS) < 0) { window.VALID_HOOKS.push('pluginBkmrksSyncEnd'); }

2
plugins/player-tracker.user.js
View File

@ -303,7 +303,7 @@ window.plugin.playerTracker.drawData = function() {
var last = playerData.events[evtsLength-1];
var ago = plugin.playerTracker.ago;
// tooltip for marker - no HYML - and not shown on touchscreen devices
// tooltip for marker - no HTML - and not shown on touchscreen devices
var tooltip = isTouchDev ? '' : (playerData.nick+', '+ago(last.time, now)+' ago');
// popup for marker

2
plugins/portal-highlighter-can-make-level.user.js
View File

@ -56,7 +56,7 @@ window.plugin.portalHighligherPortalsCanMakeLevel.getHighlighter = function(lvl)
var setup = function() {
// This is the maximum level of a portal a user can be the "last peice of"
// This is the maximum level of a portal a user can be the "last piece of"
// yes, even a level 1 can be the difference in bumping a portal up to level 7
var max_can_complete = 7;
if(PLAYER.level === 8) {

2
website/code/desktop-download.php
View File

@ -122,7 +122,7 @@ function iitcDesktopPluginDownloadTable ( $build )
# remove 'IITC Plugin: ' prefix if it's there, for neatness
$name = preg_replace ( '/^IITC plugin: /i', '', $details['@name'] );
# format extended version info in less prominant font
# format extended version info in less prominent font
$version = preg_replace ( '/^(\d+\.\d+\.\d+)\.(\d{8}\.\d{1,6})/', '\1<br><small class="muted">.\2</small>', $details['@version'] );
# remove unneeded prefix from description

2
website/code/url/url_to_absolute.php
View File

@ -444,7 +444,7 @@ function join_url( $parts, $encode=FALSE)
*
* RFC3986 specifies the allowed characters in the URL as well as
* reserved characters in the URL. This function replaces all the
* disallowed characters in the URL with their repective percent
* disallowed characters in the URL with their respective percent
* encodings. Already encoded characters are not encoded again,
* such as '%20' is not encoded to '%2520'.
*

2
website/page/home.php
View File

@ -61,7 +61,7 @@ scripts to match.
<h4>16th October 2013</h4>
<p>
IITC 0.14.3 and IITC MObile 0.7.4 have just been released. This is a critical update required to work with the latest
IITC 0.14.3 and IITC Mobile 0.7.4 have just been released. This is a critical update required to work with the latest
changes Niantic have made to the standard intel site. Additionally, the draw-tools plugin now snaps points to portals
when creating lines/polygons/markers (was actually in 0.14.2 release), a bugfix relating to IITC not realising who
'you' are, causing some highlighters to break, and a handful of other tweaks/bugfixes.

2
website/page/news.php
View File

@ -48,7 +48,7 @@ scripts to match.
<h4>16th October 2013</h4>
<p>
IITC 0.14.3 and IITC MObile 0.7.4 have just been released. This is a critical update required to work with the latest
IITC 0.14.3 and IITC Mobile 0.7.4 have just been released. This is a critical update required to work with the latest
changes Niantic have made to the standard intel site. Additionally, the draw-tools plugin now snaps points to portals
when creating lines/polygons/markers (was actually in 0.14.2 release), a bugfix relating to IITC not realising who
'you' are, causing some highlighters to break, and a handful of other tweaks/bugfixes.