diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-27 21:30:42 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-04-27 21:30:42 +0000 |
| commit | a792427eed95570da22844a06a09227730443189 (patch) | |
| tree | 0411b1e60747821418274640ef166dde49a0b194 | |
| parent | 2ec58d4a74c5805ef09b9472cecb3d6d9465a5f2 (diff) | |
| parent | 40b0afddbf3cb66462893b7c5c7f09204d59d60a (diff) | |
| download | gitlab-ce-a792427eed95570da22844a06a09227730443189.tar.gz | |
Merge branch 'add-js-prefix-to-user-tab-classes' into 'master'
Add JS prefix to user tab classes
## What does this MR do
This MR adds the `js-` prefix to the classes which are used for js purposes only. This MR only affects the said classes inside `users/show.html.haml`.
## Are there points in the code the reviewer needs to double check?
I'm not entirely sure if this project uses the `js-` prefix for
classes that are used for js purposes only. Doing a grep shows some of the classes have the prefix, but I'm still unsure whether this project follows this rule.
## Why was this MR needed?
As I was working thru #13401, I wanted to add a tab on the user profile page to show the contributions outside the GitLab instance. Reading the JS, I came across this. This MR helps new people reading the code that the said classes are for js purposes only. Also, it helps the project work toward to uniform class naming.
I suggest that we document adding the `js-` prefix to classes for js purposes only (if this is the case for this project)
See merge request !3928
| -rw-r--r-- | app/assets/javascripts/user_tabs.js.coffee | 2 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/user_tabs.js.coffee b/app/assets/javascripts/user_tabs.js.coffee index 09b7eec9104..c2aeffe2381 100644 --- a/app/assets/javascripts/user_tabs.js.coffee +++ b/app/assets/javascripts/user_tabs.js.coffee @@ -92,7 +92,7 @@ class @UserTabs @setCurrentAction(action) activateTab: (action) -> - @parentEl.find(".nav-links .#{action}-tab a").tab('show') + @parentEl.find(".nav-links .js-#{action}-tab a").tab('show') setTab: (source, action) -> return if @loaded[action] is true diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 3028491e5b6..0dff27f9654 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -69,13 +69,13 @@ = @user.location %ul.nav-links.center.user-profile-nav - %li.activity-tab + %li.js-activity-tab = link_to user_calendar_activities_path, data: {target: 'div#activity', action: 'activity', toggle: 'tab'} do Activity - %li.groups-tab + %li.js-groups-tab = link_to user_groups_path, data: {target: 'div#groups', action: 'groups', toggle: 'tab'} do Groups - %li.contributed-tab + %li.js-contributed-tab = link_to user_contributed_projects_path, data: {target: 'div#contributed', action: 'contributed', toggle: 'tab'} do Contributed projects %li.projects-tab |