Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
11c79cb5
Commit
11c79cb5
authored
Feb 21, 2020
by
Raihan Kabir
Committed by
Phil Hughes
Feb 21, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Migrate '.fa-spinner' to '.spinner' for 'app/assets/javascripts/right_sidebar.js'"
parent
d3042ab9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
33 deletions
+1
-33
app/assets/javascripts/right_sidebar.js
app/assets/javascripts/right_sidebar.js
+1
-33
No files found.
app/assets/javascripts/right_sidebar.js
View file @
11c79cb5
/* eslint-disable func-names, consistent-return, no-
else-return, no-
param-reassign */
/* eslint-disable func-names, consistent-return, no-param-reassign */
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
_
from
'
underscore
'
;
import
_
from
'
underscore
'
;
...
@@ -34,8 +34,6 @@ Sidebar.prototype.addEventListeners = function() {
...
@@ -34,8 +34,6 @@ Sidebar.prototype.addEventListeners = function() {
this
.
sidebar
.
on
(
'
click
'
,
'
.sidebar-collapsed-icon
'
,
this
,
this
.
sidebarCollapseClicked
);
this
.
sidebar
.
on
(
'
click
'
,
'
.sidebar-collapsed-icon
'
,
this
,
this
.
sidebarCollapseClicked
);
this
.
sidebar
.
on
(
'
hidden.gl.dropdown
'
,
this
,
this
.
onSidebarDropdownHidden
);
this
.
sidebar
.
on
(
'
hidden.gl.dropdown
'
,
this
,
this
.
onSidebarDropdownHidden
);
$
(
'
.dropdown
'
).
on
(
'
loading.gl.dropdown
'
,
this
.
sidebarDropdownLoading
);
$
(
'
.dropdown
'
).
on
(
'
loaded.gl.dropdown
'
,
this
.
sidebarDropdownLoaded
);
$document
.
on
(
'
click
'
,
'
.js-sidebar-toggle
'
,
this
.
sidebarToggleClicked
);
$document
.
on
(
'
click
'
,
'
.js-sidebar-toggle
'
,
this
.
sidebarToggleClicked
);
return
$
(
document
)
return
$
(
document
)
...
@@ -133,36 +131,6 @@ Sidebar.prototype.todoUpdateDone = function(data) {
...
@@ -133,36 +131,6 @@ Sidebar.prototype.todoUpdateDone = function(data) {
});
});
};
};
Sidebar
.
prototype
.
sidebarDropdownLoading
=
function
()
{
const
$sidebarCollapsedIcon
=
$
(
this
)
.
closest
(
'
.block
'
)
.
find
(
'
.sidebar-collapsed-icon
'
);
const
img
=
$sidebarCollapsedIcon
.
find
(
'
img
'
);
const
i
=
$sidebarCollapsedIcon
.
find
(
'
i
'
);
const
$loading
=
$
(
'
<i class="fa fa-spinner fa-spin"></i>
'
);
if
(
img
.
length
)
{
img
.
before
(
$loading
);
return
img
.
hide
();
}
else
if
(
i
.
length
)
{
i
.
before
(
$loading
);
return
i
.
hide
();
}
};
Sidebar
.
prototype
.
sidebarDropdownLoaded
=
function
()
{
const
$sidebarCollapsedIcon
=
$
(
this
)
.
closest
(
'
.block
'
)
.
find
(
'
.sidebar-collapsed-icon
'
);
const
img
=
$sidebarCollapsedIcon
.
find
(
'
img
'
);
$sidebarCollapsedIcon
.
find
(
'
i.fa-spin
'
).
remove
();
const
i
=
$sidebarCollapsedIcon
.
find
(
'
i
'
);
if
(
img
.
length
)
{
return
img
.
show
();
}
else
{
return
i
.
show
();
}
};
Sidebar
.
prototype
.
sidebarCollapseClicked
=
function
(
e
)
{
Sidebar
.
prototype
.
sidebarCollapseClicked
=
function
(
e
)
{
if
(
$
(
e
.
currentTarget
).
hasClass
(
'
dont-change-state
'
))
{
if
(
$
(
e
.
currentTarget
).
hasClass
(
'
dont-change-state
'
))
{
return
;
return
;
...
...
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