summaryrefslogtreecommitdiffstats
path: root/client/components/mixins
diff options
context:
space:
mode:
authorMaxime Quandalle <maxime@quandalle.com>2015-09-03 23:12:46 +0200
committerMaxime Quandalle <maxime@quandalle.com>2015-09-03 23:12:46 +0200
commitb3851817ecd59b039f2c2228d08a1c6fd8e60d60 (patch)
tree82a50f69788d5c20632f3ec9c7d3e136502b93b4 /client/components/mixins
parent039cfe7edf8faf901069a94b3ca9b66f7973b26a (diff)
downloadwekan-b3851817ecd59b039f2c2228d08a1c6fd8e60d60.tar.gz
wekan-b3851817ecd59b039f2c2228d08a1c6fd8e60d60.tar.bz2
wekan-b3851817ecd59b039f2c2228d08a1c6fd8e60d60.zip
Enforce a consistent ES6 coding style
Replace the old (and broken) jshint + jscsrc by eslint and configure it to support some of the ES6 features. The command `eslint` currently has one error which is a bug that was discovered by its static analysis and should be fixed (usage of a dead object).
Diffstat (limited to 'client/components/mixins')
-rw-r--r--client/components/mixins/infiniteScrolling.js24
-rw-r--r--client/components/mixins/perfectScrollbar.js12
2 files changed, 17 insertions, 19 deletions
diff --git a/client/components/mixins/infiniteScrolling.js b/client/components/mixins/infiniteScrolling.js
index df3b8901..0afb33f9 100644
--- a/client/components/mixins/infiniteScrolling.js
+++ b/client/components/mixins/infiniteScrolling.js
@@ -1,37 +1,37 @@
-var peakAnticipation = 200;
+const peakAnticipation = 200;
Mixins.InfiniteScrolling = BlazeComponent.extendComponent({
- onCreated: function() {
+ onCreated() {
this._nextPeak = Infinity;
},
- setNextPeak: function(v) {
+ setNextPeak(v) {
this._nextPeak = v;
},
- getNextPeak: function() {
+ getNextPeak() {
return this._nextPeak;
},
- resetNextPeak: function() {
+ resetNextPeak() {
this._nextPeak = Infinity;
},
// To be overwritten by consumers of this mixin
- reachNextPeak: function() {
+ reachNextPeak() {
},
- events: function() {
+ events() {
return [{
- scroll: function(evt) {
- var domElement = evt.currentTarget;
- var altitude = domElement.scrollTop + domElement.offsetHeight;
+ scroll(evt) {
+ const domElement = evt.currentTarget;
+ let altitude = domElement.scrollTop + domElement.offsetHeight;
altitude += peakAnticipation;
if (altitude >= this.callFirstWith(null, 'getNextPeak')) {
this.callFirstWith(null, 'reachNextPeak');
}
- }
+ },
}];
- }
+ },
});
diff --git a/client/components/mixins/perfectScrollbar.js b/client/components/mixins/perfectScrollbar.js
index 510a4563..f652f043 100644
--- a/client/components/mixins/perfectScrollbar.js
+++ b/client/components/mixins/perfectScrollbar.js
@@ -1,14 +1,12 @@
Mixins.PerfectScrollbar = BlazeComponent.extendComponent({
- onRendered: function() {
- var component = this.mixinParent();
- var domElement = component.find('.js-perfect-scrollbar');
+ onRendered() {
+ const component = this.mixinParent();
+ const domElement = component.find('.js-perfect-scrollbar');
Ps.initialize(domElement);
// XXX We should create an event map to be consistent with other components
// but since BlazeComponent doesn't merge Mixins events transparently I
// prefered to use a jQuery event (which is what an event map ends up doing)
- component.$(domElement).on('mouseenter', function() {
- Ps.update(domElement);
- });
- }
+ component.$(domElement).on('mouseenter', () => Ps.update(domElement));
+ },
});