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
af81730b
Commit
af81730b
authored
May 18, 2017
by
Phil Hughes
Committed by
Timothy Andrew
May 19, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'disable-clicking-disabled-clipboard-button' into 'master'
Fix clicking disabled clipboard button toolip Closes #32518 See merge request !11493
parent
6a4d079e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
6 deletions
+29
-6
index.js
app/assets/javascripts/blob/viewer/index.js
+2
-2
index_spec.js
spec/javascripts/blob/viewer/index_spec.js
+27
-4
No files found.
app/assets/javascripts/blob/viewer/index.js
View file @
af81730b
...
...
@@ -29,9 +29,9 @@ export default class BlobViewer {
if
(
this
.
copySourceBtn
)
{
this
.
copySourceBtn
.
addEventListener
(
'click'
,
()
=>
{
if
(
this
.
copySourceBtn
.
classList
.
contains
(
'disabled'
))
return
;
if
(
this
.
copySourceBtn
.
classList
.
contains
(
'disabled'
))
return
this
.
copySourceBtn
.
blur
()
;
this
.
switchToViewer
(
'simple'
);
return
this
.
switchToViewer
(
'simple'
);
});
}
}
...
...
spec/javascripts/blob/viewer/index_spec.js
View file @
af81730b
...
...
@@ -83,25 +83,48 @@ describe('Blob viewer', () => {
});
describe
(
'copy blob button'
,
()
=>
{
let
copyButton
;
beforeEach
(()
=>
{
copyButton
=
document
.
querySelector
(
'.js-copy-blob-source-btn'
);
});
it
(
'disabled on load'
,
()
=>
{
expect
(
document
.
querySelector
(
'.js-copy-blob-source-btn'
)
.
classList
.
contains
(
'disabled'
),
copyButton
.
classList
.
contains
(
'disabled'
),
).
toBeTruthy
();
});
it
(
'has tooltip when disabled'
,
()
=>
{
expect
(
document
.
querySelector
(
'.js-copy-blob-source-btn'
)
.
getAttribute
(
'data-original-title'
),
copyButton
.
getAttribute
(
'data-original-title'
),
).
toBe
(
'Switch to the source to copy it to the clipboard'
);
});
it
(
'is blurred when clicked and disabled'
,
()
=>
{
spyOn
(
copyButton
,
'blur'
);
copyButton
.
click
();
expect
(
copyButton
.
blur
).
toHaveBeenCalled
();
});
it
(
'is not blurred when clicked and not disabled'
,
()
=>
{
spyOn
(
copyButton
,
'blur'
);
copyButton
.
classList
.
remove
(
'disabled'
);
copyButton
.
click
();
expect
(
copyButton
.
blur
).
not
.
toHaveBeenCalled
();
});
it
(
'enables after switching to simple view'
,
(
done
)
=>
{
document
.
querySelector
(
'.js-blob-viewer-switch-btn[data-viewer="simple"]'
).
click
();
setTimeout
(()
=>
{
expect
(
$
.
ajax
).
toHaveBeenCalled
();
expect
(
document
.
querySelector
(
'.js-copy-blob-source-btn'
)
.
classList
.
contains
(
'disabled'
),
copyButton
.
classList
.
contains
(
'disabled'
),
).
toBeFalsy
();
done
();
...
...
@@ -115,7 +138,7 @@ describe('Blob viewer', () => {
expect
(
$
.
ajax
).
toHaveBeenCalled
();
expect
(
document
.
querySelector
(
'.js-copy-blob-source-btn'
)
.
getAttribute
(
'data-original-title'
),
copyButton
.
getAttribute
(
'data-original-title'
),
).
toBe
(
'Copy source to clipboard'
);
done
();
...
...
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