fixed a regression when hiding the toolbar from web.config

cedrozor · Nov 13, 2020 · 86c6d9c · 86c6d9c
1 parent 87534d1
commit 86c6d9c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Myrtille.Web/js/display.js b/Myrtille.Web/js/display.js
@@ -129,7 +129,11 @@ function Display(base, config, dialog)
                 }
 
                 // image quality selector
-                document.getElementById('imageQuality').value = config.getImageQuality();
+                var imageQuality = document.getElementById('imageQuality');
+                if (imageQuality != null)
+                {
+                    imageQuality.value = config.getImageQuality();
+                }
 
                 // reasonable number of images to display when using divs
                 dialog.showStat(dialog.getShowStatEnum().IMAGE_COUNT_OK, (config.getDisplayMode() == config.getDisplayModeEnum().CANVAS ? 'N/A' : config.getImageCountOk()));

diff --git a/Myrtille.Web/js/user/mouse.js b/Myrtille.Web/js/user/mouse.js
@@ -74,7 +74,7 @@ function Mouse(base, config, dialog, display, network, user)
         mouseY = (e.pageY ? e.pageY : e.clientY + scrollTop) - display.getVerticalOffset();
 
         // the mouse event is within the toolbar area
-        if (mouseY <= toolbar.clientHeight)
+        if (toolbar != null && mouseY <= toolbar.clientHeight)
             return false;
 
         //dialog.showDebug('mouse X: ' + mouseX + ', Y: ' + mouseY);