@eclipse-scout/core 22.0.2 → 22.0.10

package/dist/file-list

@@ -1,7 +1,7 @@
-eclipse-scout-core-c98fb5230e71dcec75ce.min.js
-eclipse-scout-core-c98fb5230e71dcec75ce.min.js.map
-eclipse-scout-core-theme-6b2fef56e9e49231a49c.min.css
-eclipse-scout-core-theme-dark-d2bb274dd42f132bfca0.min.css
+eclipse-scout-core-e5e8740e3649f5b9f279.min.js
+eclipse-scout-core-e5e8740e3649f5b9f279.min.js.map
+eclipse-scout-core-theme-74b63e0d57bed407a729.min.css
+eclipse-scout-core-theme-dark-b82aea152f416e38ce7f.min.css
 eclipse-scout-core-theme-dark.css
 eclipse-scout-core-theme-dark.css.map
 eclipse-scout-core-theme.css

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-scout/core",
-  "version": "22.0.2",
+  "version": "22.0.10",
   "description": "Eclipse Scout runtime",
   "author": "BSI Business Systems Integration AG",
   "homepage": "https://www.eclipse.org/scout",
@@ -26,7 +26,7 @@
     "src"
   ],
   "devDependencies": {
-    "@eclipse-scout/cli": "22.0.2",
+    "@eclipse-scout/cli": "22.0.10",
     "@eclipse-scout/releng": "^22.0.0",
     "jasmine-core": "3.10.1",
     "jasmine-ajax": "4.0.0",

package/src/ErrorHandler.js

@@ -8,7 +8,7 @@
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
-import {AjaxError, App, arrays, icons, NullLogger, scout, strings} from './index';
+import {AjaxError, App, arrays, icons, logging, NullLogger, scout, strings} from './index';
 import $ from 'jquery';
 import sourcemappedStacktrace from 'sourcemapped-stacktrace';
 
@@ -37,25 +37,41 @@ export default class ErrorHandler {
   // https://developer.mozilla.org/en-US/docs/Web/API/GlobalEventHandlers/onerror
   _onWindowError(errorMessage, fileName, lineNumber, columnNumber, error) {
     try {
+      if (this._isIgnorableScriptError(errorMessage, fileName, lineNumber, columnNumber, error)) {
+        this.handleErrorInfo({
+          log: `Ignoring error. Message: ${errorMessage}`,
+          level: logging.Level.INFO
+        });
+        return;
+      }
       if (error instanceof Error) {
         this.handle(error)
           .catch(error => {
             console.error('Error in global JavaScript error handler', error);
           });
-      } else {
-        let code = 'J00';
-        let log = errorMessage + ' at ' + fileName + ':' + lineNumber + '\n(' + 'Code ' + code + ')';
-        this.handleErrorInfo({
-          code: code,
-          message: errorMessage,
-          log: log
-        });
+        return;
       }
+      let code = 'J00';
+      let log = errorMessage + ' at ' + fileName + ':' + lineNumber + '\n(' + 'Code ' + code + ')';
+      this.handleErrorInfo({
+        code: code,
+        message: errorMessage,
+        log: log
+      });
     } catch (err) {
       throw new Error('Error in global JavaScript error handler: ' + err.message + ' (original error: ' + errorMessage + ' at ' + fileName + ':' + lineNumber + ')');
     }
   }
 
+  _isIgnorableScriptError(message, fileName, lineNumber, columnNumber, error) {
+    // Ignore errors caused by scripts from a different origin.
+    // Example: Firefox on iOS throws an error, probably caused by an internal Firefox script.
+    // The error does not affect the application and cannot be prevented by the app either since we don't know what script it is and what it does.
+    // In that case the error must no be shown to the user, instead just log it silently.
+    // https://developer.mozilla.org/en-US/docs/Web/API/GlobalEventHandlers/onerror
+    return message && message.toLowerCase().indexOf('script error') > -1 && !fileName && !lineNumber && !columnNumber && !error;
+  }
+
   /**
    * Handles unexpected JavaScript errors. The arguments are first analyzed and then handled.
    *
@@ -240,22 +256,9 @@ export default class ErrorHandler {
    * - If there is a scout session and the flag "sendError" is set, the error is sent to the UI server.
    */
   handleErrorInfo(errorInfo) {
+    errorInfo.level = scout.nvl(errorInfo.level, logging.Level.ERROR);
     if (this.logError && errorInfo.log) {
-      $.log.error(errorInfo.log);
-
-      // Note: when the null-logger is active it has already written the error to the console
-      // when the $.log.error function has been called above, so we don't have to log again here.
-      let writeToConsole = ErrorHandler.CONSOLE_OUTPUT;
-      if ($.log instanceof NullLogger) {
-        writeToConsole = false;
-      }
-      if (writeToConsole && window && window.console) {
-        if (window.console.error) {
-          window.console.error(errorInfo.log);
-        } else if (window.console.log) {
-          window.console.log(errorInfo.log);
-        }
-      }
+      this._logErrorInfo(errorInfo);
     }
 
     // Note: The error handler is installed globally and we cannot tell in which scout session the error happened.
@@ -263,16 +266,51 @@ export default class ErrorHandler {
     // multi-session-case (portlet), but currently there is no other way. Besides, this feature is not in use yet.
     if (App.get().sessions.length > 0) {
       let session = App.get().sessions[0];
-      if (this.displayError) {
+      if (this.displayError && errorInfo.level === logging.Level.ERROR) {
         this._showMessageBox(session, errorInfo.message, errorInfo.code, errorInfo.log);
       }
       if (this.sendError) {
-        this._sendErrorMessage(session, errorInfo.log);
+        this._sendErrorMessage(session, errorInfo.log, errorInfo.level);
       }
     }
     return errorInfo;
   }
 
+  _logErrorInfo(errorInfo) {
+    switch (errorInfo.level) {
+      case logging.Level.TRACE:
+        $.log.trace(errorInfo.log);
+        break;
+      case logging.Level.DEBUG:
+        $.log.debug(errorInfo.log);
+        break;
+      case logging.Level.INFO:
+        $.log.info(errorInfo.log);
+        break;
+      case logging.Level.WARN:
+        $.log.warn(errorInfo.log);
+        break;
+      default:
+        $.log.error(errorInfo.log);
+    }
+
+    // Note: when the null-logger is active it has already written the error to the console
+    // when the $.log.error function has been called above, so we don't have to log again here.
+    let writeToConsole = ErrorHandler.CONSOLE_OUTPUT;
+    if ($.log instanceof NullLogger) {
+      writeToConsole = false;
+    }
+    if (writeToConsole && window && window.console) {
+      if (errorInfo.level === logging.Level.ERROR && window.console.error) {
+        window.console.error(errorInfo.log);
+      } else if (errorInfo.level === logging.Level.WARN && window.console.warn) {
+        window.console.warn(errorInfo.log);
+      } else if (window.console.log) {
+        window.console.log(errorInfo.log);
+      }
+    }
+  }
+
   /**
    * Generate a "cool looking" error code from the JS error object, that
    * does not reveal too much technical information, but at least indicates
@@ -325,7 +363,7 @@ export default class ErrorHandler {
     session.showFatalMessage(options, errorCode);
   }
 
-  _sendErrorMessage(session, logMessage) {
-    session.sendLogRequest(logMessage);
+  _sendErrorMessage(session, logMessage, logLevel) {
+    session.sendLogRequest(logMessage, logLevel);
   }
 }

package/src/{table/TableHeaderMenuButtonKeyStroke.js → action/ActionExecKeyStroke.js}

@@ -10,13 +10,12 @@
  */
 import {keys, KeyStroke} from '../index';
 
-export default class TableHeaderMenuButtonKeyStroke extends KeyStroke {
+export default class ActionExecKeyStroke extends KeyStroke {
 
-  constructor(field) {
+  constructor(menu) {
     super();
-    this.field = field;
-    this.which = [keys.ENTER, keys.SPACE];
-    this.renderingHints.render = true;
+    this.field = menu;
+    this.which = [keys.SPACE, keys.ENTER];
     this.stopPropagation = true;
   }
 

package/src/box/Box.less

@@ -12,6 +12,8 @@
  * Used for static pages like login, logout, unsupported-browser and noscript section.
  * Note: This box must not depend on javascript because it is used for the noscript section as well.
  */
+@box-responsive-width: @box-width + 40px;
+
 .box {
   display: table;
   position: absolute;
@@ -39,7 +41,7 @@
     text-align: center;
 
     & > .logo {
-      margin-top: 5px;
+      margin-top: 4px;
       margin-bottom: 40px;
       max-height: 30px;
     }
@@ -64,13 +66,14 @@
   }
 }
 
-@media (max-width: (@box-width + 40px)) {
+@media (max-width: @box-responsive-width) {
   .box-content {
     & > .header > .logo {
-      margin-bottom: 20px;
+      margin-bottom: 30px;
+      margin-top: 0;
     }
 
-    padding: 20px;
+    padding: 40px;
     margin-left: 10px;
     margin-right: 10px;
   }
@@ -80,10 +83,11 @@
   .box-content {
     & > .header > .logo {
       margin-bottom: 20px;
+      margin-top: 0;
     }
 
-    padding-top: 20px;
-    padding-bottom: 20px;
+    padding-top: 25px;
+    padding-bottom: 25px;
   }
 }
 

package/src/breadcrumbbar/BreadcrumbItem.less

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2010-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
- * 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
@@ -15,6 +15,7 @@
   height: 100%;
   color: @link-color;
   font-size: @font-size-plus;
+  vertical-align: top;
 
   &.last {
     font-weight: bold;
@@ -24,10 +25,6 @@
     color: @link-hover-color;
   }
 
-  &.first {
-    vertical-align: top;
-  }
-
   &:not(.first)::before {
     #scout.font-icon();
     content: @icon-angle-right-bold;

package/src/checkbox/CheckBox.less

@@ -39,6 +39,7 @@
 #scout {
 
   .checkbox() {
+    cursor: pointer;
     position: relative;
     display: inline-block;
     text-align: center;
@@ -66,6 +67,7 @@
   }
 
   .checkbox-disabled() {
+    cursor: default;
     border-color: @check-box-disabled-border-color;
   }
 
@@ -94,4 +96,4 @@
     background-color: @check-box-checked-disabled-background-color;
     border-color: @check-box-checked-disabled-background-color;
   }
-}
+}

package/src/datepicker/DatePickerTouchPopup.js

@@ -63,4 +63,12 @@ export default class DatePickerTouchPopup extends TouchPopup {
     }
     this._touchField._triggerAcceptInput();
   }
+
+  /**
+   * @override
+   */
+  _acceptInput() {
+    this._field.acceptDate();
+    this.close();
+  }
 }

package/src/desktop/DisableBrowserF5ReloadKeyStroke.js

@@ -33,6 +33,7 @@ export default class DisableBrowserF5ReloadKeyStroke extends KeyStroke {
     this.preventDefault = true;
     this.keyStrokeFirePolicy = Action.KeyStrokeFirePolicy.ALWAYS; // ignore glass panes
     this.renderingHints.render = false;
+    this.inheritAccessibility = false;
   }
 
   /**

package/src/desktop/bench/DesktopTabSelectKeyStroke.js

@@ -8,7 +8,7 @@
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
-import {HAlign, keys, RangeKeyStroke} from '../../index';
+import {keys, RangeKeyStroke} from '../../index';
 
 /**
  * Composite keystroke to provide a numeric keystroke to select view tabs.
@@ -35,6 +35,7 @@ export default class DesktopTabSelectKeyStroke extends RangeKeyStroke {
       let viewIndex = event.which - keys['1'];
       return this._viewTabs()[viewIndex].$container;
     };
+    this.inheritAccessibility = false;
   }
 
   /**

package/src/desktop/desktoptab/DisableBrowserTabSwitchingKeyStroke.js

@@ -35,6 +35,7 @@ export default class DisableBrowserTabSwitchingKeyStroke extends RangeKeyStroke
     this.renderingHints.render = false;
 
     this.preventDefault = true;
+    this.inheritAccessibility = false;
   }
 
   /**

package/src/desktop/navigation/EnlargeNavigationKeyStroke.js

@@ -21,6 +21,7 @@ export default class EnlargeNavigationKeyStroke extends KeyStroke {
     // FF und Safari use different key codes for this key.
     this.which = [keys.forBrowser(keys.ANGULAR_BRACKET)];
     this.renderingHints.$drawingArea = ($drawingArea, event) => this.desktop.$container;
+    this.inheritAccessibility = false;
   }
 
   _accept(event) {

package/src/desktop/navigation/ShrinkNavigationKeyStroke.js

@@ -20,6 +20,7 @@ export default class ShrinkNavigationKeyStroke extends KeyStroke {
     // FF und Safari use different key codes for this key.
     this.which = [keys.forBrowser(keys.ANGULAR_BRACKET)];
     this.renderingHints.$drawingArea = ($drawingArea, event) => this.desktop.$container;
+    this.inheritAccessibility = false;
   }
 
   _accept(event) {

package/src/desktop/viewbutton/ViewMenuPopupEnterKeyStroke.js

@@ -9,7 +9,7 @@
  *     BSI Business Systems Integration AG - initial API and implementation
  */
 
-import {KeyStroke, keys} from '../../index';
+import {keys, KeyStroke} from '../../index';
 
 export default class ViewMenuPopupEnterKeyStroke extends KeyStroke {
 
@@ -24,6 +24,7 @@ export default class ViewMenuPopupEnterKeyStroke extends KeyStroke {
         return tile.$container;
       }
     };
+    this.inheritAccessibility = false;
   }
 
   accept(event) {

package/src/filechooser/FileChooser.js

@@ -118,7 +118,7 @@ export default class FileChooser extends Widget {
     this.$container.addClass('calc-helper');
     let windowSize = this.$container.windowSize();
     // Use css width, but ensure that it is not larger than the window (mobile)
-    let w = Math.min(this.$container.width(), windowSize.width - 20);
+    let w = Math.min(this.$container.width(), windowSize.width);
     this.$container.css('min-width', w);
     this.$container.css('max-width', w);
     this.$container.removeClass('calc-helper');

package/src/filechooser/FileChooser.less

@@ -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
@@ -100,14 +100,19 @@
 
 @media (max-width: @filechooser-max-width) {
   .file-chooser {
-    /* reduce message box width on small screens */
-    max-width: 330px;
-    /* no need to have a margin on small screens */
-    margin: 0;
-
-    & > .box-buttons > .box-button {
-      margin-right: 4px;
-      min-width: 70px; /* less min width for buttons on small screens */
+    margin: 0; /* no need to have a margin on small screens */
+
+    & > .box-buttons {
+      padding: 0 13px 26px 13px; /* use less x-padding for buttons so that more text can be shown */
+
+      & > .box-button {
+        margin-right: 4px;
+        min-width: 70px; /* less min width for buttons on small screens */
+
+        &:last-child {
+          margin-right: 0;
+        }
+      }
     }
   }
 }

package/src/focus/FocusContext.js

@@ -121,7 +121,7 @@ export default class FocusContext {
     this.focusedElement = event.target;
 
     // Do not update current focus context nor validate focus if target is $entryPoint.
-    // That is because focusing the $entryPoint is done whenever no control is currently focusable, e.g. due to glasspanes.
+    // That is because focusing the $entryPoint is done whenever no control is currently focusable, e.g. due to glass panes.
     if (event.target === this.$container.entryPoint(true)) {
       return;
     }
@@ -166,12 +166,12 @@ export default class FocusContext {
   /**
    * Focuses the given element if being a child of this context's container and matches the given filter (if provided).
    *
-   * @param element
-   *        the element to gain focus, or null to focus the context's first focusable element matching the given filter.
-   * @param filter
-   *        filter to control which element to gain focus, or null to accept all focusable candidates.
+   * @param {HTMLElement|$} [element]
+   *        the element to focus, or null to focus the context's first focusable element matching the given filter.
+   * @param {function} [filter]
+   *        filter that controls which element should be focused, or null to accept all focusable candidates.
    * @param {object} [options]
-   * @param {boolean} [options.preventScroll] a boolean whether to prevent scrolling to focused element or not (defaults to false)
+   * @param {boolean} [options.preventScroll] prevents scrolling to new focused element (defaults to false)
    */
   validateAndSetFocus(element, filter, options) {
     // Ensure the element to be a child element, or set it to null otherwise.
@@ -213,8 +213,11 @@ export default class FocusContext {
 
   /**
    * Focuses the requested element.
+   *
+   * @param {HTMLElement} element
+   *        the element to focus, or null to focus the context's first focusable element matching the given filter.
    * @param {object} [options]
-   * @param {boolean} [options.preventScroll] a boolean whether to prevent scrolling to focused element or not (defaults to false)
+   * @param {boolean} [options.preventScroll] prevents scrolling to new focused element (defaults to false)
    */
   _focus(elementToFocus, options) {
     options = options || {};
@@ -237,7 +240,7 @@ export default class FocusContext {
       elementToFocus = null;
     }
 
-    // Focus $entryPoint if current focus is to be blured.
+    // Focus $entryPoint if current focus is to be blurred.
     // Otherwise, the HTML body would be focused which makes global keystrokes (like backspace) not to work anymore.
     elementToFocus = elementToFocus || this.$container.entryPoint(true);
 

package/src/focus/FocusManager.js

@@ -27,7 +27,8 @@ export default class FocusManager {
       // Auto focusing of elements is bad with on screen keyboards -> deactivate to prevent unwanted popping up of the keyboard
       active: !Device.get().supportsOnlyTouch(),
       // Preventing blur is bad on touch devices because every touch on a non input field is supposed to close the keyboard which does not happen if preventDefault is used on mouse down
-      restrictedFocusGain: !Device.get().supportsOnlyTouch()
+      restrictedFocusGain: !Device.get().supportsOnlyTouch(),
+      session: null
     };
     $.extend(this, defaults, options);
 
@@ -251,15 +252,33 @@ export default class FocusManager {
   }
 
   requestFocusIfReady(element, filter) {
-    return this.requestFocus(element, filter, true);
+    return this.requestFocus(element, filter, {
+      onlyIfReady: true
+    });
   }
 
   /**
    * Requests the focus for the given element, but only if being a valid focus location.
    *
+   * @param {HTMLElement|$} [element]
+   *        the element to focus, or null to focus the context's first focusable element matching the given filter.
+   * @param {function} [filter]
+   *        filter that controls which element should be focused, or null to accept all focusable candidates.
+   * @param {object|boolean} [options]
+   *        Use object, boolean is deprecated
+   * @param {boolean} [options.preventScroll] prevents scrolling to new focused element (defaults to false)
+   * @param {boolean} [options.onlyIfReady] prevents focusing if not ready
    * @return {boolean} true if focus was gained, false otherwise.
    */
-  requestFocus(element, filter, onlyIfReady) {
+  requestFocus(element, filter, options) {
+    // backward compatibility
+    if (typeof options === 'boolean') {
+      options = {
+        onlyIfReady: options
+      };
+    } else {
+      options = options || {};
+    }
     element = element instanceof $ ? element[0] : element;
     if (!element) {
       return false;
@@ -267,10 +286,10 @@ export default class FocusManager {
 
     let context = this._findFocusContextFor(element);
     if (context) {
-      if (onlyIfReady && !context.prepared) {
+      if (scout.nvl(options.onlyIfReady, false) && !context.prepared) {
         return false;
       }
-      context.validateAndSetFocus(element, filter);
+      context.validateAndSetFocus(element, filter, options);
     }
 
     return focusUtils.isActiveElement(element);

package/src/form/fields/LookupBox.js

@@ -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
@@ -67,6 +67,8 @@ export default class LookupBox extends ValueField {
     this.$field.addDeviceClass();
     this.$field.addClass('structure');
     this._renderFilterBox();
+
+    this.$container.css('--inactive-lookup-row-suffix-text', `'${this.session.text('InactiveState')}'`);
   }
 
   _renderFilterBox() {

package/src/form/fields/LookupBox.less

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2014-2017 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
@@ -43,6 +43,32 @@
         top: 0;
         height: 100%;
       }
+
+      &.inactive {
+        font-style: italic;
+
+        & > .table-cell.last > .text::after {
+          content: ' (' var(--inactive-lookup-row-suffix-text) ')';
+        }
+      }
+
+      // necessary for Scout Classic as row passes the css classes to its cells
+      & > .table-cell.last.inactive {
+        font-style: italic;
+
+        & > .text::after {
+          content: ' (' var(--inactive-lookup-row-suffix-text) ')';
+        }
+      }
+    }
+
+    & > .tree-data > .tree-node.inactive,
+    & > .tree-data > .animation-wrapper > .tree-node.inactive {
+      font-style: italic;
+
+      & > .text::after {
+        content: ' (' var(--inactive-lookup-row-suffix-text) ')';
+      }
     }
   }
 }

package/src/form/fields/TextFieldIcon.less

@@ -16,7 +16,7 @@
 
   &::before {
     #scout.font-icon();
-    font-size: 14px;
+    font-size: @font-size-icon-small;
     color: @text-field-icon-color;
     border-radius: @control-border-radius;
     width: @text-field-icon-size;
@@ -39,4 +39,4 @@
       background-color: @hover-background-color;
     }
   }
-}
+}

package/src/form/fields/ValueField.js

@@ -28,6 +28,7 @@ export default class ValueField extends FormField {
     this.value = null;
     this.validators = [];
     this.validators.push(this._validateValue.bind(this));
+    this._updateDisplayTextPending = false;
 
     this.$clearIcon = null;
 
@@ -517,16 +518,24 @@ export default class ValueField extends FormField {
     }
     value = scout.nvl(value, this.value);
     let returned = this.formatValue(value);
-    if (returned && $.isFunction(returned.promise)) {
+    if (objects.isPromise(returned)) {
+      this._updateDisplayTextPending = true;
       // Promise is returned -> set display text later
       returned
         .done(this.setDisplayText.bind(this))
         .fail(() => {
-          this.setDisplayText('');
+          // If display text was updated in the meantime, don't override the text with an empty string
+          if (this._updateDisplayTextPending) {
+            this.setDisplayText('');
+          }
           $.log.isInfoEnabled() && $.log.info('Could not resolve display text for value: ' + value);
+        })
+        .always(() => {
+          this._updateDisplayTextPending = false;
         });
     } else {
       this.setDisplayText(returned);
+      this._updateDisplayTextPending = false;
     }
   }