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

Merge branch 'release/0.5.0.0-RC' into develop

Browse source
This commit is contained in:
Jonne Haß 2015-04-21 22:02:28 +02:00
commit 61c890f274
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Changelog.md
View file

@ -164,7 +164,7 @@ diaspora* no longer adds a `div.container` to wrap custom splash pages. This add
* Disable email notifications for closed user accounts [#5640](https://github.com/diaspora/diaspora/pull/5640) * Disable email notifications for closed user accounts [#5640](https://github.com/diaspora/diaspora/pull/5640)
* Total user statistic no longer includes closed accounts [#5041](https://github.com/diaspora/diaspora/pull/5041) * Total user statistic no longer includes closed accounts [#5041](https://github.com/diaspora/diaspora/pull/5041)
* Don't add a space when rendering a mention [#5711](https://github.com/diaspora/diaspora/pull/5711) * Don't add a space when rendering a mention [#5711](https://github.com/diaspora/diaspora/pull/5711)
* Fix flickering hovercards [#5714](https://github.com/diaspora/diaspora/pull/5714) * Fix flickering hovercards [#5714](https://github.com/diaspora/diaspora/pull/5714) [#5876](https://github.com/diaspora/diaspora/pull/5876)
* Improved stripping markdown in post titles [#5730](https://github.com/diaspora/diaspora/pull/5730) * Improved stripping markdown in post titles [#5730](https://github.com/diaspora/diaspora/pull/5730)
* Remove border from reply form for conversations [#5744](https://github.com/diaspora/diaspora/pull/5744) * Remove border from reply form for conversations [#5744](https://github.com/diaspora/diaspora/pull/5744)
* Fix overflow for headings, blockquotes and other elements [#5731](https://github.com/diaspora/diaspora/pull/5731) * Fix overflow for headings, blockquotes and other elements [#5731](https://github.com/diaspora/diaspora/pull/5731)

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

@ -15,7 +15,7 @@ app.views.Hovercard = app.views.Base.extend({
.on('mouseenter', '.hovercardable', _.bind(this._mouseenterHandler, this)) .on('mouseenter', '.hovercardable', _.bind(this._mouseenterHandler, this))
.on('mouseleave', '.hovercardable', _.bind(this._mouseleaveHandler, this)); .on('mouseleave', '.hovercardable', _.bind(this._mouseleaveHandler, this));
this.show_me = false; this.showMe = false;
this.parent = null; // current 'hovercardable' element that caused HC to appear this.parent = null; // current 'hovercardable' element that caused HC to appear
// cache some element references // cache some element references
@ -54,19 +54,19 @@ app.views.Hovercard = app.views.Base.extend({
return false; return false;
} }
this.show_me = true; this.showMe = true;
this.showHovercardOn(el); this.showHovercardOn(el);
return false; return false;
}, },
_mouseleaveHandler: function(event) { _mouseleaveHandler: function(event) {
this.showMe = false;
if( this.active === false || if( this.active === false ||
$.contains(this.el, event.relatedTarget) ) { return false; } $.contains(this.el, event.relatedTarget) ) { return false; }
if( this.mouseIsOverElement(this.parent, event) || if( this.mouseIsOverElement(this.parent, event) ||
this.mouseIsOverElement(this.$el, event) ) { return false; } this.mouseIsOverElement(this.$el, event) ) { return false; }
this.show_me = false;
if( this.$el.is(':visible') ) { if( this.$el.is(':visible') ) {
this.$el.fadeOut('fast'); this.$el.fadeOut('fast');
} else { } else {
@ -81,7 +81,7 @@ app.views.Hovercard = app.views.Base.extend({
var el = $(element); var el = $(element);
var hc = this.$el; var hc = this.$el;
if( !this.show_me ) { if( !this.showMe ) {
// mouse has left element // mouse has left element
return; return;
} }
@ -103,6 +103,10 @@ app.views.Hovercard = app.views.Base.extend({
} }
self._populateHovercardWith(person); self._populateHovercardWith(person);
if( !self.showMe ) {
// mouse has left element
return;
}
self.$el.fadeIn('fast'); self.$el.fadeIn('fast');
}); });
}, },
@ -143,11 +147,11 @@ app.views.Hovercard = app.views.Base.extend({
}, },
mouseIsOverElement: function(element, event) { mouseIsOverElement: function(element, event) {
var el_pos = element.offset(); var elPos = element.offset();
return event.pageX >= el_pos.left && return event.pageX >= elPos.left &&
event.pageX <= el_pos.left + element.width() && event.pageX <= elPos.left + element.width() &&
event.pageY >= el_pos.top && event.pageY >= elPos.top &&
event.pageY <= el_pos.top + element.height(); event.pageY <= elPos.top + element.height();
}, },
}); });
// @license-end // @license-end