From 230f6d6d62db0815b47baeadf1f1f04656c24905 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Fri, 9 Oct 2015 23:40:24 +0200
Subject: [PATCH] Fix hovercard view console error

closes #6480
---
 Changelog.md                                       |  1 +
 app/assets/javascripts/app/views/hovercard_view.js |  1 +
 spec/javascripts/app/views/hovercard_view_spec.js  | 11 +++++++++++
 3 files changed, 13 insertions(+)
 create mode 100644 spec/javascripts/app/views/hovercard_view_spec.js

diff --git a/Changelog.md b/Changelog.md
index 1b9b9b978..4a7b3fe6e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@
 * Normalize new followed tags and insert them alphabetically [#6454](https://github.com/diaspora/diaspora/pull/6454)
 * Add avatar fallback for notification dropdown [#6463](https://github.com/diaspora/diaspora/pull/6463)
 * Improve handling of j/k hotkeys [#6462](https://github.com/diaspora/diaspora/pull/6462)
+* Fix JS error caused by hovercards [6480](https://github.com/diaspora/diaspora/pull/6480)
 
 ## Features
 * Show spinner on initial stream load [#6384](https://github.com/diaspora/diaspora/pull/6384)
diff --git a/app/assets/javascripts/app/views/hovercard_view.js b/app/assets/javascripts/app/views/hovercard_view.js
index 1d070096e..643fb771c 100644
--- a/app/assets/javascripts/app/views/hovercard_view.js
+++ b/app/assets/javascripts/app/views/hovercard_view.js
@@ -147,6 +147,7 @@ app.views.Hovercard = app.views.Base.extend({
   },
 
   mouseIsOverElement: function(element, event) {
+    if(!element) { return false; }
     var elPos = element.offset();
     return event.pageX >= elPos.left &&
       event.pageX <= elPos.left + element.width() &&
diff --git a/spec/javascripts/app/views/hovercard_view_spec.js b/spec/javascripts/app/views/hovercard_view_spec.js
new file mode 100644
index 000000000..a003e24b2
--- /dev/null
+++ b/spec/javascripts/app/views/hovercard_view_spec.js
@@ -0,0 +1,11 @@
+describe("app.views.Hovercard", function() {
+  beforeEach(function() {
+    this.view = new app.views.Hovercard();
+  });
+
+  describe("mouseIsOverElement", function() {
+    it("returns false if the element is undefined", function() {
+      expect(this.view.mouseIsOverElement(undefined, $.Event())).toBeFalsy();
+    });
+  });
+});