Fix mviewer#157 (comment)

jdev-org · May 25, 2023 · f971c6a · f971c6a
1 parent 15226e7
commit f971c6a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/js/mviewerstudio.js b/js/mviewerstudio.js
@@ -678,9 +678,9 @@ var getConfig = () => {
         'coordinates="'+($('#opt-coordinates').prop('checked')=== true)+'"',
         'measuretools="'+($('#opt-measuretools').prop('checked')=== true)+'"',
         'mouseposition="'+($('#opt-mouseposition').prop('checked')=== true)+'"',
-        'geoloc="'+($('#opt-geoloc').prop('checked')=== true)+'"',
-        'studio="'+studioUrl+'"',        
-        'togglealllayersfromtheme="'+($('#opt-togglealllayersfromtheme').prop('checked')=== true)+'"'];
+        'geoloc="' + ($('#opt-geoloc').prop('checked') === true) + '"',
+        'studio="' + studiourl + '"',
+        'togglealllayersfromtheme="' + ($('#opt-togglealllayersfromtheme').prop('checked') === true) + '"'];
 
     config.title = $("#opt-title").val();
 

diff --git a/lib/mv.js b/lib/mv.js
@@ -1251,7 +1251,11 @@ var mv = (function () {
                     savedParameters.application.push(parameter);
                 }
             });
+<<<<<<< HEAD
             ["title", "logo", "help", "style", "home", "favicon", "icon-help", "studio"].forEach(function (value, id) {
+=======
+            ["title", "logo", "help", "style", "home", "favicon", "icon-help", "studio"].forEach(function(value,id) {
+>>>>>>> f461c0f (Fix https://github.com/mviewer/mviewerstudio/issues/157#issuecomment-1466096152)
                 if (application.attr(value)) {
                     $("#opt-" + value).val(application.attr(value)).trigger("change");
                 }
@@ -1260,6 +1264,16 @@ var mv = (function () {
                 }
                 if (value === "studio" && application.attr(value) != 'false') {
                     $("#opt-studio").prop("checked", true);
+<<<<<<< HEAD
+=======
+                }
+            });
+
+            ["exportpng","zoomtools", "measuretools", "showhelp", "coordinates",  "mouseposition", "geoloc", "initialextenttool",
+                "togglealllayersfromtheme"].forEach(function(value,id) {
+                if (application.attr(value) && application.attr(value) === "true") {
+                    $("#opt-" + value).prop("checked", true);
+>>>>>>> f461c0f (Fix https://github.com/mviewer/mviewerstudio/issues/157#issuecomment-1466096152)
                 }
             });