From 28f762abe9caedae3607a6b3489f1b4ead311e23 Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Sun, 18 Jan 2015 11:15:52 -0800 Subject: [PATCH] Make fetch a no-up if already loaded --- src/scripts/controllers/mod_controller.coffee | 6 ++---- src/scripts/models/base_model.coffee | 5 ++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/scripts/controllers/mod_controller.coffee b/src/scripts/controllers/mod_controller.coffee index f5183bfb2..e25ccaf5f 100644 --- a/src/scripts/controllers/mod_controller.coffee +++ b/src/scripts/controllers/mod_controller.coffee @@ -37,11 +37,9 @@ module.exports = class ModController extends BaseController # BaseController Overrides ##################################################################### onWillRender: -> - if not @model.isLoaded then @model.fetch() + @model.fetch() if @_storage? then @_storage.register "mod:#{@model.slug}", @model, 'activeVersion' - - @model.on Event.change + ':activeModVersion', (mod, modVersion)=> - if modVersion? and not modVersion.isLoaded then modVersion.fetch() + @model.on Event.change + ':activeModVersion', (mod, modVersion)=> modVersion.fetch() onDidRender: -> @$enabled = @$('td:nth-child(1) input') diff --git a/src/scripts/models/base_model.coffee b/src/scripts/models/base_model.coffee index 307b30bdb..40b271f29 100644 --- a/src/scripts/models/base_model.coffee +++ b/src/scripts/models/base_model.coffee @@ -53,7 +53,10 @@ module.exports = class BaseModel extends Backbone.Model # Backbone.Model Overrides ##################################################################### - fetch: -> + fetch: (options={})-> + options.force ?= false + return if (@isLoading or @isLoaded) and not options.force + url = @url() logger.info "#{@constructor.name}.#{@cid} reading from url: #{url}"