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
87167595
Commit
87167595
authored
Apr 18, 2018
by
Piotr Gawron
Browse files
unused code removed
parent
31e132bc
Changes
3
Hide whitespace changes
Inline
Side-by-side
frontend-js/package-lock.json
View file @
87167595
...
...
@@ -45,38 +45,30 @@
"litemol"
:
"github:dsehnal/LiteMol#67556b0de0d2428f9494136758cbf8a662f66412"
},
"dependencies"
:
{
"ProtVista"
:
{
"version"
:
"git://github.com/davidhoksza/protvista.git#4e4bb737ba1e183291505bd25f8bae2e651ce21e"
,
"dev"
:
true
,
"requires"
:
{
"d3"
:
"3.5.17"
,
"file-saver"
:
"1.3.3"
,
"jquery"
:
"2.2.4"
,
"jszip"
:
"3.1.4"
,
"underscore"
:
"1.8.3"
},
"dependencies"
:
{
"jquery"
:
{
"version"
:
"2.2.4"
,
"resolved"
:
"https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz"
,
"integrity"
:
"sha1-LInWiJterFIqfuoywUUhVZxsvwI="
,
"dev"
:
true
}
}
},
"jquery"
:
{
"version"
:
"3.3.1"
,
"resolved"
:
"https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz"
,
"integrity"
:
"sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
,
"dev"
:
true
},
"litemol"
:
{
"version"
:
"github:dsehnal/LiteMol#67556b0de0d2428f9494136758cbf8a662f66412"
,
"dev"
:
true
,
"requires"
:
{
"@types/react"
:
"15.6.15"
,
"@types/react-dom"
:
"15.5.7"
}
}
}
},
"ProtVista"
:
{
"version"
:
"git://github.com/davidhoksza/protvista.git#4e4bb737ba1e183291505bd25f8bae2e651ce21e"
,
"dev"
:
true
,
"requires"
:
{
"d3"
:
"3.5.17"
,
"file-saver"
:
"1.3.3"
,
"jquery"
:
"2.2.4"
,
"jszip"
:
"3.1.4"
,
"underscore"
:
"1.8.3"
},
"dependencies"
:
{
"jquery"
:
{
"version"
:
"2.2.4"
,
"resolved"
:
"https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz"
,
"integrity"
:
"sha1-LInWiJterFIqfuoywUUhVZxsvwI="
,
"dev"
:
true
}
}
},
...
...
@@ -2058,6 +2050,14 @@
"immediate"
:
"3.0.6"
}
},
"litemol"
:
{
"version"
:
"github:dsehnal/LiteMol#67556b0de0d2428f9494136758cbf8a662f66412"
,
"dev"
:
true
,
"requires"
:
{
"@types/react"
:
"15.6.15"
,
"@types/react-dom"
:
"15.5.7"
}
},
"lodash"
:
{
"version"
:
"4.17.4"
,
"resolved"
:
"https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
,
...
...
frontend-js/src/main/js/map/AbstractCustomMap.js
View file @
87167595
...
...
@@ -642,6 +642,7 @@ AbstractCustomMap.prototype._createMapChangedCallbacks = function () {
var
sessionData
=
ServerConnector
.
getSessionData
(
self
.
getTopMap
().
getProject
());
// listener for changing zoom level
this
.
getMapCanvas
().
addListener
(
'
zoom_changed
'
,
function
()
{
console
.
log
(
self
.
getId
(),
self
.
getZoom
());
sessionData
.
setZoomLevel
(
self
.
getModel
(),
self
.
getZoom
());
});
...
...
frontend-js/src/main/js/map/Submap.js
View file @
87167595
...
...
@@ -2,6 +2,7 @@
/* exported logger */
// noinspection JSUnusedLocalSymbols
var
logger
=
require
(
'
../logger
'
);
var
AbstractCustomMap
=
require
(
'
./AbstractCustomMap
'
);
var
CustomMapOptions
=
require
(
'
./CustomMapOptions
'
);
...
...
@@ -13,10 +14,10 @@ var GoogleMapsApiCanvas = require('./canvas/GoogleMapsApiCanvas');
* Constructor of a submap. Submaps are created on application start. But dialog
* (popup window) is initialized on demand using init function.
*
* @param customMap
* @param
{CustomMap}
customMap
* parent CustomMap
* @param
id
*
identifier of the submap
* @param
{MapModel} model
*
*/
function
Submap
(
customMap
,
model
)
{
this
.
setCustomMap
(
customMap
);
...
...
@@ -85,16 +86,6 @@ Submap.prototype.open = function (htmlTag) {
self
.
registerMapClickEvents
();
self
.
getMapCanvas
().
setCenter
(
new
Point
(
self
.
getModel
().
getWidth
()
/
2
,
self
.
getModel
().
getHeight
()
/
2
));
var
sessionData
=
ServerConnector
.
getSessionData
(
this
.
getProject
());
// and now send the zoom level to the client side
this
.
getMapCanvas
().
addListener
(
'
zoom_changed
'
,
function
()
{
sessionData
.
setZoomLevel
(
self
.
getModel
(),
self
.
getMapCanvas
().
getZoom
());
});
sessionData
.
setZoomLevel
(
self
.
getModel
(),
self
.
getMapCanvas
().
getZoom
());
self
.
initialized
=
true
;
}
else
{
$
(
self
.
getElement
()).
dialog
(
"
open
"
);
...
...
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