From 171ece8f8b238cea385cbc19441a44160d4d3e18 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Sun, 20 Nov 2016 01:27:03 -0600 Subject: rename activities.js to activities.js.es6 --- app/assets/javascripts/activities.js.es6 | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 app/assets/javascripts/activities.js.es6 (limited to 'app/assets/javascripts/activities.js.es6') diff --git a/app/assets/javascripts/activities.js.es6 b/app/assets/javascripts/activities.js.es6 new file mode 100644 index 00000000000..906a1a69d93 --- /dev/null +++ b/app/assets/javascripts/activities.js.es6 @@ -0,0 +1,37 @@ +/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-undef, quotes, no-var, padded-blocks, max-len */ +(function() { + this.Activities = (function() { + function Activities() { + Pager.init(20, true, false, this.updateTooltips); + $(".event-filter-link").on("click", (function(_this) { + return function(event) { + event.preventDefault(); + _this.toggleFilter($(event.currentTarget)); + return _this.reloadActivities(); + }; + })(this)); + } + + Activities.prototype.updateTooltips = function() { + gl.utils.localTimeAgo($('.js-timeago', '.content_list')); + }; + + Activities.prototype.reloadActivities = function() { + $(".content_list").html(''); + Pager.init(20, true, false, this.updateTooltips); + }; + + Activities.prototype.toggleFilter = function(sender) { + var filter = sender.attr("id").split("_")[0]; + + $('.event-filter .active').removeClass("active"); + Cookies.set("event_filter", filter); + + sender.closest('li').toggleClass("active"); + }; + + return Activities; + + })(); + +}).call(this); -- cgit v1.2.1 From ed88515d56f72ba9f77cac2a4dca121fd34f622f Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Sat, 19 Nov 2016 23:52:53 -0600 Subject: convert activities.js to es6 class syntax --- app/assets/javascripts/activities.js.es6 | 52 +++++++++++++++----------------- 1 file changed, 25 insertions(+), 27 deletions(-) (limited to 'app/assets/javascripts/activities.js.es6') diff --git a/app/assets/javascripts/activities.js.es6 b/app/assets/javascripts/activities.js.es6 index 906a1a69d93..da8a4a8f3a2 100644 --- a/app/assets/javascripts/activities.js.es6 +++ b/app/assets/javascripts/activities.js.es6 @@ -1,37 +1,35 @@ -/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-undef, quotes, no-var, padded-blocks, max-len */ -(function() { - this.Activities = (function() { - function Activities() { +/* eslint-disable no-param-reassign, class-methods-use-this */ +/* global Pager, Cookies */ + +((global) => { + class Activities { + constructor() { Pager.init(20, true, false, this.updateTooltips); - $(".event-filter-link").on("click", (function(_this) { - return function(event) { - event.preventDefault(); - _this.toggleFilter($(event.currentTarget)); - return _this.reloadActivities(); - }; - })(this)); + $('.event-filter-link').on('click', (event) => { + event.preventDefault(); + this.toggleFilter($(event.currentTarget)); + this.reloadActivities(); + }); } - Activities.prototype.updateTooltips = function() { + updateTooltips() { gl.utils.localTimeAgo($('.js-timeago', '.content_list')); - }; + } - Activities.prototype.reloadActivities = function() { - $(".content_list").html(''); + reloadActivities() { + $('.content_list').html(''); Pager.init(20, true, false, this.updateTooltips); - }; - - Activities.prototype.toggleFilter = function(sender) { - var filter = sender.attr("id").split("_")[0]; - - $('.event-filter .active').removeClass("active"); - Cookies.set("event_filter", filter); + } - sender.closest('li').toggleClass("active"); - }; + toggleFilter(sender) { + const filter = sender.attr('id').split('_')[0]; - return Activities; + $('.event-filter .active').removeClass('active'); + Cookies.set('event_filter', filter); - })(); + sender.closest('li').toggleClass('active'); + } + } -}).call(this); + global.Activities = Activities; +})(window.gl || (window.gl = {})); -- cgit v1.2.1 From 0dd95ca98381b4c6fc7016dd50dd3052051491b0 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Mon, 21 Nov 2016 10:17:11 -0600 Subject: fix some code style issues according to feedback --- app/assets/javascripts/activities.js.es6 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'app/assets/javascripts/activities.js.es6') diff --git a/app/assets/javascripts/activities.js.es6 b/app/assets/javascripts/activities.js.es6 index da8a4a8f3a2..19bcfef89fb 100644 --- a/app/assets/javascripts/activities.js.es6 +++ b/app/assets/javascripts/activities.js.es6 @@ -5,9 +5,9 @@ class Activities { constructor() { Pager.init(20, true, false, this.updateTooltips); - $('.event-filter-link').on('click', (event) => { - event.preventDefault(); - this.toggleFilter($(event.currentTarget)); + $('.event-filter-link').on('click', (e) => { + e.preventDefault(); + this.toggleFilter(e.currentTarget); this.reloadActivities(); }); } @@ -22,12 +22,13 @@ } toggleFilter(sender) { - const filter = sender.attr('id').split('_')[0]; + const $sender = $(sender); + const filter = $sender.attr('id').split('_')[0]; $('.event-filter .active').removeClass('active'); Cookies.set('event_filter', filter); - sender.closest('li').toggleClass('active'); + $sender.closest('li').toggleClass('active'); } } -- cgit v1.2.1 From bd0017c6d4e008474fcd87e979b3b4e3f93e39b1 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Mon, 21 Nov 2016 17:19:51 -0600 Subject: clean up globals exemptions within .eslintrc --- app/assets/javascripts/activities.js.es6 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/assets/javascripts/activities.js.es6') diff --git a/app/assets/javascripts/activities.js.es6 b/app/assets/javascripts/activities.js.es6 index 19bcfef89fb..648cb4d5d85 100644 --- a/app/assets/javascripts/activities.js.es6 +++ b/app/assets/javascripts/activities.js.es6 @@ -1,5 +1,6 @@ /* eslint-disable no-param-reassign, class-methods-use-this */ -/* global Pager, Cookies */ +/* global Pager */ +/* global Cookies */ ((global) => { class Activities { -- cgit v1.2.1