From 4a9b13eade879fcec7c6a8fffc56d7766e72509a Mon Sep 17 00:00:00 2001 From: Mike Castle Date: Sun, 24 Nov 2013 00:19:25 -0800 Subject: [PATCH] Spell checking, s-z, plus a couple of missed ones. --- HACKING.md | 4 ++-- code/boot.js | 2 +- code/map_data_cache.js | 2 +- code/map_data_render.js | 4 ++-- code/munge.js | 2 +- code/portal_detail_display.js | 2 +- code/status_bar.js | 2 +- external/L.Geodesic.js | 2 +- .../cradle/iitc_mobile/IITC_DeviceAccountLogin.java | 2 +- plugins/basemap-stamen.user.js | 6 +++--- plugins/bookmarks-by-zaso.user.js | 10 +++++----- plugins/keys.user.js | 2 +- plugins/portal-counts.user.js | 2 +- plugins/portal-defense.user.js | 2 +- plugins/portal-highlighter-my-portals.user.js | 2 +- plugins/portals-list.user.js | 4 ++-- style.css | 2 +- website/code/desktop-download.php | 2 +- website/index.php | 2 +- website/page/faq.php | 2 +- website/page/news.php | 2 +- 21 files changed, 30 insertions(+), 30 deletions(-) diff --git a/HACKING.md b/HACKING.md index 64e1903b..2ea4bfcf 100644 --- a/HACKING.md +++ b/HACKING.md @@ -1,7 +1,7 @@ Hacking ======= -Execute `./build.py` to effectively concatenate `main.js` with all the files in `code/`. It generates the user script which may be installed into your browser. Do not modify `ttic-debug.user.js` manually, because it is automatically generated. Instead, modify the files in `code/` and have that file built for you. The files in `dist/` are for release only and should not be touched by you. +Execute `./build.py` to effectively concatenate `main.js` with all the files in `code/`. It generates the user script which may be installed into your browser. Do not modify `iitc-debug.user.js` manually, because it is automatically generated. Instead, modify the files in `code/` and have that file built for you. The files in `dist/` are for release only and should not be touched by you. `style.css` contains most styles required for the user-script. The extra ones can be found in `code/boot.js#window.setupStyles`. Only CSS rules that depend on config variables should be defined there. @@ -23,7 +23,7 @@ My dev setup is like this: Code Style ---------- -Please follow the these guidelines. Some are just preference, others are good pratice. +Please follow the these guidelines. Some are just preference, others are good practice. - use identity operators: `===` and `!==`. [Why do I want this?](http://stackoverflow.com/a/359509/1684530) - jQuery is your friend - indent using two spaces diff --git a/code/boot.js b/code/boot.js index f9953a46..78c0ecbc 100644 --- a/code/boot.js +++ b/code/boot.js @@ -251,7 +251,7 @@ window.setupMap = function() { map.on('moveend', function(e) { // two limits on map position - // we wrap longitude (the L.LatLng 'wrap' method) - so we don't find outselves looking beyond +-180 degrees + // we wrap longitude (the L.LatLng 'wrap' method) - so we don't find ourselves looking beyond +-180 degrees // then latitude is clamped with the clampLatLng function (to the 85 deg north/south limits) var newPos = clampLatLng(map.getCenter().wrap()); if (!map.getCenter().equals(newPos)) { diff --git a/code/map_data_cache.js b/code/map_data_cache.js index f5b90579..e6caf3b9 100644 --- a/code/map_data_cache.js +++ b/code/map_data_cache.js @@ -7,7 +7,7 @@ window.DataCache = function() { // stale cache entries can be updated (that's what the optional 'timestampMs' field in getThinnedEntities is // for, retrieving deltas) so use a long max age to take advantage of this - // however, ther must be an overall limit on the maximum age of data from the servers, otherwise the deletedEntity + // however, there must be an overall limit on the maximum age of data from the servers, otherwise the deletedEntity // entries would grow indefinitely. an hour seems reasonable from experience with the data, so 55 mins max cache time // this.REQUEST_CACHE_MAX_AGE = 55*60; // maximum cache age. entries are deleted from the cache after this time //UPDATE: this timestampMs parameter doesn't work, so reduced max age to limit RAM usage diff --git a/code/map_data_render.js b/code/map_data_render.js index 1a651875..df354c4b 100644 --- a/code/map_data_render.js +++ b/code/map_data_render.js @@ -127,7 +127,7 @@ window.Render.prototype.processGameEntities = function(entities) { // is considered complete window.Render.prototype.endRenderPass = function() { - // check to see if there's eny entities we haven't seen. if so, delete them + // check to see if there are any entities we haven't seen. if so, delete them for (var guid in window.portals) { // special case for selected portal - it's kept even if not seen if (!(guid in this.seenPortalsGuid) && guid !== selectedPortal) { @@ -567,7 +567,7 @@ window.Render.prototype.resetPortalClusters = function() { } -// add the portal to the visiable map layer unless we pass the cluster limits +// add the portal to the visible map layer unless we pass the cluster limits window.Render.prototype.addPortalToMapLayer = function(portal) { var cid = this.getPortalClusterID(portal); diff --git a/code/munge.js b/code/munge.js index deb96c28..3630f177 100644 --- a/code/munge.js +++ b/code/munge.js @@ -238,7 +238,7 @@ function extractMungeFromStock() { var activeMunge = null; -// attempt to guess the munge set in use, by looking therough the functions of the stock intel page for one of the munged params +// attempt to guess the munge set in use, by looking through the functions of the stock intel page for one of the munged params window.detectActiveMungeSet = function() { // first, try and parse the stock functions and extract the munges directly diff --git a/code/portal_detail_display.js b/code/portal_detail_display.js index 03820882..3562844f 100644 --- a/code/portal_detail_display.js +++ b/code/portal_detail_display.js @@ -54,7 +54,7 @@ window.renderPortalDetails = function(guid) { //(at some future point we can iterate through all the artifact types and add rows as needed) var jarvisArtifact = artifact.getPortalData (guid, 'jarvis'); if (jarvisArtifact) { - // the genFourColumnTable function below doesn't handle cases where one column is null and the other isn't - so default to *someting* in both columns + // the genFourColumnTable function below doesn't handle cases where one column is null and the other isn't - so default to *something* in both columns var target = ['',''], shards = ['shards','(none)']; if (jarvisArtifact.target) { target = ['target', ''+(jarvisArtifact.target==TEAM_RES?'Resistance':'Enlightened')+'']; diff --git a/code/status_bar.js b/code/status_bar.js index cd034767..df3b2a0f 100644 --- a/code/status_bar.js +++ b/code/status_bar.js @@ -6,7 +6,7 @@ window.renderUpdateStatus = function() { // portal level display var t = ''; - if(!window.isSmartphone()) // space is valueable + if(!window.isSmartphone()) // space is valuable t += 'portals: '; var minlvl = getMinPortalLevel(); if(minlvl === 0) diff --git a/external/L.Geodesic.js b/external/L.Geodesic.js index 20955133..8a6ef59e 100644 --- a/external/L.Geodesic.js +++ b/external/L.Geodesic.js @@ -90,7 +90,7 @@ Modified by qnstie 2013-07-17 to maintain compatibility with Leaflet.draw // geodesic calculations have issues when crossing the anti-meridian. so offset the points // so this isn't an issue, then add back the offset afterwards - // a center longitude would be ideal - but the start point logitude will be 'good enough' + // a center longitude would be ideal - but the start point longitude will be 'good enough' var lngOffset = latlngs[0].lng; // points are wrapped after being offset relative to the first point coordinate, so they're diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_DeviceAccountLogin.java b/mobile/src/com/cradle/iitc_mobile/IITC_DeviceAccountLogin.java index fb8e1890..90215244 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_DeviceAccountLogin.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_DeviceAccountLogin.java @@ -155,7 +155,7 @@ public class IITC_DeviceAccountLogin implements AccountManagerCallback { String result = value.getResult().getString(AccountManager.KEY_AUTHTOKEN); if (result != null) { - // authentication succeded, we can load the given url, which will redirect + // authentication succeeded, we can load the given url, which will redirect // back to the intel map mWebView.loadUrl(result); mActivity.loginSucceeded(); diff --git a/plugins/basemap-stamen.user.js b/plugins/basemap-stamen.user.js index babbade4..80e6a3c6 100644 --- a/plugins/basemap-stamen.user.js +++ b/plugins/basemap-stamen.user.js @@ -27,9 +27,9 @@ window.plugin.mapTileStamen.addLayer = function() { var types = { 'toner': [ 'Toner', 'png', 0, 20 ], -// 'toner-hybrid': [ ' Toner Hybrid', 'png', 0, 20 ], // transparent layer. could be usefun over satelliate imagery or similar -// 'toner-labels': [ 'Toner Labels', 'png', 0, 20 ], // transparent layer. could be usefun over satelliate imagery or similar -// 'toner-lines': [ 'Toner Lines', 'png', 0, 20 ], // transparent layer. could be usefun over satelliate imagery or similar +// 'toner-hybrid': [ ' Toner Hybrid', 'png', 0, 20 ], // transparent layer. could be useful over satellite imagery or similar +// 'toner-labels': [ 'Toner Labels', 'png', 0, 20 ], // transparent layer. could be useful over satellite imagery or similar +// 'toner-lines': [ 'Toner Lines', 'png', 0, 20 ], // transparent layer. could be useful over satellite imagery or similar 'toner-background': [ 'Toner Background', 'png', 0, 20 ], 'toner-lite': [ 'Toner Lite', 'png', 0, 20 ], 'watercolor': [ 'Watercolor', 'jpg', 1, 16 ], diff --git a/plugins/bookmarks-by-zaso.user.js b/plugins/bookmarks-by-zaso.user.js index 9044b01d..3349e846 100644 --- a/plugins/bookmarks-by-zaso.user.js +++ b/plugins/bookmarks-by-zaso.user.js @@ -543,8 +543,8 @@ localStorage[window.plugin.bookmarks.KEY_STORAGE] = promptAction; window.plugin.bookmarks.refreshBkmrks(); window.runHooks('pluginBkmrksEdit', {"target": "all", "action": "import"}); - console.log('BOOKMARKS: resetted and imported bookmarks'); - window.plugin.bookmarks.optAlert('Succesful. '); + console.log('BOOKMARKS: reset and imported bookmarks'); + window.plugin.bookmarks.optAlert('Successful. '); } } @@ -556,8 +556,8 @@ window.plugin.bookmarks.loadStorage(); window.plugin.bookmarks.refreshBkmrks(); window.runHooks('pluginBkmrksEdit', {"target": "all", "action": "reset"}); - console.log('BOOKMARKS: resetted all bookmarks'); - window.plugin.bookmarks.optAlert('Succesful. '); + console.log('BOOKMARKS: reset all bookmarks'); + window.plugin.bookmarks.optAlert('Successful. '); } } @@ -709,7 +709,7 @@ }, window.plugin.bookmarks.SYNC_DELAY); } - // Store the upadteQueue in updatingQueue and upload + // Store the updateQueue in updatingQueue and upload window.plugin.bookmarks.syncNow = function() { if(!window.plugin.bookmarks.enableSync) return; $.extend(window.plugin.bookmarks.updatingQueue, window.plugin.bookmarks.updateQueue); diff --git a/plugins/keys.user.js b/plugins/keys.user.js index d1aa488a..7ba1697b 100644 --- a/plugins/keys.user.js +++ b/plugins/keys.user.js @@ -86,7 +86,7 @@ window.plugin.keys.delaySync = function() { }, plugin.keys.SYNC_DELAY); } -// Store the upadteQueue in updatingQueue and upload +// Store the updateQueue in updatingQueue and upload window.plugin.keys.syncNow = function() { if(!plugin.keys.enableSync) return; $.extend(plugin.keys.updatingQueue, plugin.keys.updateQueue); diff --git a/plugins/portal-counts.user.js b/plugins/portal-counts.user.js index 08020cb9..b511d6e8 100644 --- a/plugins/portal-counts.user.js +++ b/plugins/portal-counts.user.js @@ -32,7 +32,7 @@ // use own namespace for plugin window.plugin.portalcounts = function() {}; -//count portals for each level avalaible on the map +//count portals for each level available on the map window.plugin.portalcounts.getPortals = function(){ //console.log('** getPortals'); var retval=false; diff --git a/plugins/portal-defense.user.js b/plugins/portal-defense.user.js index 000a2cf5..9f95ce4d 100644 --- a/plugins/portal-defense.user.js +++ b/plugins/portal-defense.user.js @@ -152,7 +152,7 @@ var setup = function() { window.plugin.portalDefense.currentDisplay = window.plugin.portalDefense.getDisplay(); map.on('zoomend', window.plugin.portalDefense.showOrHide); - // this layer is added to tha layer chooser, to be toggled on/off + // 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 diff --git a/plugins/portal-highlighter-my-portals.user.js b/plugins/portal-highlighter-my-portals.user.js index 63a9f216..583e9e0d 100644 --- a/plugins/portal-highlighter-my-portals.user.js +++ b/plugins/portal-highlighter-my-portals.user.js @@ -6,7 +6,7 @@ // @namespace https://github.com/jonatkins/ingress-intel-total-conversion // @updateURL @@UPDATEURL@@ // @downloadURL @@DOWNLOADURL@@ -// @description [@@BUILDNAME@@-@@BUILDDATE@@] Uses the fill color of the portals to denote portals you have a hand in. Orange is just ownership. Yellow is sheilds. Red is Resonators. Red trumps both, yellow trumps orange. +// @description [@@BUILDNAME@@-@@BUILDDATE@@] Uses the fill color of the portals to denote portals you have a hand in. Orange is just ownership. Yellow is shields. Red is Resonators. Red trumps both, yellow trumps orange. // @include https://www.ingress.com/intel* // @include http://www.ingress.com/intel* // @match https://www.ingress.com/intel* diff --git a/plugins/portals-list.user.js b/plugins/portals-list.user.js index 8031be7b..2b439f92 100644 --- a/plugins/portals-list.user.js +++ b/plugins/portals-list.user.js @@ -26,7 +26,7 @@ * 0.0.10: Fixed persistent css problem with alert * 0.0.9 : bugs hunt * 0.0.8 : Aborted to avoid problems with Niantic (export portals informations as csv or kml file) -* 0.0.7 : more informations avalaible via tooltips (who deployed, energy, ...), new E/AP column +* 0.0.7 : more informations available via tooltips (who deployed, energy, ...), new E/AP column * 0.0.6 : Add power charge information into a new column + bugfix * 0.0.5 : Filter portals by clicking on 'All portals', 'Res Portals' or 'Enl Portals' * 0.0.4 : Add link to portals name, one click to display full information in portal panel, double click to zoom on portal, hover to show address @@ -49,7 +49,7 @@ window.plugin.portalslist.enlP = 0; window.plugin.portalslist.resP = 0; window.plugin.portalslist.filter=0; -//fill the listPortals array with portals avalaible on the map (level filtered portals will not appear in the table) +//fill the listPortals array with portals avaliable on the map (level filtered portals will not appear in the table) window.plugin.portalslist.getPortals = function() { //filter : 0 = All, 1 = Res, 2 = Enl //console.log('** getPortals'); diff --git a/style.css b/style.css index fe408f59..4dffc9fa 100644 --- a/style.css +++ b/style.css @@ -115,7 +115,7 @@ a:hover { padding-left: 8px; } -/* hide the usual seperator */ +/* hide the usual separator */ .leaflet-control-layers-separator { display: none; } diff --git a/website/code/desktop-download.php b/website/code/desktop-download.php index 6342c7e7..daf05809 100644 --- a/website/code/desktop-download.php +++ b/website/code/desktop-download.php @@ -52,7 +52,7 @@ function iitcDesktopPluginDownloadTable ( $build ) 'Map Tiles' => "Alternative map layers", 'Tweaks' => "Adjust IITC settings", 'Misc' => "Unclassified plugins", - 'Obsolete' => "Plugins that are no longer recommended, due to being superceeded by others or similar", + 'Obsolete' => "Plugins that are no longer recommended, due to being superceded by others or similar", 'Deleted' => "Deleted plugins - listed here for reference only. No download available" ); diff --git a/website/index.php b/website/index.php index 62f57091..43e61f2a 100644 --- a/website/index.php +++ b/website/index.php @@ -130,7 +130,7 @@ foreach ( $pages as $key => $name ) print "$name\n"; - # after 'mobile', add a horizontal seperator + # after 'mobile', add a horizontal separator if ( $key == 'test' ) print "
  • "; } diff --git a/website/page/faq.php b/website/page/faq.php index e88156ea..4374caa1 100644 --- a/website/page/faq.php +++ b/website/page/faq.php @@ -100,7 +100,7 @@ The colour within the square shows the state of the data: The status message at the bottom-right of the screen gives a summary.
      -
    • If all requests were succesful/fresh from cache (i.e. all green borders) the status is 'Done'.
      • +
    • If all requests were successful/fresh from cache (i.e. all green borders) the status is 'Done'.
    • If some requests failed, but cached data was available (i.e. some red border/yellow fill) the status is 'Out of date'.
    • If some requests failed, but no cached data was available (i.e. some red border/red fill) the status is 'Error'.
    diff --git a/website/page/news.php b/website/page/news.php index 54f82cac..d8fd58e0 100644 --- a/website/page/news.php +++ b/website/page/news.php @@ -230,7 +230,7 @@ IITC version 0.12.0 has been released. This contains quite a few changes and new
  • Sync plugin - to sync data from the 'Keys' addon to multiple computers via Google Drive
  • ... and many other tweaks, bug fixes, etc
    • -IITC Mobile 0.4.0 is also released. THis has also had major work. Along with the above, it includes a +IITC Mobile 0.4.0 is also released. This has also had major work. Along with the above, it includes a new in-app layer chooser and chat/map switcher, and authentication has been revamped to use the native Android authentication rather than entering your password.