Slightly change how scalebar is reloaded

riatelab · Jun 10, 2017 · 45a38a3 · 45a38a3
1 parent b43089e
commit 45a38a3
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 5 deletions.
diff --git a/...app/static/css/style.7047e0a53d2c.min.css → ...app/static/css/style.fe422493834d.min.css b/...app/static/css/style.7047e0a53d2c.min.css → ...app/static/css/style.fe422493834d.min.css
diff --git a/magrit_app/static/js/app.7047e0a53d2c.js → magrit_app/static/js/app.fe422493834d.js b/magrit_app/static/js/app.7047e0a53d2c.js → magrit_app/static/js/app.fe422493834d.js
@@ -1101,7 +1101,7 @@ function parseQuery(search) {
     lng: lang,
     fallbackLng: existing_lang[0],
     backend: {
-      loadPath: 'static/locales/{{lng}}/translation.7047e0a53d2c.json'
+      loadPath: 'static/locales/{{lng}}/translation.fe422493834d.json'
     }
   }, function (err, tr) {
     if (err) {
@@ -15686,7 +15686,13 @@ function apply_user_preferences(json_pref) {
         scaleBar.x = map_config.layout_features.scale_bar.x;
         scaleBar.y = map_config.layout_features.scale_bar.y;
         scaleBar.Scale._groups[0][0].setAttribute('transform', map_config.layout_features.scale_bar.transform);
-        scaleBar.update(); //scaleBar.resize();
+        // We should be able to avoid this condition and always use the same method
+        // but while waiting to test it more it may be safer to do it that way
+        if (scaleBar.fixed_size === false) {
+          scaleBar.update();
+        } else {
+          scaleBar.resize();
+        }
       }
       if (map_config.layout_features.north_arrow) {
         northArrow.display();

diff --git a/magrit_app/static/js/map_project.js b/magrit_app/static/js/map_project.js
@@ -498,7 +498,13 @@ function apply_user_preferences(json_pref){
         scaleBar.x = map_config.layout_features.scale_bar.x;
         scaleBar.y = map_config.layout_features.scale_bar.y;
         scaleBar.Scale._groups[0][0].setAttribute('transform', map_config.layout_features.scale_bar.transform);
-        scaleBar.update(); //scaleBar.resize();
+        // We should be able to avoid this condition and always use the same method
+        // but while waiting to test it more it may be safer to do it that way
+        if (scaleBar.fixed_size === false) {
+          scaleBar.update();
+        } else {
+          scaleBar.resize();
+        }
       }
       if (map_config.layout_features.north_arrow) {
         northArrow.display();

diff --git a/.../locales/en/translation.7047e0a53d2c.json → .../locales/en/translation.fe422493834d.json b/.../locales/en/translation.7047e0a53d2c.json → .../locales/en/translation.fe422493834d.json
diff --git a/.../locales/es/translation.7047e0a53d2c.json → .../locales/es/translation.fe422493834d.json b/.../locales/es/translation.7047e0a53d2c.json → .../locales/es/translation.fe422493834d.json
diff --git a/.../locales/fr/translation.7047e0a53d2c.json → .../locales/fr/translation.fe422493834d.json b/.../locales/fr/translation.7047e0a53d2c.json → .../locales/fr/translation.fe422493834d.json
diff --git a/magrit_app/templates/modules.html b/magrit_app/templates/modules.html
@@ -7,7 +7,7 @@
     <title> {{ app_name }} </title>
     <link rel="icon" type="image/png" href="static/img/favicon.png" />
     <link href="static/css/scoped-bootstrap.min.css" rel="stylesheet" type="text/css">
-	<link href="static/css/style.7047e0a53d2c.min.css" rel="stylesheet"  type="text/css">
+	<link href="static/css/style.fe422493834d.min.css" rel="stylesheet"  type="text/css">
     <link href="static/css/vanilla-dataTables.min.css" rel="stylesheet" type="text/css">
     <link href="static/css/alertify.min.css" rel="stylesheet" type="text/css">
     <link href="static/css/semantic.min.css" rel="stylesheet" type="text/css">
@@ -51,6 +51,6 @@
         </div>
       </noscript>
     <script  src="static/js/lib/bootstrap-native3.mod.min.js"></script>
-	<script  src="static/js/app.7047e0a53d2c.js"></script>
+	<script  src="static/js/app.fe422493834d.js"></script>
 </body>
 </html>