From c0472b268d5368e232a7bff8bd26f503d449d6ab Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Fri, 16 Sep 2016 19:53:37 -0700 Subject: [PATCH] Don't hang the site if a mod doesn't load --- src/client/models/game/mod_pack.coffee | 13 +++++++++++++ .../site/browse_page/browse_page_controller.coffee | 1 + .../site/common/adsense/adsense_controller.coffee | 2 -- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/client/models/game/mod_pack.coffee b/src/client/models/game/mod_pack.coffee index 08cd54df7..50dd10493 100644 --- a/src/client/models/game/mod_pack.coffee +++ b/src/client/models/game/mod_pack.coffee @@ -130,6 +130,15 @@ module.exports = class ModPack extends BaseModel getAllMods: -> return @_mods[..] + removeMod: (mod)-> + index = @_mods.indexOf mod + return unless index >= 0 + + @_mods.splice index, 1 + + @trigger c.event.remove, this, mod.slug + @trigger c.event.change, this + # Name Methods ################################################################################# findName: (slug, options={})-> @@ -176,6 +185,10 @@ module.exports = class ModPack extends BaseModel return true unless mods.length > 0 for mod in mods + if mod.isError + @removeMod mod + continue + modVersions = mod.getAllModVersions() return true unless modVersions.length > 0 continue if mod.activeVersion is Mod.Version.None diff --git a/src/client/site/browse_page/browse_page_controller.coffee b/src/client/site/browse_page/browse_page_controller.coffee index c5b82bb1f..2f1422129 100644 --- a/src/client/site/browse_page/browse_page_controller.coffee +++ b/src/client/site/browse_page/browse_page_controller.coffee @@ -28,6 +28,7 @@ module.exports = class BrowsePageController extends PageController @_tileControllers = [] @_client.on c.event.change, => @tryRefresh() + @_modPack.on c.event.change, => @tryRefresh() # Property Methods ############################################################################# diff --git a/src/client/site/common/adsense/adsense_controller.coffee b/src/client/site/common/adsense/adsense_controller.coffee index 0b839dccf..f0143d6d2 100644 --- a/src/client/site/common/adsense/adsense_controller.coffee +++ b/src/client/site/common/adsense/adsense_controller.coffee @@ -21,8 +21,6 @@ module.exports = class AdsenseController maxAds = c.adsense[adType].slotIds.length - @_adsPlaced return if maxAds is 0 - logger.verbose => "Looking to place #{maxAds} more #{adType} ads..." - if adType is 'skyscraper' placedNewAd = @_createSkyscraperPositions() else