Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
minerva
core
Commits
5aa7d144
Commit
5aa7d144
authored
5 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
general overlays are always above user overlays
parent
9d07245f
No related branches found
No related tags found
1 merge request
!963
Resolve "refreshing general-overlays list in left panel and in info window"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
frontend-js/src/main/js/map/window/AliasInfoWindow.js
+10
-0
10 additions, 0 deletions
frontend-js/src/main/js/map/window/AliasInfoWindow.js
frontend-js/src/test/js/map/window/AliasInfoWindow-test.js
+31
-0
31 additions, 0 deletions
frontend-js/src/test/js/map/window/AliasInfoWindow-test.js
with
41 additions
and
0 deletions
frontend-js/src/main/js/map/window/AliasInfoWindow.js
+
10
−
0
View file @
5aa7d144
...
@@ -114,6 +114,16 @@ AliasInfoWindow.prototype.createChartDiv = function (params) {
...
@@ -114,6 +114,16 @@ AliasInfoWindow.prototype.createChartDiv = function (params) {
var
promises
=
[];
var
promises
=
[];
var
self
=
this
;
var
self
=
this
;
overlays
.
sort
(
function
(
overlayA
,
overlayB
)
{
if
(
overlayA
.
getPublicOverlay
()
!==
overlayB
.
getPublicOverlay
())
{
if
(
overlayA
.
getPublicOverlay
())
{
return
-
1
;
}
return
1
;
}
return
overlayA
.
getOrder
()
-
overlayB
.
getOrder
();
});
overlays
.
forEach
(
function
(
overlay
,
i
)
{
overlays
.
forEach
(
function
(
overlay
,
i
)
{
promises
.
push
(
overlay
.
getFullAliasById
(
self
.
getAlias
().
getId
()).
then
(
function
(
data
)
{
promises
.
push
(
overlay
.
getFullAliasById
(
self
.
getAlias
().
getId
()).
then
(
function
(
data
)
{
var
rowDiv
=
document
.
createElement
(
"
div
"
);
var
rowDiv
=
document
.
createElement
(
"
div
"
);
...
...
This diff is collapsed.
Click to expand it.
frontend-js/src/test/js/map/window/AliasInfoWindow-test.js
+
31
−
0
View file @
5aa7d144
...
@@ -427,6 +427,37 @@ describe('AliasInfoWindow', function () {
...
@@ -427,6 +427,37 @@ describe('AliasInfoWindow', function () {
assert
.
ok
(
div
);
assert
.
ok
(
div
);
});
});
});
});
it
(
"
overlay order
"
,
function
()
{
var
map
=
helper
.
createCustomMap
();
var
alias
=
helper
.
createAlias
(
map
);
var
aliasWindow
=
new
AliasInfoWindow
({
alias
:
alias
,
map
:
map
,
marker
:
helper
.
createMarker
({
element
:
alias
,
map
:
map
})
});
var
overlay1
=
helper
.
createOverlay
();
overlay1
.
setOrder
(
2
);
var
overlay2
=
helper
.
createOverlay
();
overlay2
.
setPublicOverlay
(
true
);
overlay2
.
setOrder
(
10
);
var
overlay3
=
helper
.
createOverlay
();
overlay3
.
setPublicOverlay
(
true
);
overlay3
.
setOrder
(
9
);
var
overlay4
=
helper
.
createOverlay
();
overlay4
.
setOrder
(
1
);
var
overlays
=
[
overlay1
,
overlay2
,
overlay3
,
overlay4
];
return
aliasWindow
.
createChartDiv
({
overlays
:
overlays
}).
then
(
function
(
htmlDiv
)
{
var
overlay1Position
=
htmlDiv
.
innerHTML
.
indexOf
(
overlay1
.
getName
());
var
overlay2Position
=
htmlDiv
.
innerHTML
.
indexOf
(
overlay2
.
getName
());
var
overlay3Position
=
htmlDiv
.
innerHTML
.
indexOf
(
overlay3
.
getName
());
var
overlay4Position
=
htmlDiv
.
innerHTML
.
indexOf
(
overlay4
.
getName
());
assert
.
ok
(
overlay3Position
<
overlay2Position
);
assert
.
ok
(
overlay2Position
<
overlay4Position
);
assert
.
ok
(
overlay4Position
<
overlay1Position
);
});
});
});
});
it
(
"
createVcfString
"
,
function
()
{
it
(
"
createVcfString
"
,
function
()
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment