bug: popovers where being attached to ".main-avatar" which was changed

to ".main-herobox" in the redesign
This commit is contained in:
Tyler Renelle 2013-03-26 12:54:34 -07:00
parent 124409bfc5
commit 77e696554a
3 changed files with 9 additions and 9 deletions

View file

@ -114,7 +114,7 @@ setupTour = (model) ->
} }
] ]
$('.main-avatar').popover('destroy') #remove previous popovers $('.main-herobox').popover('destroy') #remove previous popovers
tour = new Tour() tour = new Tour()
_.each tourSteps, (step) -> _.each tourSteps, (step) ->
tour.addStep _.defaults step, {html:true} tour.addStep _.defaults step, {html:true}

View file

@ -92,17 +92,17 @@ module.exports.app = (appExports, model) ->
user.on 'set', 'flags.customizationsNotification', (captures, args) -> user.on 'set', 'flags.customizationsNotification', (captures, args) ->
return unless captures == true return unless captures == true
$('.main-avatar').popover('destroy') #remove previous popovers $('.main-herobox').popover('destroy') #remove previous popovers
html = """ html = """
Click your avatar to customize your appearance. <a href='#' onClick="$('.main-avatar').popover('hide');return false;">[Close]</a> Click your avatar to customize your appearance. <a href='#' onClick="$('.main-herobox').popover('hide');return false;">[Close]</a>
""" """
$('.main-avatar').popover $('.main-herobox').popover
title: "Customize Your Avatar" title: "Customize Your Avatar"
placement: 'bottom' placement: 'bottom'
trigger: 'manual' trigger: 'manual'
html: true html: true
content: html content: html
$('.main-avatar').popover 'show' $('.main-herobox').popover 'show'
userSchema = userSchema =

View file

@ -72,21 +72,21 @@ module.exports.app = (appExports, model) ->
user = model.at('_user') user = model.at('_user')
unlockPartiesNotification = -> unlockPartiesNotification = ->
$('.main-avatar').popover('destroy') #remove previous popovers $('.main-herobox').popover('destroy') #remove previous popovers
html = """ html = """
<div class='party-system-popover'> <div class='party-system-popover'>
<img src='/img/party-unlocked.png' style='float:right;padding:5px;' /> <img src='/img/party-unlocked.png' style='float:right;padding:5px;' />
Congratulations, you have unlocked the Party System! You can now group with your friends by adding their User Ids. Congratulations, you have unlocked the Party System! You can now group with your friends by adding their User Ids.
<a href='#' onClick="$('.main-avatar').popover('hide');return false;">[Close]</a> <a href='#' onClick="$('.main-herobox').popover('hide');return false;">[Close]</a>
</div> </div>
""" """
$('.main-avatar').popover $('.main-herobox').popover
title: "Party System Unlocked" title: "Party System Unlocked"
placement: 'bottom' placement: 'bottom'
trigger: 'manual' trigger: 'manual'
html: true html: true
content: html content: html
$('.main-avatar').popover 'show' $('.main-herobox').popover 'show'
appExports.manuallyUnlockParties = -> appExports.manuallyUnlockParties = ->
$("#settings-modal").modal("hide") $("#settings-modal").modal("hide")