Massive refactoring to clean up models
* Tweak style of quantity label in output box to be more visible * Move data files for all mods under a directory for the specific version of the mod * Add a `silent` property to the base model to prevent models which shouldn't be observed from emitting events * Change the term "itemSlug" to just "slug" across the board * Change all models so that they don't require their parent in their constructors and so that they don't automatically add themselves to their parents lists * Remove a bunch of unnecessary event triggering * Tighten up access to various lists of children across all models * Refactor the guts of the V2 parser into an abstract base class so it can be used for other parsers in the future * Remove a number of unused methods
This commit is contained in:
@@ -74,6 +74,7 @@ module.exports = class BaseController extends Backbone.View
|
||||
return unless @onWillChangeModel @_model, newModel
|
||||
|
||||
@_model = newModel
|
||||
@_model.silent = false
|
||||
@_tryRefresh()
|
||||
|
||||
# Backbone.View Overrides ######################################################################
|
||||
|
||||
@@ -25,6 +25,8 @@ module.exports = class CraftingTableController extends BaseController
|
||||
@imageLoader = options.imageLoader
|
||||
@modPack = options.modPack
|
||||
|
||||
@model.plan.silent = false
|
||||
|
||||
# Event Methods ################################################################################
|
||||
|
||||
onNextClicked: ->
|
||||
@@ -79,7 +81,7 @@ module.exports = class CraftingTableController extends BaseController
|
||||
|
||||
outputStack = @model.output
|
||||
if outputStack?
|
||||
display = @modPack.findItemDisplay outputStack.itemSlug
|
||||
display = @modPack.findItemDisplay outputStack.slug
|
||||
@$outputLink.attr 'href', display.itemUrl
|
||||
@$outputLink.attr 'title', display.itemName
|
||||
@$outputImg.attr 'alt', display.itemName
|
||||
|
||||
@@ -32,8 +32,9 @@ module.exports = class ModPackController extends BaseController
|
||||
|
||||
onWillRender: ->
|
||||
for attributes in DefaultModVersions
|
||||
modVersion = new ModVersion _.extend attributes, modPack:@model
|
||||
modVersion = new ModVersion attributes
|
||||
modVersion.fetch()
|
||||
@model.addModVersion modVersion
|
||||
|
||||
onDidRender: ->
|
||||
@$table = @$('table')
|
||||
@@ -47,13 +48,14 @@ module.exports = class ModPackController extends BaseController
|
||||
return
|
||||
|
||||
index = 0
|
||||
while index < Math.min @_controllers.length, @model.modVersions.length
|
||||
modVersions = @model.getModVersions()
|
||||
while index < Math.min @_controllers.length, modVersions.length
|
||||
controller = @_controllers[index]
|
||||
controller.model = @model.modVersions[index]
|
||||
controller.model = modVersions[index]
|
||||
index++
|
||||
|
||||
while @_controllers.length < @model.modVersions.length
|
||||
controller = new ModVersionController model:@model.modVersions[index]
|
||||
while @_controllers.length < modVersions.length
|
||||
controller = new ModVersionController model:modVersions[index]
|
||||
controller.render()
|
||||
@_controllers.push controller
|
||||
controller.$el.hide duration:0
|
||||
@@ -61,7 +63,7 @@ module.exports = class ModPackController extends BaseController
|
||||
controller.$el.slideDown duration:Duration.normal
|
||||
index++
|
||||
|
||||
while @_controllers.length > @model.modVersions.length
|
||||
while @_controllers.length > modVersions.length
|
||||
controller = @_controllers.pop()
|
||||
controller.$el.slideUp duration:Duration.normal, complete:-> controller.$el.remove()
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ module.exports = class StackController extends BaseController
|
||||
super
|
||||
|
||||
refresh: ->
|
||||
display = @modPack.findItemDisplay @model.itemSlug
|
||||
display = @modPack.findItemDisplay @model.slug
|
||||
|
||||
@$nameField.html display.itemName
|
||||
@$quantityField.html @model.quantity
|
||||
|
||||
Reference in New Issue
Block a user