Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Devrim Gunyel
core
Commits
07f6f73a
Commit
07f6f73a
authored
Oct 16, 2019
by
Piotr Gawron
Browse files
overlay name doesn't contain order number for public overlays
parent
5aa7d144
Changes
2
Hide whitespace changes
Inline
Side-by-side
frontend-js/src/main/js/map/window/AliasInfoWindow.js
View file @
07f6f73a
...
...
@@ -98,6 +98,23 @@ AliasInfoWindow.prototype.init = function () {
});
};
/**
*
* @param {DataOverlay} overlay
* @return {string}
* @package
*/
AliasInfoWindow
.
prototype
.
_getPrintableOverlayName
=
function
(
overlay
)
{
var
name
=
overlay
.
getName
();
if
(
name
.
length
>
20
)
{
name
=
name
.
substr
(
0
,
20
)
+
"
...
"
;
}
if
(
!
overlay
.
getPublicOverlay
())
{
name
=
"
[
"
+
overlay
.
getOrder
()
+
"
]
"
+
name
;
}
return
name
;
};
/**
* Creates and returns chart representing data related to alias on different
* overlays.
...
...
@@ -132,11 +149,7 @@ AliasInfoWindow.prototype.createChartDiv = function (params) {
}
else
{
rowDiv
.
className
=
"
minerva-chart-row-odd
"
;
}
var
name
=
overlays
[
i
].
getName
();
if
(
name
.
length
>
20
)
{
name
=
name
.
substr
(
0
,
20
)
+
"
...
"
;
}
name
=
"
[
"
+
overlays
[
i
].
getOrder
()
+
"
]
"
+
name
;
var
name
=
self
.
_getPrintableOverlayName
(
overlays
[
i
]);
var
nameDiv
=
document
.
createElement
(
"
div
"
);
nameDiv
.
className
=
"
minerva-chart-name
"
;
nameDiv
.
innerHTML
=
name
+
"
"
;
...
...
frontend-js/src/test/js/map/window/AliasInfoWindow-test.js
View file @
07f6f73a
...
...
@@ -362,6 +362,23 @@ describe('AliasInfoWindow', function () {
assert
.
ok
(
functions
.
isDomElement
(
aliasWindow
.
createWaitingContentDiv
()));
});
it
(
"
getPrintableOverlayName
"
,
function
()
{
var
map
=
helper
.
createCustomMap
();
var
alias
=
helper
.
createAlias
(
map
);
alias
.
setIsComplete
(
true
);
var
aliasWindow
=
new
AliasInfoWindow
({
alias
:
alias
,
map
:
map
,
marker
:
helper
.
createMarker
({
element
:
alias
,
map
:
map
})
});
var
overlay
=
helper
.
createOverlay
();
overlay
.
setPublicOverlay
(
true
);
overlay
.
setOrder
(
137778
);
assert
.
equal
(
-
1
,
aliasWindow
.
_getPrintableOverlayName
(
overlay
).
indexOf
(
overlay
.
getOrder
()
+
""
));
});
describe
(
"
createChartDiv
"
,
function
()
{
it
(
"
on submap map
"
,
function
()
{
helper
.
setUrl
(
"
http://test/?id=complex_model_with_submaps
"
);
...
...
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