Fix a bunch of internal links to avoid reloading

This commit is contained in:
Andrew Miner
2015-03-01 16:38:12 -08:00
parent d4e7cc6a39
commit c31e511080
7 changed files with 14 additions and 14 deletions
@@ -67,7 +67,7 @@ module.exports = class FeedbackController extends BaseController
if @isOpen if @isOpen
@$screen.css display:'none' @$screen.css display:'none'
@$el.animate {left:-@$el.outerWidth()}, duration:Duration.normal, complete:=> @$el.animate {left:-@$el.outerWidth()}, duration:Duration.fast, complete:=>
@$commentField.val '' @$commentField.val ''
@$('input, textarea').blur() @$('input, textarea').blur()
resolve() resolve()
@@ -75,7 +75,7 @@ module.exports = class FeedbackController extends BaseController
@$screen.on 'click', => @onToggle() @$screen.on 'click', => @onToggle()
@$screen.css display:'block' @$screen.css display:'block'
@$el.animate {left:0}, duration:Duration.normal, complete:=> @$el.animate {left:0}, duration:Duration.fast, complete:=>
if @$nameField.val().length is 0 if @$nameField.val().length is 0
@$nameField.focus() @$nameField.focus()
else if @$emailField.val().length is 0 else if @$emailField.val().length is 0
@@ -19,4 +19,4 @@ module.exports = class HomeController extends PageController
events: -> events: ->
return _.extend super, return _.extend super,
'click .mainBody a': 'routeLinkClick' 'click a': 'routeLinkClick'
@@ -31,8 +31,8 @@ module.exports = class ItemPageController extends PageController
super options super options
@imageLoader = options.imageLoader @imageLoader = options.imageLoader
@_itemSlug = options.itemSlug
@modPack = options.modPack @modPack = options.modPack
@_itemSlug = options.itemSlug
@modPack.on Event.change, => @tryRefresh() @modPack.on Event.change, => @tryRefresh()
@@ -40,4 +40,4 @@ module.exports = class ModController extends BaseController
events: -> events: ->
return _.extend super, return _.extend super,
'click a', 'routeLinkClick' 'click a': 'routeLinkClick'
+1 -1
View File
@@ -115,7 +115,7 @@ module.exports = class CraftingGuideRouter extends Backbone.Router
@_setPage 'crafting', controller @_setPage 'crafting', controller
deprecated__item: (itemSlug)-> deprecated__item: (itemSlug)->
controller = new ItemPageController _.extend {itemSlug:itemSlug}, @_defaultOptions controller = new ItemPageController _.extend {itemSlug:ItemSlug.slugify(itemSlug)}, @_defaultOptions
@_setPage 'item', controller @_setPage 'item', controller
deprecated__modItem: (modSlug, itemSlug)-> deprecated__modItem: (modSlug, itemSlug)->
+1 -1
View File
@@ -24,7 +24,7 @@ global.logger = new Logger
switch window.location.hostname switch window.location.hostname
when 'localhost' when 'localhost'
global.env = 'development' global.env = 'development'
logger.level = Logger.INFO logger.level = Logger.DEBUG
when 'new.crafting-guide.com' when 'new.crafting-guide.com'
global.env = 'staging' global.env = 'staging'
logger.level = Logger.VERBOSE logger.level = Logger.VERBOSE
+7 -7
View File
@@ -8,12 +8,12 @@
.view__home_page .view__home_page
.sidebar .sidebar
.titleImage <a href="/browse/minecraft"><img src="/data/minecraft/logo.png"></a> .titleImage <a href="/browse/minecraft"><img src="/data/minecraft/logo.png"></a>
.titleImage: img(src='/data/buildcraft/logo.png') .titleImage <a href="/browse/buildcraft"><img src="/data/buildcraft/logo.png"></a>
.titleImage: img(src='/data/industrial_craft_2/logo.png') .titleImage <a href="/browse/industrial_craft_2"><img src="/data/industrial_craft_2/logo.png"></a>
.titleImage: img(src='/data/applied_energistics_2/logo.png') .titleImage <a href="/browse/applied_energistics_2"><img src="/data/applied_energistics_2/logo.png"></a>
.titleImage: img(src='/data/thermal_expansion/logo.png') .titleImage <a href="/browse/thermal_expansion"><img src="/data/thermal_expansion/logo.png"></a>
.titleImage: img(src='/data/enderio/logo.png') .titleImage <a href="/browse/enderio"><img src="/data/enderio/logo.png"></a>
.titleImage: img(src='/data/railcraft/logo.png') .titleImage <a href="/browse/railcraft"><img src="/data/railcraft/logo.png"></a>
.mainBody .mainBody
.section .section
@@ -22,7 +22,7 @@
.entry .entry
p.intro. p.intro.
Crafting Guide is the ultimate resource for Minecraft. Whether you're punching trees or building Crafting Guide is the ultimate resource for Minecraft. Whether you're punching trees or building
reactors, you'll find everything you need right here. reactors, you'll find Crafting Guide indispensable.
ul ul
li.intro Can't remember the recipe for a <a href="/browse/buildcraft/quarry">BuildCraft Quarry</a>? li.intro Can't remember the recipe for a <a href="/browse/buildcraft/quarry">BuildCraft Quarry</a>?
li.intro Curious to see all the blocks added by <a href="/browse/railcraft">Railcraft</a>? li.intro Curious to see all the blocks added by <a href="/browse/railcraft">Railcraft</a>?