From 7ed0acd422a95c4cbb1406f67929a5da669f2681 Mon Sep 17 00:00:00 2001 From: Regis Date: Thu, 4 Aug 2016 12:18:00 -0600 Subject: turned ES5 users.js to ES6 users.js.es6 for babel added semicolons remove users.js rename users to user in filename removed uneeded semi-colons and returning null in constructor class is wrapped - a lot of builds will fail formatting replaced 'new User' with 'new gl.User' in app/users/show.html.haml window.gl || window.gl = {} - seeing if rspec9/spinach6/spinach9 will pass putting window logic before IIFE Fixed typo in users show view - extracted jquery calls in constructor to prototype methods fixed window declaration in IIFE argument adding new line --- app/assets/javascripts/user.js.es6 | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 app/assets/javascripts/user.js.es6 (limited to 'app/assets/javascripts/user.js.es6') diff --git a/app/assets/javascripts/user.js.es6 b/app/assets/javascripts/user.js.es6 new file mode 100644 index 00000000000..c934afa458a --- /dev/null +++ b/app/assets/javascripts/user.js.es6 @@ -0,0 +1,35 @@ +(global => { + global.User = class { + constructor(opts) { + this.opts = opts; + this.placeTop(); + this.initTabs(); + this.hideProjectLimitMessage(); + } + + placeTop() { + $('.profile-groups-avatars').tooltip({ + "placement": "top" + }); + } + + initTabs() { + return new UserTabs({ + parentEl: '.user-profile', + action: this.opts.action + }); + } + + hideProjectLimitMessage() { + $('.hide-project-limit-message').on('click', e => { + const path = '/'; + $.cookie('hide_project_limit_message', 'false', { + path: path + }); + $(this).parents('.project-limit-message').remove(); + e.preventDefault(); + return; + }); + } + } +})(window.gl || (window.gl = {})); -- cgit v1.2.1 From 195d79dce0ea424aeea78e8ad35ece83bd708641 Mon Sep 17 00:00:00 2001 From: Regis Date: Thu, 1 Sep 2016 05:38:58 -0600 Subject: path const and prevent default location --- app/assets/javascripts/user.js.es6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/assets/javascripts/user.js.es6') diff --git a/app/assets/javascripts/user.js.es6 b/app/assets/javascripts/user.js.es6 index c934afa458a..d644a1c0bc6 100644 --- a/app/assets/javascripts/user.js.es6 +++ b/app/assets/javascripts/user.js.es6 @@ -22,12 +22,12 @@ hideProjectLimitMessage() { $('.hide-project-limit-message').on('click', e => { - const path = '/'; + e.preventDefault(); + const path = gon.relative_url_root || '/'; $.cookie('hide_project_limit_message', 'false', { path: path }); $(this).parents('.project-limit-message').remove(); - e.preventDefault(); return; }); } -- cgit v1.2.1 From 0d45972c936bc498b2e9d1f552099b4679afd607 Mon Sep 17 00:00:00 2001 From: Regis Date: Thu, 1 Sep 2016 05:40:38 -0600 Subject: single quotes for 'placement': 'top' k-v --- app/assets/javascripts/user.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/assets/javascripts/user.js.es6') diff --git a/app/assets/javascripts/user.js.es6 b/app/assets/javascripts/user.js.es6 index d644a1c0bc6..f9cdf82f529 100644 --- a/app/assets/javascripts/user.js.es6 +++ b/app/assets/javascripts/user.js.es6 @@ -9,7 +9,7 @@ placeTop() { $('.profile-groups-avatars').tooltip({ - "placement": "top" + 'placement': 'top' }); } -- cgit v1.2.1 From ee419bf48b16b91b2a47f877f169fbf531f8ae11 Mon Sep 17 00:00:00 2001 From: Regis Date: Thu, 1 Sep 2016 05:54:10 -0600 Subject: no string wraps on keys --- app/assets/javascripts/user.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/assets/javascripts/user.js.es6') diff --git a/app/assets/javascripts/user.js.es6 b/app/assets/javascripts/user.js.es6 index f9cdf82f529..833f35df59b 100644 --- a/app/assets/javascripts/user.js.es6 +++ b/app/assets/javascripts/user.js.es6 @@ -9,7 +9,7 @@ placeTop() { $('.profile-groups-avatars').tooltip({ - 'placement': 'top' + placement: 'top' }); } -- cgit v1.2.1 From f43a0470bd52132c2853582c51637a736dcce5e8 Mon Sep 17 00:00:00 2001 From: Regis Date: Thu, 1 Sep 2016 14:51:53 -0600 Subject: removed null return - renamed 'placeTop' to 'placeProfileAvatarsToTop' --- app/assets/javascripts/user.js.es6 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'app/assets/javascripts/user.js.es6') diff --git a/app/assets/javascripts/user.js.es6 b/app/assets/javascripts/user.js.es6 index 833f35df59b..6889d3a7491 100644 --- a/app/assets/javascripts/user.js.es6 +++ b/app/assets/javascripts/user.js.es6 @@ -2,12 +2,12 @@ global.User = class { constructor(opts) { this.opts = opts; - this.placeTop(); + this.placeProfileAvatarsToTop(); this.initTabs(); this.hideProjectLimitMessage(); } - placeTop() { + placeProfileAvatarsToTop() { $('.profile-groups-avatars').tooltip({ placement: 'top' }); @@ -28,7 +28,6 @@ path: path }); $(this).parents('.project-limit-message').remove(); - return; }); } } -- cgit v1.2.1