Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dataplatform
atlas
Commits
9f0866c8
Commit
9f0866c8
authored
7 years ago
by
pratik24mac
Committed by
Madhan Neethiraj
7 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-2350: UI - after error notification during search, there is an icon buffering forever
Signed-off-by:
Madhan Neethiraj
<
madhan@apache.org
>
parent
c6cc3314
master
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
13 deletions
+8
-13
SearchResultLayoutView.js
dashboardv2/public/js/views/search/SearchResultLayoutView.js
+8
-13
No files found.
dashboardv2/public/js/views/search/SearchResultLayoutView.js
View file @
9f0866c8
...
...
@@ -184,19 +184,14 @@ define(['require',
}
});
this
.
listenTo
(
this
.
searchCollection
,
"error"
,
function
(
model
,
response
)
{
this
.
$
(
'.fontLoader'
).
hide
(
);
this
.
$
(
'.tableOverlay'
).
hide
();
var
responseJSON
=
response
&&
response
.
responseJSON
?
response
.
responseJSON
:
null
;
if
(
responseJSON
&&
(
responseJSON
.
errorMessage
||
responseJSON
.
message
||
responseJSON
.
error
)
)
{
this
.
hideLoader
({
type
:
'error'
}
);
var
responseJSON
=
response
&&
response
.
responseJSON
?
response
.
responseJSON
:
null
,
errorText
=
(
responseJSON
&&
(
responseJSON
.
errorMessage
||
responseJSON
.
message
||
responseJSON
.
error
))
||
'Invalid Expression'
;
if
(
errorText
)
{
Utils
.
notifyError
({
content
:
responseJSON
.
errorMessage
||
responseJSON
.
message
||
responseJSON
.
error
content
:
errorText
});
}
else
{
if
(
response
.
statusText
!==
"abort"
)
{
Utils
.
notifyError
({
content
:
"Invalid Expression"
});
}
this
.
$
(
'.searchTable > .well'
).
html
(
'<center>'
+
errorText
+
'</center>'
)
}
},
this
);
this
.
listenTo
(
this
.
searchCollection
,
"state-changed"
,
function
(
state
)
{
...
...
@@ -847,9 +842,9 @@ define(['require',
this
.
$
(
'.fontLoader:not(.for-ignore)'
).
addClass
(
'show'
);
this
.
$
(
'.tableOverlay'
).
addClass
(
'show'
);
},
hideLoader
:
function
()
{
hideLoader
:
function
(
options
)
{
this
.
$
(
'.fontLoader:not(.for-ignore)'
).
removeClass
(
'show'
);
this
.
$
(
'.ellipsis,.pagination-box'
).
show
();
// only for first time
options
&&
options
.
type
===
'error'
?
this
.
$
(
'.ellipsis,.pagination-box'
).
hide
()
:
this
.
$
(
'.ellipsis,.pagination-box'
).
show
();
// only show for first time and hide when type is error
this
.
$
(
'.tableOverlay'
).
removeClass
(
'show'
);
},
checkedValue
:
function
(
e
)
{
...
...
This diff is collapsed.
Click to expand it.
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