Merge branch 'master' into api/docs

This commit is contained in:
Garen Torikian
2013-04-14 09:43:06 -07:00
28 changed files with 216 additions and 93 deletions

View File

@@ -1057,11 +1057,11 @@ class Editor extends View
remove: (selector, keepData) ->
return super if keepData or @removed
@trigger 'editor:will-be-removed'
super
rootView?.focus()
beforeRemove: ->
@trigger 'editor:will-be-removed'
@removed = true
@activeEditSession?.destroy()
$(window).off(".editor-#{@id}")