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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
67eefe7e
Commit
67eefe7e
authored
Mar 15, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
don't show loading spinners for server-rendered sidebar fields
parent
0eff4f14
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
11 deletions
+15
-11
app/assets/javascripts/due_date_select.js
app/assets/javascripts/due_date_select.js
+1
-1
app/assets/javascripts/labels_select.js
app/assets/javascripts/labels_select.js
+1
-1
app/assets/javascripts/milestone_select.js
app/assets/javascripts/milestone_select.js
+2
-2
app/assets/javascripts/users_select.js
app/assets/javascripts/users_select.js
+2
-2
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+5
-5
changelogs/unreleased/24683-sidebar-spinners.yml
changelogs/unreleased/24683-sidebar-spinners.yml
+4
-0
No files found.
app/assets/javascripts/due_date_select.js
View file @
67eefe7e
...
...
@@ -132,7 +132,7 @@ class DueDateSelect {
const
selectedDateValue
=
this
.
datePayload
[
this
.
abilityName
].
due_date
;
const
displayedDateStyle
=
this
.
displayedDate
!==
'
No due date
'
?
'
bold
'
:
'
no-value
'
;
this
.
$loading
.
fadeIn
();
this
.
$loading
.
removeClass
(
'
hidden
'
).
fadeIn
();
if
(
isDropdown
)
{
this
.
$dropdown
.
trigger
(
'
loading.gl.dropdown
'
);
...
...
app/assets/javascripts/labels_select.js
View file @
67eefe7e
...
...
@@ -76,7 +76,7 @@
if
(
!
selected
.
length
)
{
data
[
abilityName
].
label_ids
=
[
''
];
}
$loading
.
fadeIn
();
$loading
.
removeClass
(
'
hidden
'
).
fadeIn
();
$dropdown
.
trigger
(
'
loading.gl.dropdown
'
);
return
$
.
ajax
({
type
:
'
PUT
'
,
...
...
app/assets/javascripts/milestone_select.js
View file @
67eefe7e
...
...
@@ -159,7 +159,7 @@
}
$dropdown
.
trigger
(
'
loading.gl.dropdown
'
);
$loading
.
fadeIn
();
$loading
.
removeClass
(
'
hidden
'
).
fadeIn
();
gl
.
issueBoards
.
BoardsStore
.
detail
.
issue
.
update
(
$dropdown
.
attr
(
'
data-issue-update
'
))
.
then
(
function
()
{
...
...
@@ -171,7 +171,7 @@
data
=
{};
data
[
abilityName
]
=
{};
data
[
abilityName
].
milestone_id
=
selected
!=
null
?
selected
:
null
;
$loading
.
fadeIn
();
$loading
.
removeClass
(
'
hidden
'
).
fadeIn
();
$dropdown
.
trigger
(
'
loading.gl.dropdown
'
);
return
$
.
ajax
({
type
:
'
PUT
'
,
...
...
app/assets/javascripts/users_select.js
View file @
67eefe7e
...
...
@@ -53,7 +53,7 @@
$loading
=
$block
.
find
(
'
.block-loading
'
).
fadeOut
();
var
updateIssueBoardsIssue
=
function
()
{
$loading
.
fadeIn
();
$loading
.
removeClass
(
'
hidden
'
).
fadeIn
();
gl
.
issueBoards
.
BoardsStore
.
detail
.
issue
.
update
(
$dropdown
.
attr
(
'
data-issue-update
'
))
.
then
(
function
()
{
$loading
.
fadeOut
();
...
...
@@ -90,7 +90,7 @@
data
=
{};
data
[
abilityName
]
=
{};
data
[
abilityName
].
assignee_id
=
selected
!=
null
?
selected
:
null
;
$loading
.
fadeIn
();
$loading
.
removeClass
(
'
hidden
'
).
fadeIn
();
$dropdown
.
trigger
(
'
loading.gl.dropdown
'
);
return
$
.
ajax
({
type
:
'
PUT
'
,
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
67eefe7e
...
...
@@ -30,7 +30,7 @@
=
icon
(
'user'
,
'aria-hidden'
:
'true'
)
.title.hide-collapsed
Assignee
=
icon
(
'spinner spin'
,
class:
'block-loading'
,
'aria-hidden'
:
'true'
)
=
icon
(
'spinner spin'
,
class:
'
hidden
block-loading'
,
'aria-hidden'
:
'true'
)
-
if
can_edit_issuable
=
link_to
'Edit'
,
'#'
,
class:
'edit-link pull-right'
.value.hide-collapsed
...
...
@@ -64,7 +64,7 @@
None
.title.hide-collapsed
Milestone
=
icon
(
'spinner spin'
,
class:
'block-loading'
,
'aria-hidden'
:
'true'
)
=
icon
(
'spinner spin'
,
class:
'
hidden
block-loading'
,
'aria-hidden'
:
'true'
)
-
if
can_edit_issuable
=
link_to
'Edit'
,
'#'
,
class:
'edit-link pull-right'
.value.hide-collapsed
...
...
@@ -91,7 +91,7 @@
=
issuable
.
due_date
.
try
(
:to_s
,
:medium
)
||
'None'
.title.hide-collapsed
Due date
=
icon
(
'spinner spin'
,
class:
'block-loading'
,
'aria-hidden'
:
'true'
)
=
icon
(
'spinner spin'
,
class:
'
hidden
block-loading'
,
'aria-hidden'
:
'true'
)
-
if
can?
(
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
@project
)
=
link_to
'Edit'
,
'#'
,
class:
'edit-link pull-right'
.value.hide-collapsed
...
...
@@ -121,12 +121,12 @@
-
selected_labels
=
issuable
.
labels
.block.labels
.sidebar-collapsed-icon.js-sidebar-labels-tooltip
{
title:
issuable_labels_tooltip
(
issuable
.
labels_array
),
data:
{
placement:
"left"
,
container:
"body"
}
}
=
icon
(
'tags'
,
'aria-hidden'
:
'true'
)
=
icon
(
'tags'
,
class:
'hidden'
,
'aria-hidden'
:
'true'
)
%span
=
selected_labels
.
size
.title.hide-collapsed
Labels
=
icon
(
'spinner spin'
,
class:
'block-loading'
,
'aria-hidden'
:
'true'
)
=
icon
(
'spinner spin'
,
class:
'
hidden
block-loading'
,
'aria-hidden'
:
'true'
)
-
if
can_edit_issuable
=
link_to
'Edit'
,
'#'
,
class:
'edit-link pull-right'
.value.issuable-show-labels.hide-collapsed
{
class:
(
"has-labels"
if
selected_labels
.
any?
)
}
...
...
changelogs/unreleased/24683-sidebar-spinners.yml
0 → 100644
View file @
67eefe7e
---
title
:
hide loading spinners for server-rendered sidebar fields
merge_request
:
author
:
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