codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-05-03 17:33:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed two bugs with the CLA.

Browse source
This commit is contained in:
Nick Winter 2014-01-05 15:07:30 -08:00
parent b4b8d95424
commit 1185731fd0
2 changed files with 6 additions and 6 deletions
app
templates
cla.jade
views/kinds
CocoView.coffee

2
app/templates/cla.jade
View file

@ -82,7 +82,7 @@
hr hr
if me.get('anonymous') if me.get('anonymous')
p h1
| Either | Either
a(data-toggle="coco-modal", data-target="modal/signup", data-i18n="nav.sign_up") create an account a(data-toggle="coco-modal", data-target="modal/signup", data-i18n="nav.sign_up") create an account
| or | or

10
app/views/kinds/CocoView.coffee
View file

@ -57,7 +57,7 @@ module.exports = class CocoView extends Backbone.View
@hidden = false @hidden = false
@listenToShortcuts() @listenToShortcuts()
view.didReappear() for id, view of @subviews view.didReappear() for id, view of @subviews
# View Rendering # View Rendering
render: => render: =>
@ -86,7 +86,7 @@ module.exports = class CocoView extends Backbone.View
# Modals # Modals
toggleModal: (e) -> toggleModal: (e) ->
if $(event.currentTarget).prop('target') is '_blank' if $(e.currentTarget).prop('target') is '_blank'
return true 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. # 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) elem = $(e.target)
@ -133,7 +133,7 @@ module.exports = class CocoView extends Backbone.View
visibleModal.$el.addClass('hide') visibleModal.$el.addClass('hide')
waitingModal = null waitingModal = null
@modalClosed() @modalClosed()
# Loading RootViews # Loading RootViews
showLoading: ($el=@$el) -> showLoading: ($el=@$el) ->
@ -148,7 +148,7 @@ module.exports = class CocoView extends Backbone.View
@_lastLoading.find('.loading-screen').remove() @_lastLoading.find('.loading-screen').remove()
@_lastLoading.find('>').removeClass('hide') @_lastLoading.find('>').removeClass('hide')
@_lastLoading = null @_lastLoading = null
# Loading ModalViews # Loading ModalViews
enableModalInProgress: (modal) -> 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) 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 # Subviews
insertSubView: (view) -> insertSubView: (view) ->
@subviews[view.id].destroy() if view.id of @subviews @subviews[view.id].destroy() if view.id of @subviews
@$el.find('#'+view.id).after(view.el).remove() @$el.find('#'+view.id).after(view.el).remove()