plugins: extend portal-list uniformly

remove redundant code trying to wait for `window.plugin.portalslist` namespace (in fact, on setup phase ALL plugins namespaces should be already available)
IITC-CE · Jul 4, 2019 · 8630224 · 8630224
1 parent 21874f7
commit 8630224
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 24 deletions.
diff --git a/plugins/bookmarks.user.js b/plugins/bookmarks.user.js
@@ -1308,13 +1308,8 @@
     window.addHook('pluginBkmrksEdit', window.plugin.bookmarks.editStar);
     window.addHook('pluginBkmrksSyncEnd', window.plugin.bookmarks.resetAllStars);
 
-    if(window.plugin.portalslist) {
+    if (window.plugin.portalslist) {
       window.plugin.bookmarks.setupPortalsList();
-    } else {
-      setTimeout(function() {
-        if(window.plugin.portalslist)
-          window.plugin.bookmarks.setupPortalsList();
-      }, 500);
     }
   }
 

diff --git a/plugins/distance-to-portal.user.js b/plugins/distance-to-portal.user.js
@@ -103,8 +103,6 @@ window.plugin.distanceToPortal.setLocation = function() {
 };
 
 window.plugin.distanceToPortal.setupPortalsList = function() {
-  if(!window.plugin.portalslist) return;
-
   window.plugin.portalslist.fields.push({
     title: "Dist",
     value: function(portal) { if (window.plugin.distanceToPortal.currentLoc) return window.plugin.distanceToPortal.currentLoc.distanceTo(portal.getLatLng()); else return 0; },
@@ -131,8 +129,9 @@ window.plugin.distanceToPortal.setup  = function() {
 
   addHook('portalDetailsUpdated', window.plugin.distanceToPortal.addDistance);
 
-  window.plugin.distanceToPortal.setupPortalsList();
-
+  if (window.plugin.portalslist) {
+    window.plugin.distanceToPortal.setupPortalsList();
+  }
 };
 
 var setup =  window.plugin.distanceToPortal.setup;

diff --git a/plugins/keys.user.js b/plugins/keys.user.js
@@ -186,7 +186,6 @@ window.plugin.keys.setupContent = function() {
 }
 
 window.plugin.keys.setupPortalsList = function() {
-  if(!window.plugin.portalslist) return;
 
   window.addHook('pluginKeysUpdateKey', function(data) {
     $('[data-list-keycount="'+data.guid+'"]').text(data.count);
@@ -243,13 +242,8 @@ var setup =  function() {
   window.addHook('portalDetailsUpdated', window.plugin.keys.addToSidebar);
   window.plugin.keys.registerFieldForSyncing();
 
-  if(window.plugin.portalslist) {
+  if (window.plugin.portalslist) {
     window.plugin.keys.setupPortalsList();
-  } else {
-    setTimeout(function() {
-      if(window.plugin.portalslist)
-        window.plugin.keys.setupPortalsList();
-    }, 500);
   }
 }
 

diff --git a/plugins/uniques.user.js b/plugins/uniques.user.js
@@ -421,7 +421,6 @@ window.plugin.uniques.setupContent = function() {
 }
 
 window.plugin.uniques.setupPortalsList = function() {
-	if(!window.plugin.portalslist) return;
 
 	window.addHook('pluginUniquesUpdateUniques', function(data) {
 		var info = plugin.uniques.uniques[data.guid];
@@ -572,13 +571,8 @@ var setup = function() {
 	window.addHook('plugin-missions-mission-changed', window.plugin.uniques.onMissionChanged);
 	window.addHook('plugin-missions-loaded-mission', window.plugin.uniques.onMissionLoaded);
 
-	if(window.plugin.portalslist) {
+	if (window.plugin.portalslist) {
 		window.plugin.uniques.setupPortalsList();
-	} else {
-		setTimeout(function() {
-			if(window.plugin.portalslist)
-				window.plugin.uniques.setupPortalsList();
-		}, 500);
 	}
 }