From 39faef2c4c7ee93241b809241ddfea6fd3a6705e Mon Sep 17 00:00:00 2001 From: Jon Atkins Date: Tue, 27 Aug 2013 21:29:54 +0100 Subject: [PATCH 1/7] critical bugfix - don't assume jquery is available when initially processing JS - setupIdle function added - don't detect portals from a 'turret' entry - use 'portalV2' as the stock site does - don't try to display the field MU counts when not in the data --- code/boot.js | 1 + code/idle.js | 7 +++++-- code/map_data.js | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/boot.js b/code/boot.js index 69bd6f23..5fe59d8b 100644 --- a/code/boot.js +++ b/code/boot.js @@ -456,6 +456,7 @@ function boot() { shadowSize: new L.Point(41, 41) }}); + window.setupIdle(); window.setupTaphold(); window.setupStyles(); window.setupDialogs(); diff --git a/code/idle.js b/code/idle.js index bc21a378..41610775 100644 --- a/code/idle.js +++ b/code/idle.js @@ -44,8 +44,11 @@ var idleMouseMove = function(e) { } } -$('body').keypress(idleReset); -$('body').mousemove(idleMouseMove); +window.setupIdle = function() { + $('body').keypress(idleReset); + $('body').mousemove(idleMouseMove); +} + window.isIdle = function() { return window.idleTime >= window._idleTimeLimit; diff --git a/code/map_data.js b/code/map_data.js index 1216dae0..03db2aad 100644 --- a/code/map_data.js +++ b/code/map_data.js @@ -343,7 +343,7 @@ window.handleDataResponse = function(data, fromCache, tile_ids) { if(ent[0] in window._deletedEntityGuid) return true; - if(ent[2].turret !== undefined) { + if(ent[2].portalV2 !== undefined) { // TODO? remove any linkedEdges or linkedFields that have entries in window._deletedEntityGuid var latlng = [ent[2].locationE6.latE6/1E6, ent[2].locationE6.lngE6/1E6]; @@ -374,7 +374,7 @@ window.handleDataResponse = function(data, fromCache, tile_ids) { }); renderField(ent); } else { - throw('Unknown entity: ' + JSON.stringify(ent)); + console.warn('Unknown entity: ' + JSON.stringify(ent)); } }); }); @@ -906,7 +906,7 @@ window.renderField = function(ent) { } // put both in one group, so they can be handled by the same logic. - if (areaZoomRatio > FIELD_MU_DISPLAY_AREA_ZOOM_RATIO && countForMUDisplay > 2) { + if ('entityScore' in ent[2] && areaZoomRatio > FIELD_MU_DISPLAY_AREA_ZOOM_RATIO && countForMUDisplay > 2) { // centroid of field for placing MU count at var centroid = [ (latlngs[0].lat + latlngs[1].lat + latlngs[2].lat)/3, From 77ac9c9d569d7e8b524ca6b75706711e7f2ba5c4 Mon Sep 17 00:00:00 2001 From: Jon Atkins Date: Tue, 27 Aug 2013 21:35:55 +0100 Subject: [PATCH 2/7] bump mobile version number - needed for new IITC release --- mobile/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/AndroidManifest.xml b/mobile/AndroidManifest.xml index 3b4838a1..3b4f2910 100644 --- a/mobile/AndroidManifest.xml +++ b/mobile/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="38" + android:versionName="0.5.4.3"> Date: Tue, 27 Aug 2013 23:09:18 +0100 Subject: [PATCH 3/7] update website for new release --- website/page/home.php | 10 ++++++++++ website/page/news.php | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/website/page/home.php b/website/page/home.php index de020dce..30732ef5 100644 --- a/website/page/home.php +++ b/website/page/home.php @@ -13,6 +13,16 @@ offers many more features. It is available for

Latest news

+

27th August 2013

+

+Yet another critical IITC update, 0.13.4 (and mobile 0.5.4.3) have been released. A few things in this build +

    +
  • Scoreboard plugin is broken - fix coming later
    • +
  • No MU numbers shown in fields - the server no longer returns the data
    • +
  • Other plugins may be broken too - limited testing has been done
    • +
+

+

16th August 2013

IITC 0.13.3 and IITC Mobile 0.5.4.2 have been released. This is another critical update required to work diff --git a/website/page/news.php b/website/page/news.php index 77edbe72..3c10c351 100644 --- a/website/page/news.php +++ b/website/page/news.php @@ -1,5 +1,15 @@

News

+

27th August 2013

+

+Yet another critical IITC update, 0.13.4 (and mobile 0.5.4.3) have been released. A few things in this build +

    +
  • Scoreboard plugin is broken - fix coming later
    • +
  • No MU numbers shown in fields - the server no longer returns the data
    • +
  • Other plugins may be broken too - limited testing has been done
    • +
+

+

16th August 2013

IITC 0.13.3 and IITC Mobile 0.5.4.2 have been released. This is another critical update required to work From 82ede788447725361e955a4add3866188bb1f6d1 Mon Sep 17 00:00:00 2001 From: Jon Atkins Date: Wed, 28 Aug 2013 00:09:58 +0100 Subject: [PATCH 4/7] fix running IITC at startup on mobile. we don't have jquery, so $(document) isn't available. not sure if there's a native method to easily set the document.ready event, but a 1ms setTimeout will work just fine instead. --- mobile/AndroidManifest.xml | 4 ++-- mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mobile/AndroidManifest.xml b/mobile/AndroidManifest.xml index 3b4f2910..4b6d73ce 100644 --- a/mobile/AndroidManifest.xml +++ b/mobile/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="39" + android:versionName="0.5.5"> Date: Wed, 28 Aug 2013 00:12:49 +0100 Subject: [PATCH 5/7] website update for fixed build --- website/page/home.php | 3 ++- website/page/news.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/website/page/home.php b/website/page/home.php index 30732ef5..159feb4d 100644 --- a/website/page/home.php +++ b/website/page/home.php @@ -15,12 +15,13 @@ offers many more features. It is available for

27th August 2013

-Yet another critical IITC update, 0.13.4 (and mobile 0.5.4.3) have been released. A few things in this build +Yet another critical IITC update, 0.13.4, and IITC Mobile 0.5.5, have been released. A few things in this build

  • Scoreboard plugin is broken - fix coming later
  • No MU numbers shown in fields - the server no longer returns the data
  • Other plugins may be broken too - limited testing has been done
+Note: Briefly IITC Mobile 0.5.4.3 was available, but broken.

16th August 2013

diff --git a/website/page/news.php b/website/page/news.php index 3c10c351..7a54733a 100644 --- a/website/page/news.php +++ b/website/page/news.php @@ -2,12 +2,13 @@

27th August 2013

-Yet another critical IITC update, 0.13.4 (and mobile 0.5.4.3) have been released. A few things in this build +Yet another critical IITC update, 0.13.4, and IITC Mobile 0.5.5, have been released. A few things in this build

  • Scoreboard plugin is broken - fix coming later
  • No MU numbers shown in fields - the server no longer returns the data
  • Other plugins may be broken too - limited testing has been done
+Note: Briefly IITC Mobile 0.5.4.3 was available, but broken.

16th August 2013

From bd908f39897567a62786dffcee9b1c584e5d34b3 Mon Sep 17 00:00:00 2001 From: Jon Atkins Date: Wed, 28 Aug 2013 00:27:50 +0100 Subject: [PATCH 6/7] website: add faq entry for login issues --- website/page/faq.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/website/page/faq.php b/website/page/faq.php index fa24f377..086d1ce9 100644 --- a/website/page/faq.php +++ b/website/page/faq.php @@ -2,6 +2,23 @@
    +
  • +

    Login on mobile doesn't work!

    +

    +Many users are seeing the error message Error: Server Error when attempting to log in on mobile. +To get past this and log in successfully, you can try to +

      +
    1. Exit IITC and try again. Some people have success after a number of tries, or
      2. +
    2. Cancel when asked to choose an account, and manually enter your email address and password into the web page
      3. +
    +

    +

    +As far as we can tell this isn't an IITC Mobile issue - using the Chrome browser on android, which also supports +Google login, can give similar issues. Further discussion on this is happening in +github issue #497. +

    +
    • +

  • I get a message saying my account isn't activated

    From abab680a0038a0f26b0b0012b15f69ca317e2ee2 Mon Sep 17 00:00:00 2001 From: Jon Atkins Date: Wed, 28 Aug 2013 00:29:36 +0100 Subject: [PATCH 7/7] add note to the mobile 'known issues' about the login problem --- website/page/mobile.php | 1 + 1 file changed, 1 insertion(+) diff --git a/website/page/mobile.php b/website/page/mobile.php index a5af10dc..35198d6b 100644 --- a/website/page/mobile.php +++ b/website/page/mobile.php @@ -26,6 +26,7 @@ install from the link below.

    IITC Mobile is still in the early stages of development. Many things do not yet work right. Major known issues are:

      +
    1. Some users get Error: Server Error when logging in. See the FAQ for possible workarounds.
    2. Some plugins do not work well, or at all, at this time.
    3. Serious issues exist on Android 4.0 devices. details.