@eclipse-scout/core 22.0.0 → 22.0.10

package/src/login/LoginBox.js

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
@@ -56,6 +56,7 @@ export default class LoginBox extends Box {
     if (this.messageKey) {
       this.$message = $('<div>')
         .attr('id', 'message-box')
+        .addClass('message-box')
         .html(strings.nl2br(this.texts.get(this.messageKey)))
         .appendTo(this.$form);
     }

package/src/login/LoginBox.less

@@ -3,7 +3,7 @@
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
@@ -19,6 +19,11 @@
 
   & > .button {
     margin-top: 16px;
+    margin-bottom: 0;
+  }
+
+  & > .message-box {
+    margin: 0 20px 12px 20px;
   }
 
   & > input.alternative:-webkit-autofill {
@@ -53,18 +58,20 @@
  */
 .login-button.default {
 
-  &.login-error {
-    border-color: @palette-red-4;
-    background-color: @palette-red-4;
+  &.login-error:not(.disabled) {
+    border-color: transparent;
+    background-color: @error-color;
 
     &:hover {
-      background-color: @palette-red-4;
-      border-color: @palette-red-4;
+      background-color: @error-default-button-background-hover-color;
     }
 
     &:active {
-      border-color: @palette-red-4;
-      background-color: darken(@palette-red-4, 5%);
+      background-color: @error-default-button-background-active-color;
+    }
+
+    &:focus {
+      #scout.focus-border(@box-shadow-color: @error-focus-box-shadow-color, @border-color: mix(@error-color, @error-focus-box-shadow-color, 25%));
     }
   }
 
@@ -91,3 +98,15 @@
     #scout.animation(nop 0.05s);
   }
 }
+
+@media (max-width: @box-responsive-width) {
+  .login-box-content > form {
+    & > .message-box,
+    & > input,
+    & > .button {
+      width: 100%;
+      margin-left: 0;
+      margin-right: 0;
+    }
+  }
+}

package/src/menu/ContextMenuPopup.less

@@ -53,14 +53,21 @@
     &.selected {
       background-color: @item-selection-background-color;
 
+      &.has-popup {
+        color: @context-menu-item-color;
+
+        &.disabled {
+          color: @menu-item-disabled-color;
+          background-color: @item-selection-background-color;
+        }
+      }
+
       & > .submenu-icon {
         transform: none;
       }
     }
 
     &.expanded {
-      color: @active-color;
-
       & > .submenu-icon {
         #scout.submenu-icon-open();
       }

package/src/menu/Menu.less

@@ -86,6 +86,7 @@
 
   & > .text {
     #scout.overflow-ellipsis-nowrap();
+    margin-top: @text-margin-top;
   }
 
   & > .font-icon {

package/src/menu/MenuExecKeyStroke.js

@@ -8,26 +8,12 @@
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
-import {keys, KeyStroke} from '../index';
+import {ActionExecKeyStroke} from '../index';
 
-export default class MenuExecKeyStroke extends KeyStroke {
+export default class MenuExecKeyStroke extends ActionExecKeyStroke {
 
   constructor(menu) {
-    super();
-    this.field = menu;
-    this.which = [keys.SPACE, keys.ENTER];
-    this.stopPropagation = true;
-
+    super(menu);
     this.renderingHints.offset = 16;
-    this.renderingHints.$drawingArea = function($drawingArea, event) {
-      return this.field.$container;
-    }.bind(this);
-  }
-
-  /**
-   * @override KeyStroke.js
-   */
-  handle(event) {
-    this.field.doAction();
   }
 }

package/src/menu/MenuNavigationKeyStroke.js

@@ -15,6 +15,7 @@ export default class MenuNavigationKeyStroke extends KeyStroke {
   constructor(popup) {
     super();
     this.field = popup;
+    this.inheritAccessibility = false;
   }
 
   _accept(event) {

package/src/menu/menubar/MenuBarLeftKeyStroke.js

@@ -12,6 +12,7 @@ import {keys, KeyStroke} from '../../index';
 
 export default class MenuBarLeftKeyStroke extends KeyStroke {
 
+  // noinspection DuplicatedCode
   constructor(menuBar) {
     super();
     this.field = menuBar;
@@ -19,6 +20,7 @@ export default class MenuBarLeftKeyStroke extends KeyStroke {
     this.renderingHints.render = false;
     this.stopPropagation = true;
     this.keyStrokeMode = KeyStroke.Mode.DOWN;
+    this.inheritAccessibility = false;
   }
 
   handle(event) {

package/src/menu/menubar/MenuBarRightKeyStroke.js

@@ -12,6 +12,7 @@ import {keys, KeyStroke} from '../../index';
 
 export default class MenuBarRightKeyStroke extends KeyStroke {
 
+  // noinspection DuplicatedCode
   constructor(menuBar) {
     super();
     this.field = menuBar;
@@ -19,6 +20,7 @@ export default class MenuBarRightKeyStroke extends KeyStroke {
     this.renderingHints.render = false;
     this.stopPropagation = true;
     this.keyStrokeMode = KeyStroke.Mode.DOWN;
+    this.inheritAccessibility = false;
   }
 
   handle(event) {

package/src/messagebox/MessageBox.less

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -22,6 +22,22 @@
     border-radius: 0;
   }
 
+  &.full-width {
+    & > .messagebox-buttons {
+      padding-left: 10px;
+      padding-right: 10px;
+
+      & > .box-button {
+        min-width: 70px; /* less min width for buttons on small screens */
+        margin-right: 8px;
+
+        &:last-child {
+          margin-right: 0;
+        }
+      }
+    }
+  }
+
   .severity-button(@color, @hover-color: darken(@color, 6%), @active-color: darken(@color, 13%), @focus-color: @focus-box-shadow-color) {
     & > .box-buttons > .box-button {
       border-color: @color;
@@ -88,7 +104,7 @@
       }
     }
 
-    .severity-button(@error-color, @focus-color: @error-focus-box-shadow-color);
+    .severity-button(@error-color, @error-default-button-background-hover-color, @error-default-button-background-active-color, @error-focus-box-shadow-color);
   }
 
   &.warning {
@@ -100,7 +116,7 @@
       }
     }
 
-    .severity-button(@warning-color, @focus-color: @warning-focus-box-shadow-color);
+    .severity-button(@warning-color, @warning-default-button-background-hover-color, @warning-default-button-background-active-color, @warning-focus-box-shadow-color);
   }
 
   &.ok {
@@ -112,7 +128,7 @@
       }
     }
 
-    .severity-button(@ok-color, @focus-color: @ok-focus-box-shadow-color);
+    .severity-button(@ok-color, @ok-default-button-background-hover-color, @ok-default-button-background-active-color, @ok-focus-box-shadow-color);
   }
 
   &.animate-open {
@@ -225,23 +241,7 @@
 
 @media (max-width: @messagebox-max-width) {
   .messagebox {
-    /* reduce message box width on small screens */
-    max-width: 330px;
     /* no need to have a margin on small screens */
     margin: 0;
-
-    & > .messagebox-buttons {
-      padding-left: 10px;
-      padding-right: 10px;
-
-      & > .box-button {
-        min-width: 70px; /* less min width for buttons on small screens */
-        margin-right: 8px;
-
-        &:last-child {
-          margin-right: 0;
-        }
-      }
-    }
   }
 }

package/src/modeselector/Mode.less

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -9,10 +9,14 @@
  *     BSI Business Systems Integration AG - initial API and implementation
  */
 .mode {
-  border: @mode-border-width solid @control-border-color;
+  --padding-x: @mode-padding-x;
+  --padding-y: @mode-padding-y;
+  --border-width: @mode-border-width;
+
+  border: var(--border-width) solid @control-border-color;
   border-radius: 0;
   flex: 1 1 0;
-  padding: @mode-padding-y @mode-padding-x;
+  padding: var(--padding-y) var(--padding-x);
   #scout.overflow-ellipsis();
 
   &.first {
@@ -29,12 +33,12 @@
 
   &:not(.last):not(.selected) {
     border-right: none;
-    padding-right: @mode-padding-x + @mode-border-width; /* account for the missing border, so that text does not jump */
+    padding-right: calc(var(--padding-x) + var(--border-width)); /* account for the missing border, so that text does not jump */
   }
 
   &.after-selected {
     border-left: none;
-    padding-left: @mode-padding-x + @mode-border-width; /* account for the missing border, so that text does not jump */
+    padding-left: calc(var(--padding-x) + var(--border-width)); /* account for the missing border, so that text does not jump */
   }
 
   // override button (the selected mode cannot be clicked. therefore do not show hover and active colors)
@@ -68,28 +72,20 @@
 }
 
 .mode-selector.alternative {
-  border: @mode-alternative-border-width solid transparent;
 
   & > .mode {
+    --border-width: 0px;
+
     color: @mode-color;
-    border: none;
     background-color: transparent;
     border-radius: @button-border-radius;
 
-    &:not(.last):not(.selected) {
-      padding-right: @mode-padding-x;
-    }
-
-    &.after-selected {
-      padding-left: @mode-padding-x;
-    }
-
     &:hover {
-      background-color: rgba(0, 0, 0, 0.05);
+      background-color: @mode-alternative-hover-background-color;
     }
 
     &:active {
-      background-color: rgba(0, 0, 0, 0.1);
+      background-color: @mode-alternative-active-background-color;
     }
 
     &.selected {
@@ -120,26 +116,8 @@
 }
 
 .dense .mode-selector {
-
   & > .mode {
-    padding: @mode-padding-dense;
-
-    &:not(.last):not(.selected) {
-      padding-right: @mode-padding-dense-x + @mode-border-width; /* account for the missing border, so that text does not jump */
-    }
-
-    &.after-selected {
-      padding-left: @mode-padding-dense-x + @mode-border-width; /* account for the missing border, so that text does not jump */
-    }
-  }
-
-  &.alternative > .mode {
-    &:not(.last):not(.selected) {
-      padding-right: @mode-padding-dense-x;
-    }
-
-    &.after-selected {
-      padding-left: @mode-padding-dense-x;
-    }
+    --padding-x: @mode-padding-dense-x;
+    --padding-y: @mode-padding-dense-y;
   }
 }

package/src/modeselector/ModeSelector.js

@@ -133,7 +133,7 @@ export default class ModeSelector extends Widget {
     let selectedModePosX = 0, selectedModeWidth = 0;
     if (this.selectedMode && this.selectedMode.$container) {
       selectedModePosX = graphics.position(this.selectedMode.$container).x;
-      selectedModeWidth = graphics.size(this.selectedMode.$container).width;
+      selectedModeWidth = graphics.size(this.selectedMode.$container, {exact: true}).width;
     }
     this.$slider.cssLeft(selectedModePosX);
     this.$slider.cssWidth(selectedModeWidth);

package/src/modeselector/ModeSelector.less

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -22,6 +22,7 @@
   &.alternative {
     background-color: @mode-alternative-background-color;
     border-radius: @button-border-radius;
+    border: @mode-selector-alternative-border-width solid transparent;
 
     &:not(.disabled) > .mode-slider {
       display: block;

package/src/planner/Planner.js

@@ -1533,6 +1533,8 @@ export default class Planner extends Widget {
       this._renderViewRange();
       this._rerenderActivities();
       this._renderSelectedActivity();
+      this.validateLayoutTree(); // Layouting is required for adjusting the scroll position
+      this._reconcileScrollPos();
     }
   }
 

package/src/planner/PlannerHeader.less

@@ -97,7 +97,8 @@
 }
 
 .planner-mode {
-  width: 65px;
+  padding: 0 8px;
+  min-width: 65px;
   text-align: center;
   border-top: 1px solid @control-border-color;
   border-bottom: 1px solid @control-border-color;

package/src/popup/Popup.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
-import {CloseKeyStroke, DialogLayout, Dimension, Event, FocusRule, GlassPaneRenderer, graphics, HtmlComponent, Insets, KeyStrokeContext, Point, PopupLayout, Rectangle, scout, scrollbars, strings, Widget} from '../index';
+import {CloseKeyStroke, DialogLayout, Dimension, Event, FocusRule, GlassPaneRenderer, graphics, HtmlComponent, Insets, KeyStrokeContext, Point, PopupLayout, Rectangle, scout, scrollbars, strings, Widget, widgets} from '../index';
 import $ from 'jquery';
 
 export default class Popup extends Widget {
@@ -185,18 +185,17 @@ export default class Popup extends Widget {
 
   _openWithoutParent() {
     // resolve parent for entry-point (don't change the actual property)
-    let parent = this.parent;
-    if (parent.destroyed) {
+    if (this.parent.destroyed) {
       return;
     }
-    if (parent.rendered || parent.rendering) {
-      this.open(parent.entryPoint());
+    if (this.parent.rendered || this.parent.rendering) {
+      this.open(this._getDefaultOpen$Parent());
       return;
     }
 
     // This is important for popups rendered in another (native) browser window. The DOM in the popup window
     // is rendered later, so we must wait until that window is rendered and layouted. See popup-window.html.
-    parent.one('render', () => {
+    this.parent.one('render', () => {
       this.session.layoutValidator.schedulePostValidateFunction(() => {
         if (this.destroyed || this.rendered) {
           return;
@@ -206,6 +205,14 @@ export default class Popup extends Widget {
     });
   }
 
+  /**
+   * Only called if parent.rendered or parent.rendering
+   * @return {$}
+   */
+  _getDefaultOpen$Parent() {
+    return this.parent.entryPoint();
+  }
+
   open($parent) {
     if (!$parent) {
       this._openWithoutParent();
@@ -442,6 +449,15 @@ export default class Popup extends Widget {
     return cssClass;
   }
 
+  _animateRemovalWhileRemovingParent() {
+    if (!this.$anchor) {
+      // Allow remove animations for popups without an anchor
+      return true;
+    }
+    // If parent is the anchor, prevent remove animation to ensure popup will be removed together with the anchor
+    return widgets.get(this.$anchor) !== this.parent;
+  }
+
   _isRemovalPrevented() {
     // If removal of a parent is pending due to an animation then don't return true to make sure popups are closed before the parent animation starts.
     // However, if the popup itself is removed by an animation, removal should be prevented to ensure remove() won't run multiple times.
@@ -1037,7 +1053,7 @@ export default class Popup extends Widget {
 
   _handleGlassPanes() {
     let parentCoveredByGlassPane = this.session.focusManager.isElementCovertByGlassPane(this.parent.$container);
-    // if a popup is covered by a glass pane the glass pane's need to be rerendered to ensure a glass pane is also painted over the popup
+    // if a popup is covered by a glass pane the glass pane's need to be re-rendered to ensure a glass pane is also painted over the popup
     if (parentCoveredByGlassPane) {
       this.session.focusManager.rerenderGlassPanes();
     }

package/src/popup/PopupLayout.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2020 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -135,9 +135,6 @@ export default class PopupLayout extends AbstractLayout {
    * @returns {Dimension}
    */
   _calcMaxSize() {
-    // Position the popup at the desired location before doing any calculations to consider the preferred bounds
-    this._position(false);
-
     let maxWidth, maxHeight,
       htmlComp = this.popup.htmlComp,
       windowPaddingX = this.popup.windowPaddingX,
@@ -159,7 +156,7 @@ export default class PopupLayout extends AbstractLayout {
       horizontalAlignment = this.popup.horizontalAlignment,
       verticalAlignment = this.popup.verticalAlignment;
 
-    // Decide whether the prefSize can be used or the popup needs to be shrinked so that it fits into the viewport
+    // Decide whether the prefSize can be used or the popup needs to be shrunken so that it fits into the viewport
     // The decision is based on the preferred opening direction
     // Example: The popup would like to be opened leftedge and bottom
     // If there is enough space on the right and on the bottom -> pref size is used
@@ -219,9 +216,6 @@ export default class PopupLayout extends AbstractLayout {
    * @returns {Insets}
    */
   _calcMaxSizeAroundAnchor() {
-    // Position the popup at the desired location before doing any calculations because positioning adds CSS classes which might change margins
-    this._position(false);
-
     let maxWidthLeft, maxWidthRight, maxHeightDown, maxHeightUp,
       htmlComp = this.popup.htmlComp,
       windowPaddingX = this.popup.windowPaddingX,

package/src/scrollbar/Scrollbar.less

@@ -133,7 +133,7 @@
   transition: box-shadow 250ms;
   position: absolute;
   pointer-events: none;
-  z-index: 1; // ensure shadow layout over elements having a z-index
+  z-index: 1; // ensure shadow lays over elements having a z-index
 
   #scout.scroll-shadow();
 
@@ -157,6 +157,13 @@
     --scroll-shadow-size: @scroll-shadow-size;
     --scroll-shadow-blur: @scroll-shadow-blur;
     --scroll-shadow-spread: @scroll-shadow-spread;
+
+    // Allow a widget to adjust the size of the shadow container
+    --scroll-shadow-inset-top: 0;
+    --scroll-shadow-inset-right: 0;
+    --scroll-shadow-inset-bottom: 0;
+    --scroll-shadow-inset-left: 0;
+
     @scroll-shadow-blur-spread-color: var(--scroll-shadow-blur) calc(-1 * var(--scroll-shadow-spread)) var(--scroll-shadow-color);
     @scroll-shadow-top: inset 0 var(--scroll-shadow-size) @scroll-shadow-blur-spread-color;
     @scroll-shadow-bottom: inset 0 calc(-1 * var(--scroll-shadow-size)) @scroll-shadow-blur-spread-color;

package/src/scrollbar/scrollbars.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
-import {arrays, Device, graphics, HtmlComponent, objects, scout} from '../index';
+import {arrays, Device, graphics, HtmlComponent, Insets, objects, scout} from '../index';
 import $ from 'jquery';
 
 /**
@@ -159,6 +159,17 @@ export function installScrollShadow($container, session, options) {
   _installMutationObserver(session);
   _installIntersectionObserver();
   intersectionObserver.observe($container[0]);
+
+  // this is required in addition to the intersection observer because the observer events are handled asynchronously later after all the setTimeout calls.
+  // Then the shadow might stay visible too long which has an impact on layout updates.
+  let containerElement = $container[0];
+  let visibleListener = e => {
+    if (e.target === containerElement) {
+      _onScrollableVisibleChange(containerElement, e.type === 'show');
+    }
+  };
+  $container.data('scroll-shadow-visible-listener', visibleListener);
+  $container.on('hide show', visibleListener);
 }
 
 export function uninstallScrollShadow($container, session) {
@@ -177,6 +188,10 @@ export function uninstallScrollShadow($container, session) {
   if (intersectionObserver) {
     intersectionObserver.unobserve($container[0]);
   }
+  let visibleListener = $container.data('scroll-shadow-visible-listener');
+  if (visibleListener) {
+    $container.off('hide show', visibleListener);
+  }
   let $scrollables = _$scrollables[session];
   if (!$scrollables || !$scrollables.some($scrollable => $scrollable.data('scroll-shadow'))) {
     _uninstallMutationObserver();
@@ -237,7 +252,7 @@ export function updateScrollShadow($container) {
   $shadow.toggleClass('bottom', !atBottom && style.indexOf('bottom') > -1);
   $shadow.toggleClass('left', !atLeft && style.indexOf('left') > -1);
   $shadow.toggleClass('right', !atRight && style.indexOf('right') > -1);
-  graphics.setBounds($shadow, graphics.bounds($container, {exact: true}));
+  graphics.setBounds($shadow, graphics.bounds($container, {exact: true}).subtract(insets($shadow)));
   graphics.setMargins($shadow, graphics.margins($container));
   $shadow.css('border-radius', $container.css('border-radius'));
 
@@ -253,6 +268,13 @@ export function updateScrollShadow($container) {
   function atEnd(scrollPos, scrollSize, offsetSize) {
     return scrollPos + 1 >= scrollSize - offsetSize;
   }
+
+  function insets($shadow) {
+    return new Insets($shadow.cssPxValue('--scroll-shadow-inset-top'),
+      $shadow.cssPxValue('--scroll-shadow-inset-right'),
+      $shadow.cssPxValue('--scroll-shadow-inset-bottom'),
+      $shadow.cssPxValue('--scroll-shadow-inset-left'));
+  }
 }
 
 /**
@@ -726,7 +748,7 @@ export function scrollToBottom($scrollable, options) {
 /**
  * @param location object with x and y properties
  * @param $scrollables one or more scrollables to check against
- * @eturns {boolean} true if the location is visible in the current viewport of all the $scrollables, or if $scrollables is null
+ * @returns {boolean} true if the location is visible in the current viewport of all the $scrollables, or if $scrollables is null
  */
 export function isLocationInView(location, $scrollables) {
   if (!$scrollables || $scrollables.length === 0) {

package/src/session/Session.js

@@ -8,7 +8,7 @@
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
-import {AjaxCall, App, arrays, BackgroundJobPollingStatus, BackgroundJobPollingSupport, Device, EventSupport, FileInput, files as fileUtil, FocusManager, fonts, icons, LayoutValidator, Locale, MessageBox, ModelAdapter, NullWidget, ObjectFactory, objects, Reconnector, RemoteEvent, ResponseQueue, scout, Status, strings, TextMap, texts, TypeDescriptor, URL, UserAgent, webstorage} from '../index';
+import {AjaxCall, App, arrays, BackgroundJobPollingStatus, BackgroundJobPollingSupport, Device, EventSupport, FileInput, files as fileUtil, FocusManager, fonts, icons, LayoutValidator, Locale, logging, MessageBox, ModelAdapter, NullWidget, ObjectFactory, objects, Reconnector, RemoteEvent, ResponseQueue, scout, Status, strings, TextMap, texts, TypeDescriptor, URL, UserAgent, webstorage} from '../index';
 import $ from 'jquery';
 
 export default class Session {
@@ -1364,13 +1364,16 @@ export default class Session {
   }
 
   /**
-   * Sends a request containing the error message for logging purpose.
-   * The request is sent immediately (does not await pending requests)
+   * Sends a request containing the log message for logging purpose.
+   * The request is sent immediately (does not await pending requests).
+   * @param {string} message the log message
+   * @param {logging.Level} [level] the log level used to log the message. Default is {@link logging.Level.ERROR}.
    */
-  sendLogRequest(message) {
+  sendLogRequest(message, level) {
     let request = this._newRequest({
       log: true,
-      message: message
+      message: message,
+      level: scout.nvl(level, logging.Level.ERROR)
     });
     if (this.currentEvent) {
       request.event = {