Bug fixes

akhodakivskiy · Mar 3, 2014 · d4ad99a · d4ad99a
1 parent 1913470
commit d4ad99a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/extension/packages/mode-hints/mode-hints.coffee b/extension/packages/mode-hints/mode-hints.coffee
@@ -6,11 +6,11 @@ hints = require 'mode-hints/hints'
 exports.mode_hints =
   onEnter: (vim, storage, callback) ->
     markers = hints.injectHints(vim.window.document)
-    if markers.length == 0
-      vim.enterMode('normal')
-    else
+    if markers?.length > 0
       storage.markers  = markers
       storage.callback = callback
+    else
+      vim.enterMode('normal')
 
   onLeave: (vim, storage) ->
     hints.removeHints(vim.window.document)

diff --git a/extension/packages/utils.coffee b/extension/packages/utils.coffee
@@ -68,7 +68,7 @@ blurActiveElement = (window) ->
   # really needed? What if a website has made more elements focusable -- shouldn't those also be
   # blurred?
   { activeElement } = window.document
-  if isElementEditable(activeElement)
+  if activeElement and isElementEditable(activeElement)
     activeElement.blur()
 
 isTextInputElement = (element) ->
@@ -89,10 +89,10 @@ isElementEditable = (element) ->
 isElementVisible = (element) ->
   document = element.ownerDocument
   window   = document.defaultView
-  computedStyle = window.getComputedStyle(element, null)
-  return computedStyle.getPropertyValue('visibility') == 'visible' and \
-    computedStyle.getPropertyValue('display') != 'none' and \
-    computedStyle.getPropertyValue('opacity') != '0'
+  if computedStyle = window.getComputedStyle(element, null)
+    return computedStyle.getPropertyValue('visibility') == 'visible' and \
+      computedStyle.getPropertyValue('display') != 'none' and \
+      computedStyle.getPropertyValue('opacity') != '0'
 
 getWindowId = (window) ->
   return window