@eclipse-scout/core 22.0.0 → 22.0.10

package/src/form/fields/tabbox/TabAreaLayout.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018 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
@@ -30,32 +30,37 @@ export default class TabAreaLayout extends AbstractLayout {
   }
 
   layout($container) {
-    let ellipsis = this.tabArea.ellipsis,
-      htmlContainer = HtmlComponent.get($container),
+    let htmlContainer = HtmlComponent.get($container),
       containerSize = htmlContainer.availableSize().subtract(htmlContainer.insets());
 
     // compute visible and overflown tabs
     this.preferredLayoutSize($container, {
       widthHint: containerSize.width
     });
+    this._layoutSelectionMarker();
+  }
 
-    if (this.overflowTabs.length > 0) {
-      ellipsis.setHidden(false);
-    }
-
-    this.visibleTabs.forEach(tabItem => {
-      tabItem.setOverflown(false);
-    });
-
-    this.overflowTabs.forEach(tabItem => {
-      tabItem.setOverflown(true);
-    });
+  _layoutSelectionMarker() {
+    let $selectionMarker = this.tabArea.$selectionMarker,
+      selectedTab = this.tabArea.selectedTab,
+      selectedItemBounds;
 
-    if (this.overflowTabs.length === 0) {
-      ellipsis.setHidden(true);
+    if (selectedTab) {
+      $selectionMarker.setVisible(true);
+      selectedItemBounds = graphics.bounds(selectedTab.$container);
+      $selectionMarker.cssLeft(selectedItemBounds.x);
+      $selectionMarker.cssWidth(selectedItemBounds.width);
+    } else {
+      $selectionMarker.setVisible(false);
     }
+  }
 
+  _updateEllipsis() {
+    let ellipsis = this.tabArea.ellipsis;
+    ellipsis.setHidden(this.overflowTabs.length < 1);
     ellipsis.setText(this.overflowTabs.length + '');
+    this.visibleTabs.forEach(tabItem => tabItem.setOverflown(false));
+    this.overflowTabs.forEach(tabItem => tabItem.setOverflown(true));
 
     ellipsis.setChildActions(this.overflowTabs.map(tab => {
       let menu = scout.create('Menu', {
@@ -73,73 +78,54 @@ export default class TabAreaLayout extends AbstractLayout {
       });
       return menu;
     }, this));
-
-    this._layoutSelectionMarker();
-  }
-
-  _layoutSelectionMarker() {
-    let $selectionMarker = this.tabArea.$selectionMarker,
-      selectedTab = this.tabArea.selectedTab,
-      selectedItemBounds;
-
-    if (selectedTab) {
-      $selectionMarker.setVisible(true);
-      selectedItemBounds = graphics.bounds(selectedTab.$container);
-      $selectionMarker.cssLeft(selectedItemBounds.x);
-      $selectionMarker.cssWidth(selectedItemBounds.width);
-    } else {
-      $selectionMarker.setVisible(false);
-    }
   }
 
   preferredLayoutSize($container, options) {
     let htmlComp = HtmlComponent.get($container),
       prefSize = new Dimension(0, 0),
-      prefWidth = Number.MAX_VALUE,
-      visibleTabItems = this.tabArea.visibleTabs(),
-      overflowableIndexes = visibleTabItems.map((tabItem, index) => {
-        if (tabItem.selected) {
-          return -1;
-        }
-        return index;
-      }).filter(index => index >= 0);
+      prefWidth = Number.MAX_VALUE;
+    this.visibleTabs = this.tabArea.visibleTabs();
+    let overflowableIndexes = this.visibleTabs.map((tabItem, index) => {
+      if (tabItem.selected) {
+        return -1;
+      }
+      return index;
+    }).filter(index => index >= 0);
 
     this.overflowTabs = [];
 
-    // consider avoid falsy 0 in tabboxes a 0 withHint will be used to calculate the minimum width
+    // consider avoid falsy 0 in tab-boxes a 0 withHint will be used to calculate the minimum width
     if (options.widthHint === 0 || options.widthHint) {
       prefWidth = options.widthHint - htmlComp.insets().horizontal();
     }
 
     // shortcut for minimum size.
     if (prefWidth <= 0) {
-      return this._minSize(visibleTabItems).add(htmlComp.insets());
+      return this._minSize(this.visibleTabs).add(htmlComp.insets());
     }
 
-    let overflowIndex = -1;
-    this._setFirstLastMarker(visibleTabItems);
-    prefSize = this._prefSize(visibleTabItems);
+    this._setFirstLastMarker(this.visibleTabs);
+    this._updateEllipsis();
+    prefSize = this._prefSize(this.visibleTabs);
+
     while (prefSize.width > prefWidth && overflowableIndexes.length > 0) {
-      overflowIndex = overflowableIndexes.splice(-1)[0];
-      this.overflowTabs.splice(0, 0, visibleTabItems[overflowIndex]);
-      visibleTabItems.splice(overflowIndex, 1);
-      this._setFirstLastMarker(visibleTabItems);
-      prefSize = this._prefSize(visibleTabItems);
+      let overflowIndex = overflowableIndexes.splice(-1)[0];
+      this.overflowTabs.splice(0, 0, this.visibleTabs[overflowIndex]);
+      this.visibleTabs.splice(overflowIndex, 1);
+      this._setFirstLastMarker(this.visibleTabs);
+      this._updateEllipsis(); // update ellipsis here already so that the prefSize on the next line is correct
+      prefSize = this._prefSize(this.visibleTabs);
     }
 
-    this.visibleTabs = visibleTabItems;
-
     // Use the total available space if spreading tabs evenly.
     if (this.tabArea.displayStyle === TabArea.DisplayStyle.SPREAD_EVEN) {
       return graphics.prefSize($container, options);
     }
-
     return graphics.exactPrefSize(prefSize.add(htmlComp.insets()), options);
   }
 
   _minSize(tabItems) {
-    let visibleTabItems = [],
-      prefSize;
+    let visibleTabItems = [];
     this.overflowTabs = tabItems.filter(tabItem => {
       if (tabItem.selected) {
         visibleTabItems.push(tabItem);
@@ -150,23 +136,21 @@ export default class TabAreaLayout extends AbstractLayout {
 
     this.visibleTabs = visibleTabItems;
     this._setFirstLastMarker(visibleTabItems);
-    prefSize = this._prefSize(visibleTabItems);
-
-    return prefSize;
+    return this._prefSize(visibleTabItems);
   }
 
   _prefSize(tabItems, considerEllipsis) {
-    let prefSize = tabItems.map(tabItem => this._tabItemSize(tabItem.htmlComp)
-      ).reduce((prefSize, itemSize) => {
+    let prefSize = tabItems
+      .map(tabItem => this._tabItemSize(tabItem))
+      .reduce((prefSize, itemSize) => {
         prefSize.height = Math.max(prefSize.height, itemSize.height);
         prefSize.width += itemSize.width;
         return prefSize;
-      }, new Dimension(0, 0)),
-      ellipsisSize = new Dimension(0, 0);
+      }, new Dimension(0, 0));
 
     considerEllipsis = scout.nvl(considerEllipsis, this.overflowTabs.length > 0);
     if (considerEllipsis) {
-      ellipsisSize = this._tabItemSize(this.tabArea.ellipsis.htmlComp);
+      let ellipsisSize = this._tabItemSize(this.tabArea.ellipsis);
       prefSize.height = Math.max(prefSize.height, ellipsisSize.height);
       prefSize.width += ellipsisSize.width;
     }
@@ -193,8 +177,8 @@ export default class TabAreaLayout extends AbstractLayout {
     }
   }
 
-  _tabItemSize(htmlComp) {
-    let prefSize,
+  _tabItemSize(item) {
+    let htmlComp = item.htmlComp, prefSize,
       classList = htmlComp.$comp.attr('class');
 
     // temporarily revert display style to default. otherwise the pref size of the tab item will be the size of the container.
@@ -208,6 +192,19 @@ export default class TabAreaLayout extends AbstractLayout {
     prefSize = htmlComp.prefSize({
       exact: true
     }).add(graphics.margins(htmlComp.$comp));
+    if (item.fieldStatus && item.fieldStatus.htmlComp) {
+      let statusOverflownAndHidden = item.overflown && !item.fieldStatus.visible;
+      if (statusOverflownAndHidden) {
+        // overflown tabs have no fieldStatus: explicitly set to visible so that the real consumed space can be computed
+        item.fieldStatus.setVisible(true);
+      }
+      let statusWidth = item.fieldStatus.htmlComp.prefSize({includeMargin: true}).width;
+      if (statusOverflownAndHidden) {
+        // restore
+        item.fieldStatus.setVisible(false);
+      }
+      prefSize.width += statusWidth;
+    }
 
     htmlComp.$comp.attrOrRemove('class', classList);
 

package/src/form/fields/tabbox/TabAreaLeftKeyStroke.js

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

package/src/form/fields/tabbox/TabAreaRightKeyStroke.js

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

package/src/form/fields/tabbox/TabBox.js

@@ -32,7 +32,6 @@ export default class TabBox extends CompositeField {
     this._addPreserveOnPropertyChangeProperties(['selectedTab']);
 
     this._tabBoxHeaderPropertyChangeHander = this._onTabBoxHeaderPropertyChange.bind(this);
-    this._selectedTabScrollTopChangeHandler = this._updateScrollShadow.bind(this);
   }
 
   /**
@@ -173,16 +172,17 @@ export default class TabBox extends CompositeField {
   _renderSelectedTab() {
     if (this.selectedTab) {
       this.selectedTab.render(this._$tabContent);
-      this.selectedTab.on('propertyChange:scrollTop', this._selectedTabScrollTopChangeHandler);
+      this.selectedTab.get$Scrollable().data('scroll-shadow-customizer', this._updateScrollShadow.bind(this));
     }
     if (this.rendered) {
+      this._updateScrollShadow();
       HtmlComponent.get(this._$tabContent).invalidateLayoutTree();
     }
   }
 
   _removeSelectedTab() {
     if (this.selectedTab) {
-      this.selectedTab.off('propertyChange:scrollTop', this._selectedTabScrollTopChangeHandler);
+      this.selectedTab.get$Scrollable().removeData('scroll-shadow-customizer');
       this.selectedTab.remove();
     }
   }
@@ -195,14 +195,11 @@ export default class TabBox extends CompositeField {
     let oldHasScrollShadowTop = this.$container.hasClass('has-scroll-shadow-top');
     this.$container.toggleClass('has-scroll-shadow-top', hasScrollShadowTop);
     if (oldHasScrollShadowTop !== hasScrollShadowTop) {
-      this.invalidateLayout();
+      this.invalidateLayoutTree(false);
     }
 
     // Enlarge header line if there is a shadow, but only if there is a header (controlled by labelVisible)
     fields.adjustStatusPositionForScrollShadow(this, () => hasScrollShadowTop && this.labelVisible);
-
-    // Prevent flickering of status icon
-    this.validateLayout();
   }
 
   setTabAreaStyle(tabAreaStyle) {
@@ -293,6 +290,10 @@ export default class TabBox extends CompositeField {
     this.header.focusTabItem(tabItem);
   }
 
+  getTabForItem(tabItem) {
+    return this.header.getTabForItem(tabItem);
+  }
+
   _onTabBoxHeaderPropertyChange(event) {
     if (event.propertyName === 'selectedTabItem') {
       this.setSelectedTab(event.newValue);

package/src/form/fields/tabbox/TabBox.less

@@ -74,7 +74,7 @@
   & > .menubar {
     position: absolute;
     #scout.menubar-background-color-inherit();
-    border-bottom-color: transparent;
+    border-bottom: none;
   }
 
   & > .status {
@@ -163,6 +163,7 @@
     display: inline-block;
     vertical-align: middle;
     padding: @tab-item-title-padding-top 0 @tab-item-title-padding-bottom;
+    margin-top: @text-margin-top;
 
     .tab-area.has-sub-label > & {
       padding-bottom: @group-box-title-with-sub-label-padding-bottom;

package/src/form/fields/tabbox/TabBoxHeader.js

@@ -89,6 +89,10 @@ export default class TabBoxHeader extends Widget {
     this.tabArea.focusTabItem(tabItem);
   }
 
+  getTabForItem(tabItem) {
+    return this.tabArea.getTabForItem(tabItem);
+  }
+
   _onTabBoxPropertyChange(event) {
     if (event.propertyName === 'menus') {
       this.menuBar.setMenuItems(this.tabBox.menus);

package/src/form/fields/tabbox/TabBoxHeaderLayout.js

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -34,14 +34,14 @@ export default class TabBoxHeaderLayout extends AbstractLayout {
     this.tabBoxHeader.invalidateLayoutTree();
   }
 
-  layout($container) { //
+  layout($container) {
     let htmlContainer = HtmlComponent.get($container),
       tabArea = this.tabBoxHeader.tabArea,
       tabAreaMargins = tabArea.htmlComp.margins(),
       tabAreaPrefSize,
       menuBar = this.tabBoxHeader.menuBar,
       menuBarMargins = menuBar.htmlComp.margins(),
-      menuBarMinumumSize,
+      menuBarMinimumSize,
       $status = this.tabBoxHeader.tabBox.$status,
       statusSizeLarge = new Dimension(),
       insets = htmlContainer.insets(),
@@ -49,7 +49,7 @@ export default class TabBoxHeaderLayout extends AbstractLayout {
         exact: true
       }).subtract(htmlContainer.insets());
 
-    menuBarMinumumSize = menuBar.htmlComp.prefSize({
+    menuBarMinimumSize = menuBar.htmlComp.prefSize({
       widthHint: 0
     });
 
@@ -59,7 +59,7 @@ export default class TabBoxHeaderLayout extends AbstractLayout {
     }
 
     tabAreaPrefSize = tabArea.htmlComp.prefSize({
-      widthHint: containerSize.width - menuBarMinumumSize.width - menuBarMargins.horizontal() - statusSizeLarge.width,
+      widthHint: containerSize.width - menuBarMinimumSize.width - menuBarMargins.horizontal() - statusSizeLarge.width,
       exact: false
     });
 

package/src/form/fields/tabbox/TabItem.js

@@ -74,4 +74,8 @@ export default class TabItem extends GroupBox {
       this.parent.setSelectedTab(this);
     }
   }
+
+  getTab() {
+    return this.parent.getTabForItem(this);
+  }
 }

package/src/form/fields/treebox/TreeBox.js

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2014-2018 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
@@ -193,12 +193,13 @@ export default class TreeBox extends LookupBox {
     if (lookupRow.enabled === false) {
       node.enabled = false;
     }
-    if (lookupRow.active === false) {
-      node.active = false;
-    }
     if (lookupRow.cssClass) {
       node.cssClass = lookupRow.cssClass;
     }
+    if (lookupRow.active === false) {
+      node.active = false;
+      node.cssClass = (node.cssClass ? (node.cssClass + ' ') : '') + 'inactive';
+    }
 
     return node;
   }

package/src/glasspane/GlassPane.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 {scout, Widget} from '../index';
+import {Widget} from '../index';
 import $ from 'jquery';
 
 export default class GlassPane extends Widget {
@@ -24,7 +24,7 @@ export default class GlassPane extends Widget {
 
     this.$parent.addClass('glasspane-parent');
     let cssPosition = this.$parent.css('position');
-    if (!scout.isOneOf(cssPosition, 'relative', 'absolute')) {
+    if (cssPosition === 'static') {
       this.$parent.css('position', 'relative');
     }
 

package/src/group/Group.less

@@ -44,7 +44,7 @@
   #scout.overflow-ellipsis-nowrap();
 
   .group-header:focus > & {
-    color: @active-color;
+    color: @focus-color;
     text-decoration: underline;
   }
 }

package/src/index.js

@@ -181,6 +181,7 @@ export {default as tooltips} from './tooltip/tooltips';
 export {default as WidgetTooltip} from './tooltip/WidgetTooltip';
 export {default as Action} from './action/Action';
 export {default as ActionAdapter} from './action/ActionAdapter';
+export {default as ActionExecKeyStroke} from './action/ActionExecKeyStroke';
 export {default as ActionKeyStroke} from './action/ActionKeyStroke';
 export {default as Box} from './box/Box';
 export {default as Label} from './label/Label';
@@ -308,7 +309,6 @@ export {default as TableHeaderMenu} from './table/TableHeaderMenu';
 export {default as TableHeaderMenuLayout} from './table/TableHeaderMenuLayout';
 export {default as TableHeaderMenuGroup} from './table/TableHeaderMenuGroup';
 export {default as TableHeaderMenuButton} from './table/TableHeaderMenuButton';
-export {default as TableHeaderMenuButtonKeyStroke} from './table/TableHeaderMenuButtonKeyStroke';
 export {default as TableLayout} from './table/TableLayout';
 export {default as TableSelectionHandler} from './table/TableSelectionHandler';
 export {default as TableTileGridMediator} from './table/TableTileGridMediator';

package/src/index.less

@@ -144,5 +144,6 @@
 @import "tile/fields/tablefield/TileTableField";
 @import "widget/FilterSupport";
 @import "login/LoginBox";
+@import "form/fields/breadcrumbbarfield/BreadcrumbBarField";
 @import "breadcrumbbar/BreadcrumbBar";
 @import "breadcrumbbar/BreadcrumbItem";

package/src/jquery/jquery-scout.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
@@ -834,10 +834,22 @@ $.fn.isDisplayNone = function() {
   return this.css('display') === 'none';
 };
 
+/**
+ * @param {boolean} tabbable true, to make the component tabbable. False, to make it neither tabbable nor focusable.
+ * @returns {$}
+ */
 $.fn.setTabbable = function(tabbable) {
   return this.attr('tabIndex', tabbable ? 0 : null);
 };
 
+/**
+ * @param {boolean} tabbable true, to make the component tabbable. False, to make it not tabbable but focusable, so the user can focus it with the mouse but not with the keyboard.
+ * @returns {$}
+ */
+$.fn.setTabbableOrFocusable = function(tabbable) {
+  return this.attr('tabIndex', tabbable ? 0 : -1);
+};
+
 $.fn.isTabbable = function() {
   return this.attr('tabIndex') >= 0;
 };
@@ -1049,16 +1061,17 @@ $.fn.oneAnimationEnd = function(handler) {
   if (!handler) {
     return this;
   }
-  return this.on('animationend webkitAnimationEnd', event => {
+  let oneHandler = event => {
     if (event.target !== this[0]) {
       // Ignore events that bubble up from child elements
       return;
     }
     // Unregister listener to implement "one" semantics
-    this.off(event);
+    this.off('animationend webkitAnimationEnd', oneHandler);
     // Notify actual event handler
     handler(event);
-  });
+  };
+  return this.on('animationend webkitAnimationEnd', oneHandler);
 };
 
 $.fn.hasAnimationClass = function() {

package/src/keystroke/CloseKeyStroke.js

@@ -22,6 +22,7 @@ export default class CloseKeyStroke extends KeyStroke {
       render: !!$drawingArea,
       $drawingArea: $drawingArea
     };
+    this.inheritAccessibility = false;
   }
 
   handle(event) {

package/src/keystroke/ContextMenuKeyStroke.js

@@ -24,6 +24,7 @@ export default class ContextMenuKeyStroke extends KeyStroke {
     this.ctrl = false;
     this.shift = false;
     this.stopPropagation = true;
+    this.inheritAccessibility = false;
   }
 
   /**

package/src/keystroke/FocusFilterFieldKeyStroke.js

@@ -30,6 +30,7 @@ export default class FocusFilterFieldKeyStroke extends KeyStroke {
     this.preventDefault = false; // false so that the key is inserted into the search field.
     this.keyStrokeMode = KeyStroke.Mode.DOWN;
     this.stopPropagation = true;
+    this.inheritAccessibility = false;
   }
 
   /**

package/src/keystroke/KeyStroke.js

@@ -18,6 +18,7 @@ export default class KeyStroke {
 
     this.which = []; // keys which this keystroke is bound to. Typically, this is a single key, but may be multiple keys if handling the same action (e.g. ENTER and SPACE on a button).
     this.ctrl = false;
+    this.inheritAccessibility = true;
     this.alt = false;
     this.shift = false;
     this.preventDefault = true;
@@ -138,9 +139,16 @@ export default class KeyStroke {
       if (this.field.visible !== undefined && !this.field.visible) {
         return false;
       }
-      // Check enabled state
-      if (this.field.enabled !== undefined && !this.field.enabled) {
-        return false;
+      // Check enabled state (if inheritAccessibility is true)
+      if (!this.inheritAccessibility) {
+        return true;
+      }
+      if (this.field.enabledComputed !== undefined) {
+        return this.field.enabledComputed;
+      }
+      if (this.field.enabled !== undefined) {
+        // This should actually not happen because this.field should always be a hypothetical case if this.field is not a widget
+        return this.field.enabled;
       }
     }
     return true;

package/src/keystroke/TabItemKeyStroke.js

@@ -19,15 +19,18 @@ export default class TabItemKeyStroke extends KeyStroke {
 
     this.renderingHints.offset = 16;
     this.renderingHints.hAlign = HAlign.RIGHT;
-    this.renderingHints.$drawingArea = function($drawingArea, event) {
-      return this.field.$tabContainer;
-    }.bind(this);
+    this.renderingHints.render = () => {
+      let tab = this.field.getTab();
+      return tab && tab.rendered;
+    };
+    this.renderingHints.$drawingArea = ($drawingArea, event) => this.field.getTab().$container;
+    this.inheritAccessibility = false;
   }
 
   /**
-   * @override KeyStroke.js
+   * @override
    */
   handle(event) {
-    this.field.parent.setSelectedTab(this.field);
+    this.field.select();
   }
 }

package/src/logging/logging.js

@@ -12,9 +12,16 @@ import {NullLogger, scout, URL} from '../index';
 import $ from 'jquery';
 import strings from '../util/strings';
 
-/* global log4javascript */
+const Level = {
+  TRACE: 'trace',
+  DEBUG: 'debug',
+  INFO: 'info',
+  WARN: 'warn',
+  ERROR: 'error',
+  FATAL: 'fatal'
+};
 
-const DEFAULT_LEVEL = 'trace';
+const DEFAULT_LEVEL = Level.TRACE;
 let initialized = false;
 let _appendersToAdd = [];
 let showStackTraces = true;
@@ -85,17 +92,17 @@ export function parseLevel(level) {
   }
   level = level.toLowerCase();
   switch (level) {
-    case 'trace':
+    case Level.TRACE:
       return log4javascript.Level.TRACE;
-    case 'debug':
+    case Level.DEBUG:
       return log4javascript.Level.DEBUG;
-    case 'info':
+    case Level.INFO:
       return log4javascript.Level.INFO;
-    case 'warn':
+    case Level.WARN:
       return log4javascript.Level.WARN;
-    case 'error':
+    case Level.ERROR:
       return log4javascript.Level.ERROR;
-    case 'fatal':
+    case Level.FATAL:
       return log4javascript.Level.FATAL;
   }
 }
@@ -115,6 +122,7 @@ export function addAppender(factoryName, options) {
 
 export default {
   DEFAULT_LEVEL,
+  Level,
   addAppender,
   bootstrap,
   initLog4Javascript,