mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2025-04-26 22:13:32 -04:00
Fixed two bugs with the CLA.
This commit is contained in:
parent
b4b8d95424
commit
1185731fd0
2 changed files with 6 additions and 6 deletions
app
|
@ -82,7 +82,7 @@
|
|||
hr
|
||||
|
||||
if me.get('anonymous')
|
||||
p
|
||||
h1
|
||||
| Either
|
||||
a(data-toggle="coco-modal", data-target="modal/signup", data-i18n="nav.sign_up") create an account
|
||||
| or
|
||||
|
|
|
@ -57,7 +57,7 @@ module.exports = class CocoView extends Backbone.View
|
|||
@hidden = false
|
||||
@listenToShortcuts()
|
||||
view.didReappear() for id, view of @subviews
|
||||
|
||||
|
||||
# View Rendering
|
||||
|
||||
render: =>
|
||||
|
@ -86,7 +86,7 @@ module.exports = class CocoView extends Backbone.View
|
|||
# Modals
|
||||
|
||||
toggleModal: (e) ->
|
||||
if $(event.currentTarget).prop('target') is '_blank'
|
||||
if $(e.currentTarget).prop('target') is '_blank'
|
||||
return true
|
||||
# special handler for opening modals that are dynamically loaded, rather than static in the page. It works (or should work) like Bootstrap's modals, except use coco-modal for the data-toggle value.
|
||||
elem = $(e.target)
|
||||
|
@ -133,7 +133,7 @@ module.exports = class CocoView extends Backbone.View
|
|||
visibleModal.$el.addClass('hide')
|
||||
waitingModal = null
|
||||
@modalClosed()
|
||||
|
||||
|
||||
# Loading RootViews
|
||||
|
||||
showLoading: ($el=@$el) ->
|
||||
|
@ -148,7 +148,7 @@ module.exports = class CocoView extends Backbone.View
|
|||
@_lastLoading.find('.loading-screen').remove()
|
||||
@_lastLoading.find('>').removeClass('hide')
|
||||
@_lastLoading = null
|
||||
|
||||
|
||||
# Loading ModalViews
|
||||
|
||||
enableModalInProgress: (modal) ->
|
||||
|
@ -194,7 +194,7 @@ module.exports = class CocoView extends Backbone.View
|
|||
return (tag is 'textarea' or (tag is 'input' and type in textInputTypes) or el.contentEditable in ["", "true"]) and not (el.readOnly or el.disabled)
|
||||
|
||||
# Subviews
|
||||
|
||||
|
||||
insertSubView: (view) ->
|
||||
@subviews[view.id].destroy() if view.id of @subviews
|
||||
@$el.find('#'+view.id).after(view.el).remove()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue