BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
8f93c27d
Commit
8f93c27d
authored
Mar 28, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'issue-boards-card-img-triggers-sidebar' into 'master'
Stops triggering board sidebar when clicking avatar See merge request !10265
parents
26ba13f2
6765a4e4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
6 deletions
+23
-6
board_card.js
app/assets/javascripts/boards/components/board_card.js
+1
-3
issue_card_inner.js
app/assets/javascripts/boards/components/issue_card_inner.js
+3
-3
board_card_spec.js
spec/javascripts/boards/board_card_spec.js
+19
-0
No files found.
app/assets/javascripts/boards/components/board_card.js
View file @
8f93c27d
...
...
@@ -50,9 +50,7 @@ export default {
this
.
showDetail
=
false
;
},
showIssue
(
e
)
{
const
targetTagName
=
e
.
target
.
tagName
.
toLowerCase
();
if
(
targetTagName
===
'a'
||
targetTagName
===
'button'
)
return
;
if
(
e
.
target
.
classList
.
contains
(
'js-no-trigger'
))
return
;
if
(
this
.
showDetail
)
{
this
.
showDetail
=
false
;
...
...
app/assets/javascripts/boards/components/issue_card_inner.js
View file @
8f93c27d
...
...
@@ -84,20 +84,20 @@ import eventHub from '../eventhub';
#{{ issue.id }}
</span>
<a
class="card-assignee has-tooltip"
class="card-assignee has-tooltip
js-no-trigger
"
:href="rootPath + issue.assignee.username"
:title="'Assigned to ' + issue.assignee.name"
v-if="issue.assignee"
data-container="body">
<img
class="avatar avatar-inline s20"
class="avatar avatar-inline s20
js-no-trigger
"
:src="issue.assignee.avatar"
width="20"
height="20"
:alt="'Avatar for ' + issue.assignee.name" />
</a>
<button
class="label color-label has-tooltip"
class="label color-label has-tooltip
js-no-trigger
"
v-for="label in issue.labels"
type="button"
v-if="showLabel(label)"
...
...
spec/javascripts/boards/board_card_spec.js
View file @
8f93c27d
/* global List */
/* global ListUser */
/* global ListLabel */
/* global listObj */
/* global boardsMockInterceptor */
/* global BoardService */
import
Vue
from
'vue'
;
import
'~/boards/models/user'
;
require
(
'~/boards/models/list'
);
require
(
'~/boards/models/label'
);
...
...
@@ -130,6 +132,23 @@ describe('Issue card', () => {
expect
(
gl
.
issueBoards
.
BoardsStore
.
detail
.
issue
).
toEqual
({});
});
it
(
'does not set detail issue if img is clicked'
,
(
done
)
=>
{
vm
.
issue
.
assignee
=
new
ListUser
({
id
:
1
,
name
:
'testing 123'
,
username
:
'test'
,
avatar
:
'test_image'
,
});
Vue
.
nextTick
(()
=>
{
triggerEvent
(
'mouseup'
,
vm
.
$el
.
querySelector
(
'img'
));
expect
(
gl
.
issueBoards
.
BoardsStore
.
detail
.
issue
).
toEqual
({});
done
();
});
});
it
(
'does not set detail issue if showDetail is false after mouseup'
,
()
=>
{
triggerEvent
(
'mouseup'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment