Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: removes self pattern from eyeline lib (#7796)

This commit is contained in:
Joffrey JAFFEUX 2019-06-24 10:58:59 +02:00 committed by GitHub
parent cea3a027f3
commit e064db35d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/assets/javascripts/discourse/lib/eyeline.js.es6
View File

@ -12,8 +12,7 @@ Eyeline.prototype.update = function() {
windowHeight = $(window).height(), windowHeight = $(window).height(),
docViewBottom = docViewTop + windowHeight, docViewBottom = docViewTop + windowHeight,
$elements = $(this.selector), $elements = $(this.selector),
bottomOffset = $elements.last().offset(), bottomOffset = $elements.last().offset();
self = this;
let atBottom = false; let atBottom = false;
if (bottomOffset) { if (bottomOffset) {
@ -21,7 +20,7 @@ Eyeline.prototype.update = function() {
bottomOffset.top <= docViewBottom && bottomOffset.top >= docViewTop; bottomOffset.top <= docViewBottom && bottomOffset.top >= docViewTop;
} }
return $elements.each(function(i, elem) { return $elements.each((i, elem) => {
const $elem = $(elem), const $elem = $(elem),
elemTop = $elem.offset().top, elemTop = $elem.offset().top,
elemBottom = elemTop + $elem.height(); elemBottom = elemTop + $elem.height();
@ -45,17 +44,17 @@ Eyeline.prototype.update = function() {
// If you hit the bottom we mark all the elements as seen. Otherwise, just the first one // If you hit the bottom we mark all the elements as seen. Otherwise, just the first one
if (!atBottom) { if (!atBottom) {
self.trigger("saw", { detail: $elem }); this.trigger("saw", { detail: $elem });
if (i === 0) { if (i === 0) {
self.trigger("sawTop", { detail: $elem }); this.trigger("sawTop", { detail: $elem });
} }
return false; return false;
} }
if (i === 0) { if (i === 0) {
self.trigger("sawTop", { detail: $elem }); this.trigger("sawTop", { detail: $elem });
} }
if (i === $elements.length - 1) { if (i === $elements.length - 1) {
return self.trigger("sawBottom", { detail: $elem }); return this.trigger("sawBottom", { detail: $elem });
} }
}); });
}; };
@ -65,10 +64,8 @@ Eyeline.prototype.flushRest = function() {
if (Ember.testing) { if (Ember.testing) {
return; return;
} }
const self = this;
$(this.selector).each(function(i, elem) { $(this.selector).each((i, elem) => this.trigger("saw", { detail: $(elem) }));
return self.trigger("saw", { detail: $(elem) });
});
}; };
RSVP.EventTarget.mixin(Eyeline.prototype); RSVP.EventTarget.mixin(Eyeline.prototype);