diff --git a/src/coffee/controllers/adsense_controller.coffee b/src/coffee/controllers/adsense_controller.coffee index 40cba734c..2e8a59e83 100644 --- a/src/coffee/controllers/adsense_controller.coffee +++ b/src/coffee/controllers/adsense_controller.coffee @@ -13,8 +13,9 @@ BaseController = require './base_controller' module.exports = class AdsenseController extends BaseController constructor: (options={})-> - options.model ?= 'skyscraper_sidebar' - options.templateName = "adsense_#{options.model}" + options.model ?= 'skyscraper_sidebar' + options.tagName = 'ins' + options.templateName = "adsense_#{options.model}" super options @_adsEnabled = global.env in ProductionEnvs diff --git a/src/coffee/controllers/inventory_table_controller.coffee b/src/coffee/controllers/inventory_table_controller.coffee index a0e28abff..16005cdf8 100644 --- a/src/coffee/controllers/inventory_table_controller.coffee +++ b/src/coffee/controllers/inventory_table_controller.coffee @@ -118,14 +118,17 @@ module.exports = class InventoryTableController extends BaseController super refresh: -> - @$editPanel.css display:(if @editable then 'table-row' else 'none') - @$toolbar.css display:(if @editable then 'block' else 'none') - @$scrollbox.css bottom:(if @editable then @$toolbar.height() else '0') + if @editable + @show @$editPanel + @show @$toolbar, => + @$scrollbox.css bottom:@$toolbar.height() + else + @hide @$editPanel + @hide @$toolbar + @$scrollbox.css bottom:0 if _.isEmpty(@$quantityField.val()) then @$quantityField.val '1' - @$table.find('tr:not(:last-child)').remove() - @_refreshNameAutocomplete() @_refreshButtonState() @_refreshStacks() diff --git a/src/coffee/controllers/item_page_controller.coffee b/src/coffee/controllers/item_page_controller.coffee index 178e8e4ed..cf68ce113 100644 --- a/src/coffee/controllers/item_page_controller.coffee +++ b/src/coffee/controllers/item_page_controller.coffee @@ -43,7 +43,6 @@ module.exports = class ItemPageController extends PageController craftingPlanButtonClicked: -> display = @modPack.findItemDisplay @model.item.slug - logger.debug "button clicked, going to: #{display.craftingUrl}" router.navigate display.craftingUrl, trigger:true return false diff --git a/src/coffee/controllers/mod_page_controller.coffee b/src/coffee/controllers/mod_page_controller.coffee index 1d43805e5..924923b45 100644 --- a/src/coffee/controllers/mod_page_controller.coffee +++ b/src/coffee/controllers/mod_page_controller.coffee @@ -170,24 +170,26 @@ module.exports = class ModPageController extends PageController @show @$tutorialsSection else - @hide @tutorialsSection + @hide @$tutorialsSection _refreshVersions: -> @$versionSelector.empty() - return unless @model? - @$versionSelector.removeClass 'hiding' + if @model? + effectiveModVersion = @effectiveModVersion + versionCount = 0 + @model.eachModVersion (modVersion)=> + option = $("") + if modVersion is effectiveModVersion + option.attr 'selected', 'selected' + @$versionSelector.append option + versionCount++ - effectiveModVersion = @effectiveModVersion - versionCount = 0 - @model.eachModVersion (modVersion)=> - option = $("") - if modVersion is effectiveModVersion - option.attr 'selected', 'selected' - @$versionSelector.append option - versionCount++ + if versionCount <= 1 + @$versionSelector.attr 'disabled', 'disabled' + else + @$versionSelector.removeAttr 'disabled' - if versionCount <= 1 - @$versionSelector.attr 'disabled', 'disabled' + @show @$versionSelector else - @$versionSelector.removeAttr 'disabled' + @hide @$versionSelector diff --git a/src/coffee/crafting_guide_router.coffee b/src/coffee/crafting_guide_router.coffee index 01c702e3f..01dbccdcd 100644 --- a/src/coffee/crafting_guide_router.coffee +++ b/src/coffee/crafting_guide_router.coffee @@ -164,9 +164,8 @@ module.exports = class CraftingGuideRouter extends Backbone.Router showDuration = Duration.normal switchToNextController = (event)=> - logger.debug "show called: #{event}" - @_resetGlobals() @_controller.unrender() if @_controller? + @_resetGlobals() @_page = page @_controller = controller diff --git a/src/jade/templates/browse_page.jade b/src/jade/templates/browse_page.jade index 906c23f82..8f5fd4b52 100644 --- a/src/jade/templates/browse_page.jade +++ b/src/jade/templates/browse_page.jade @@ -7,7 +7,7 @@ .view__browse_page .sidebar - .view__adsense + ins.view__adsense .mainBody h2: p Active Mods diff --git a/src/jade/templates/configure_page.jade b/src/jade/templates/configure_page.jade index 4c4485eaf..477c0a3b4 100644 --- a/src/jade/templates/configure_page.jade +++ b/src/jade/templates/configure_page.jade @@ -7,7 +7,7 @@ .view__configure_page .sidebar - .view__adsense + ins.view__adsense .mainBody .view__mod_pack diff --git a/src/jade/templates/home_page.jade b/src/jade/templates/home_page.jade index e9578e0f9..ef69bbec2 100644 --- a/src/jade/templates/home_page.jade +++ b/src/jade/templates/home_page.jade @@ -7,7 +7,7 @@ .view__home_page .sidebar - .view__adsense + ins.view__adsense .titleImage .titleImage diff --git a/src/jade/templates/inventory_table.jade b/src/jade/templates/inventory_table.jade index e4753d6c6..9039261fc 100644 --- a/src/jade/templates/inventory_table.jade +++ b/src/jade/templates/inventory_table.jade @@ -7,10 +7,10 @@ .view__inventory_table table - tr.edit + tr.edit.hideable.hidden td.quantity: input(name="quantity") td.icon: img(src="/images/unknown.png") td.name(width="*"): input(name="name") td.action: button(name="add") add - .toolbar + .toolbar.hideable.hidden button(name="clear") clear diff --git a/src/jade/templates/item_page.jade b/src/jade/templates/item_page.jade index 926336450..567c21876 100644 --- a/src/jade/templates/item_page.jade +++ b/src/jade/templates/item_page.jade @@ -12,7 +12,7 @@ button.large.craftingPlan See Crafting Plan - .view__adsense + ins.view__adsense .mainBody h1.name diff --git a/src/jade/templates/mod_page.jade b/src/jade/templates/mod_page.jade index 2af6057cf..dbaf8fcea 100644 --- a/src/jade/templates/mod_page.jade +++ b/src/jade/templates/mod_page.jade @@ -13,7 +13,7 @@ a.documentation.externalLink.hideable.hidden(target="new"): p Documentation a.download.externalLink.hideable.hidden(target="new"): p Download - .view__adsense + ins.view__adsense .mainBody h1.name diff --git a/src/jade/templates/tutorial_page.jade b/src/jade/templates/tutorial_page.jade index 059a7a9b4..081a16fa0 100644 --- a/src/jade/templates/tutorial_page.jade +++ b/src/jade/templates/tutorial_page.jade @@ -10,7 +10,7 @@ .titleImage: a: img a.officialPage.externalLink.hideable.hidden(target="new"): p Offical Documentation - .view__adsense + ins.view__adsense .mainBody h1.name