From 08c5145846a148e145b400125ab62b2479562bd4 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Fri, 30 Nov 2018 12:24:31 +0100
Subject: [PATCH] Reset subtrees
Add 'src/vitis/' from commit '943bb3de12710adb7e371b511ec8863220201a66'
git-subtree-dir: src/vitis
git-subtree-mainline: e5a8168befb90ae7be327bebb18173c37492bba0
git-subtree-split: 943bb3de12710adb7e371b511ec8863220201a66
Add 'src/closure/' from commit 'd9f2f97e212dadeff0df8288b4f829e9b2a75845'
git-subtree-dir: src/closure
git-subtree-mainline: 7784e4ee6e110736d17c310a794e7d1ddca74fc4
git-subtree-split: d9f2f97e212dadeff0df8288b4f829e9b2a75845
Add 'src/module_vmap/' from commit '0fb7dbb73975626beb1d47e40a1d637fe7ee6e2b'
git-subtree-dir: src/module_vmap
git-subtree-mainline: 42b5722eb0d1c238c3ece2aa10829356b03234c7
git-subtree-split: 0fb7dbb73975626beb1d47e40a1d637fe7ee6e2b
Add 'src/module_vm4ms/' from commit '4dc05bee1be6374d4e1120b16050337e63a946e9'
git-subtree-dir: src/module_vm4ms
git-subtree-mainline: 4b03db759f4316c0a6dd933daa844b921fc33543
git-subtree-split: 4dc05bee1be6374d4e1120b16050337e63a946e9
Add 'src/module_anc/' from commit '0d85aba18a9fbe6e45005da571284fbbf8ae5783'
git-subtree-dir: src/module_anc
git-subtree-mainline: f49d3613bf630edd0ae4149fb3a03f2e1944606c
git-subtree-split: 0d85aba18a9fbe6e45005da571284fbbf8ae5783
Add 'src/module_cadastreV2/' from commit 'f20650beab97e95d65f1e29de8a13e909a6247b6'
git-subtree-dir: src/module_cadastreV2
git-subtree-mainline: 6e6e9dd32386b8bf425d0db8c4b971df2c3fcb26
git-subtree-split: f20650beab97e95d65f1e29de8a13e909a6247b6
Add 'src/module_cadastre/' from commit '6f47569547c2a3caca75d7a788de7d635a0bf3eb'
git-subtree-dir: src/module_cadastre
git-subtree-mainline: f78917834f68ac08f48e06efb0b962c9b9cd9314
git-subtree-split: 6f47569547c2a3caca75d7a788de7d635a0bf3eb
---
src/closure/.gitignore | 1 +
.../javascript/app/vmap/map/mapcompare.js | 17 ++++-------------
2 files changed, 5 insertions(+), 13 deletions(-)
create mode 100644 src/closure/.gitignore
diff --git a/src/closure/.gitignore b/src/closure/.gitignore
new file mode 100644
index 00000000..240fb1c7
--- /dev/null
+++ b/src/closure/.gitignore
@@ -0,0 +1 @@
+conf/depswriter/*.pyc
diff --git a/src/module_vmap/module/javascript/app/vmap/map/mapcompare.js b/src/module_vmap/module/javascript/app/vmap/map/mapcompare.js
index 54e49269..b3304a3c 100644
--- a/src/module_vmap/module/javascript/app/vmap/map/mapcompare.js
+++ b/src/module_vmap/module/javascript/app/vmap/map/mapcompare.js
@@ -592,11 +592,11 @@ nsVmap.MapCompare.prototype.mapCompareController.prototype.synchronizeMap = func
var this_ = this;
// Synchro Échelle
- $(this_.map.getTargetElement()).on('mouseleave', function(){
+ this_.map.getTargetElement().addEventListener('mouseleave', function(){
oVmap.getMap().getOLMap().on("moveend", this_.updateCompareScaleMap, this_);
this_.map.un("moveend", this_.updateScaleMap, this_);
});
- $(this_.map.getTargetElement()).on('mouseenter', function(){
+ this_.map.getTargetElement().addEventListener('mouseenter', function(){
oVmap.getMap().getOLMap().un("moveend", this_.updateCompareScaleMap, this_);
this_.map.on("moveend", this_.updateScaleMap, this_);
});
@@ -664,20 +664,13 @@ nsVmap.MapCompare.prototype.mapCompareController.prototype.synchronizeMap = func
this_.targetOverlay_.setPosition(convertCoord);
});
-
- // Si la souris n'est pas sur la carte comparée, déclenche un mouseleave
- if (!$(this_.map.getTargetElement()).is(':hover')) {
- $(this_.map.getTargetElement()).trigger('mouseleave');
- }
};
/**
* Update the map extent with animation
* @returns {undefined}
*/
-nsVmap.MapCompare.prototype.mapCompareController.prototype.updateCompareScaleMap = function(e) {
- oVmap.log('nsVmap.MapCompare.updateCompareScaleMap');
-
+nsVmap.MapCompare.prototype.mapCompareController.prototype.updateCompareScaleMap = function(e) { console.log('updateCompareScaleMap');
var this_ = this
this_.updateCenterCompareMap();
oVmap.getMapCompare().setScale(oVmap.getMap().getScale());
@@ -689,9 +682,7 @@ nsVmap.MapCompare.prototype.mapCompareController.prototype.updateCompareScaleMap
* Update the map extent with animation
* @returns {undefined}
*/
-nsVmap.MapCompare.prototype.mapCompareController.prototype.updateScaleMap = function(e) {
- oVmap.log('nsVmap.MapCompare.updateScaleMap');
-
+nsVmap.MapCompare.prototype.mapCompareController.prototype.updateScaleMap = function(e) { console.log('updateScaleMap');
var this_ = this
this_.updateCenterMap();
oVmap.getMap().setScale(oVmap.getMapCompare().getScale());
--
GitLab