diff --git a/src/data/buildcraft/logo.png b/src/data/buildcraft/logo.png index 93cd42219..755209342 100644 Binary files a/src/data/buildcraft/logo.png and b/src/data/buildcraft/logo.png differ diff --git a/src/data/minecraft/logo.png b/src/data/minecraft/logo.png new file mode 100644 index 000000000..ac10dbd1e Binary files /dev/null and b/src/data/minecraft/logo.png differ diff --git a/src/data/thermal_expansion/logo.png b/src/data/thermal_expansion/logo.png new file mode 100644 index 000000000..7a201f0dc Binary files /dev/null and b/src/data/thermal_expansion/logo.png differ diff --git a/src/scripts/controllers/crafting_grid_controller.coffee b/src/scripts/controllers/crafting_grid_controller.coffee index 1da151cc3..9b2b70ad6 100644 --- a/src/scripts/controllers/crafting_grid_controller.coffee +++ b/src/scripts/controllers/crafting_grid_controller.coffee @@ -23,6 +23,13 @@ module.exports = class CraftingGridController extends BaseController @_modPack = options.modPack @_slotCount = 9 + # Event Methods ################################################################################ + + onLinkClicked: (event)-> + href = $(event.currentTarget).attr 'href' + router.navigate href, trigger:true + return false + # BaseController Methods ####################################################################### onDidRender: -> @@ -52,6 +59,11 @@ module.exports = class CraftingGridController extends BaseController @$el.tooltip show:{delay:Duration.slow, duration:Duration.fast} super + # Backbone.View Overrides ###################################################################### + + events: + 'click td a': 'onLinkClicked' + # Private Methods ############################################################################## _getItemDisplayAt: (slot)-> diff --git a/src/scripts/controllers/mod_page_controller.coffee b/src/scripts/controllers/mod_page_controller.coffee index f9112d5f1..368c45326 100644 --- a/src/scripts/controllers/mod_page_controller.coffee +++ b/src/scripts/controllers/mod_page_controller.coffee @@ -18,7 +18,7 @@ module.exports = class ModPageController extends BaseController constructor: (options={})-> if not options.modPack? then throw new Error 'options.modPack is required' - options.delayStep ?= 100 + options.delayStep ?= 10 options.templateName = 'mod_page' super options @@ -78,7 +78,7 @@ module.exports = class ModPageController extends BaseController @_itemControllers.push controller @$items.append controller.$el - controller.$el.slideDown duration:Duration.fast + controller.$el.fadeIn duration:Duration.fast _getEffectiveModVersion: -> return @_effectiveModVersion if @_effectiveModVersion? @@ -106,7 +106,7 @@ module.exports = class ModPageController extends BaseController controller = @_itemControllers[controllerIndex] if not controller? _.delay (=> @_createItemController item), delay - delay += @_delayStop + delay += @_delayStep else controller.model = item controllerIndex += 1 diff --git a/src/scripts/main.coffee b/src/scripts/main.coffee index b750be542..7ebbbebbb 100644 --- a/src/scripts/main.coffee +++ b/src/scripts/main.coffee @@ -24,7 +24,7 @@ global.logger = new Logger switch window.location.hostname when 'localhost' global.env = 'development' - logger.level = Logger.INFO + logger.level = Logger.DEBUG when 'new.crafting-guide.com' global.env = 'staging' logger.level = Logger.VERBOSE diff --git a/src/scripts/models/item_page.coffee b/src/scripts/models/item_page.coffee index e1c5aca06..92971a74f 100644 --- a/src/scripts/models/item_page.coffee +++ b/src/scripts/models/item_page.coffee @@ -30,8 +30,8 @@ module.exports = class ItemPage extends BaseModel _consumeParams: -> return unless @params? + @plan.want.clear() if not @params?.name? - @plan.want.clear() @params = null else item = @modPack.findItemByName @params.name