🐛 Check for null lastActiveElement

Check for a null lastActiveElement before attempting to focus it. This fixes #1.
jeremyramin · Sep 9, 2015 · ea7431b · ea7431b
1 parent 817068e
commit ea7431b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,3 +10,4 @@
 
 ### v0.1.3 - Patch
 * Add more features to README.md
+* Fix issue #1
diff --git a/lib/view.coffee b/lib/view.coffee
@@ -168,14 +168,14 @@ class TerminalPlusView extends View
 
   open: =>
     lastActiveElement ?= $(document.activeElement)
-    @panel.show()
 
     if lastOpenedView and lastOpenedView != this
       lastOpenedView.hide()
     lastOpenedView = this
     @statusBar.setActiveTerminalView this
     @statusIcon.activate()
 
+    @panel.show()
     @xterm.height 0
     @animating = true
     @xterm.height if @maximized then @maxHeight else @prevHeight
@@ -199,8 +199,9 @@ class TerminalPlusView extends View
     @onTransitionEnd =>
       @panel.hide()
       unless lastOpenedView?
-        lastActiveElement.focus()
-        lastActiveElement = null
+        if lastActiveElement?
+          lastActiveElement.focus()
+          lastActiveElement = null
 
   toggle: ->
     return if @animating
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,4 @@

		### v0.1.3 - Patch
		* Add more features to README.md
		* Fix issue #1