nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Dennis Schubert 2015-10-10 06:45:15 +02:00
commit aab21be09d
3 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -91,6 +91,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
* Normalize new followed tags and insert them alphabetically [#6454](https://github.com/diaspora/diaspora/pull/6454) * 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) * 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) * 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 ## Features
* Show spinner on initial stream load [#6384](https://github.com/diaspora/diaspora/pull/6384) * Show spinner on initial stream load [#6384](https://github.com/diaspora/diaspora/pull/6384)

1
app/assets/javascripts/app/views/hovercard_view.js
View file

@ -147,6 +147,7 @@ app.views.Hovercard = app.views.Base.extend({
}, },
mouseIsOverElement: function(element, event) { mouseIsOverElement: function(element, event) {
if(!element) { return false; }
var elPos = element.offset(); var elPos = element.offset();
return event.pageX >= elPos.left && return event.pageX >= elPos.left &&
event.pageX <= elPos.left + element.width() && event.pageX <= elPos.left + element.width() &&

11
spec/javascripts/app/views/hovercard_view_spec.js Normal file
View file

@ -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();
});
});
});