From 641f3f522b1f262109ab29f6d38cdeba975e952d Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Wed, 21 Jan 2015 15:32:35 -0800 Subject: [PATCH] Fix bug where deep links didn't connect --- src/scripts/controllers/base_controller.coffee | 2 +- src/scripts/crafting_guide_router.coffee | 1 + src/scripts/models/base_model.coffee | 2 +- src/scripts/models/item_page.coffee | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/scripts/controllers/base_controller.coffee b/src/scripts/controllers/base_controller.coffee index e76df7fa1..fcf96027d 100644 --- a/src/scripts/controllers/base_controller.coffee +++ b/src/scripts/controllers/base_controller.coffee @@ -87,7 +87,7 @@ module.exports = class BaseController extends Backbone.View logger.error "Default render called for #{@constructor.name} without a template" return this - logger.verbose "#{this} rendering with data: #{util.inspect(data)}" + logger.verbose "#{this} rendering with data: #{data}" @onWillRender() $oldEl = @$el $newEl = Backbone.$(@_template(data)) diff --git a/src/scripts/crafting_guide_router.coffee b/src/scripts/crafting_guide_router.coffee index 6de91bdc7..d440727b3 100644 --- a/src/scripts/crafting_guide_router.coffee +++ b/src/scripts/crafting_guide_router.coffee @@ -64,6 +64,7 @@ module.exports = class CraftingGuideRouter extends Backbone.Router item: (name, quantity=1)-> @_pageControllers.item ?= new ItemPageController @_defaultOptions @_pageControllers.item.model.params = name:name, quantity:quantity + logger.debug "detected params.name: #{name}, params.quantity: #{quantity}" @_setPage 'item' mod: (slug)-> diff --git a/src/scripts/models/base_model.coffee b/src/scripts/models/base_model.coffee index 562c15307..f4ab45bb0 100644 --- a/src/scripts/models/base_model.coffee +++ b/src/scripts/models/base_model.coffee @@ -43,7 +43,7 @@ module.exports = class BaseModel extends Backbone.Model try @set @parse text @trigger Event.change, this - @trigger Event.sync, this, text + @trigger Event.sync, this logger.info "#{@constructor.name}.#{@cid} loaded successfully" catch e logger.error "A parsing error occured: #{e.stack}" diff --git a/src/scripts/models/item_page.coffee b/src/scripts/models/item_page.coffee index 826e7ee89..0d947aeb3 100644 --- a/src/scripts/models/item_page.coffee +++ b/src/scripts/models/item_page.coffee @@ -22,7 +22,7 @@ module.exports = class ItemPage extends BaseModel attributes.table ?= new CraftingTable plan:attributes.plan super attributes, options - @modPack.on Event.add + ':mod', (mod)=> mod.on 'sync', => @_consumeParams() + @modPack.on Event.change, => @_consumeParams() @plan.on Event.change, => @_updateLocation() # Private Methods ############################################################################## @@ -30,7 +30,7 @@ module.exports = class ItemPage extends BaseModel _consumeParams: -> return unless @params?.name? - item = @modPack.findItemByName @params.name, includeDisabled:true + item = @modPack.findItemByName @params.name return unless item? and item.isCraftable quantity = if @params.quantity? then parseInt(@params.quantity) else 1