Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
minerva
core
Commits
6dc809cc
Commit
6dc809cc
authored
Oct 18, 2019
by
Piotr Gawron
Browse files
default zoom level is not ignored when x/y is not defined
parent
c6ae71f7
Pipeline
#15205
passed with stage
in 14 minutes and 36 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
6dc809cc
minerva
(
14.0.3
)
stable
;
urgency
=
medium
*
Bug
fix
:
default
zoom
level
on
main
map
works
even
when
x
or
y
are
undefined
(#
993
)
*
Bug
fix
:
sbml
parser
had
sometimes
problems
with
combining
layout
and
multi
packages
(#
966
)
*
Bug
fix
:
parsing
of
CellDesigner
files
that
contained
substanceUnits
could
...
...
frontend-js/src/main/js/map/CustomMap.js
View file @
6dc809cc
...
...
@@ -105,9 +105,8 @@ CustomMap.prototype.init = function () {
var
zoom
=
self
.
getModel
().
getDefaultZoomLevel
();
var
autoFit
=
false
;
if
(
self
.
getServerConnector
().
getSessionData
(
self
.
getProject
()).
getCenter
(
self
.
getModel
())
===
undefined
&&
(
x
===
undefined
||
y
===
undefined
||
zoom
===
undefined
||
x
===
null
||
y
===
null
||
zoom
===
null
))
{
(
x
===
undefined
||
y
===
undefined
||
x
===
null
||
y
===
null
)
&&
(
zoom
===
undefined
||
zoom
===
null
))
{
autoFit
=
true
;
}
...
...
frontend-js/src/main/js/map/data/MapModel.js
View file @
6dc809cc
...
...
@@ -547,7 +547,7 @@ MapModel.prototype.setMinZoom = function (minZoom) {
/**
*
* @returns {number
|null
}
* @returns {
?null|
number}
*/
MapModel
.
prototype
.
getDefaultZoomLevel
=
function
()
{
return
this
.
_defaultZoomLevel
;
...
...
@@ -567,7 +567,7 @@ MapModel.prototype.setDefaultZoomLevel = function (defaultZoomLevel) {
/**
*
* @returns {null|number}
* @returns {
?
null|number}
*/
MapModel
.
prototype
.
getDefaultCenterX
=
function
()
{
return
this
.
_defaultCenterX
;
...
...
@@ -587,7 +587,7 @@ MapModel.prototype.setDefaultCenterX = function (defaultCenterX) {
/**
*
* @returns {number
|null
}
* @returns {
?null|
number}
*/
MapModel
.
prototype
.
getDefaultCenterY
=
function
()
{
return
this
.
_defaultCenterY
;
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment