@wcardinal/wcardinal-ui 0.285.0 → 0.287.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.285.0
2
+ Winter Cardinal UI v0.287.0
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.285.0
2
+ Winter Cardinal UI v0.287.0
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -12796,17 +12796,44 @@ var UtilKeyboardEvent = /** @class */ (function () {
12796
12796
  var keyExpression = void 0;
12797
12797
  var event_1;
12798
12798
  if (0 <= arrowIndex) {
12799
- keyExpression = expression.substring(0, arrowIndex).trim();
12799
+ keyExpression = expression.substring(0, arrowIndex).trim().toLowerCase();
12800
12800
  event_1 = expression.substring(arrowIndex + 2).trim();
12801
12801
  }
12802
12802
  else {
12803
- keyExpression = expression.trim();
12803
+ keyExpression = expression.trim().toLowerCase();
12804
+ }
12805
+ var alt = false;
12806
+ var ctrl = false;
12807
+ var shift = false;
12808
+ var key = "a";
12809
+ var length_1 = keyExpression.length;
12810
+ var i = 0;
12811
+ var j = 1;
12812
+ for (; j < length_1; ++j) {
12813
+ var c = keyExpression.charAt(j);
12814
+ if (c === "+") {
12815
+ var part = keyExpression.substring(i, j);
12816
+ switch (part) {
12817
+ case "alt":
12818
+ alt = true;
12819
+ break;
12820
+ case "ctrl":
12821
+ ctrl = true;
12822
+ break;
12823
+ case "shift":
12824
+ shift = true;
12825
+ break;
12826
+ default:
12827
+ key = part;
12828
+ break;
12829
+ }
12830
+ j += 1;
12831
+ i = j;
12832
+ }
12833
+ }
12834
+ if (i !== j) {
12835
+ key = keyExpression.substring(i, j);
12804
12836
  }
12805
- var keys = keyExpression.toLowerCase().split("+");
12806
- var alt = 0 <= keys.indexOf("alt");
12807
- var ctrl = 0 <= keys.indexOf("ctrl");
12808
- var shift = 0 <= keys.indexOf("shift");
12809
- var key = keys[keys.length - 1];
12810
12837
  return setShortcutKeyAndWhich({
12811
12838
  alt: alt,
12812
12839
  ctrl: ctrl,
@@ -13272,7 +13299,7 @@ var toShortcuts = function (options) {
13272
13299
  }
13273
13300
  if (shortcuts != null) {
13274
13301
  for (var i = 0, imax = shortcuts.length; i < imax; ++i) {
13275
- UtilKeyboardEvent.toShortcut(shortcuts[i]);
13302
+ result.push(UtilKeyboardEvent.toShortcut(shortcuts[i]));
13276
13303
  }
13277
13304
  }
13278
13305
  return result;
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.285.0
2
+ Winter Cardinal UI v0.287.0
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -12793,17 +12793,44 @@
12793
12793
  var keyExpression = void 0;
12794
12794
  var event_1;
12795
12795
  if (0 <= arrowIndex) {
12796
- keyExpression = expression.substring(0, arrowIndex).trim();
12796
+ keyExpression = expression.substring(0, arrowIndex).trim().toLowerCase();
12797
12797
  event_1 = expression.substring(arrowIndex + 2).trim();
12798
12798
  }
12799
12799
  else {
12800
- keyExpression = expression.trim();
12800
+ keyExpression = expression.trim().toLowerCase();
12801
+ }
12802
+ var alt = false;
12803
+ var ctrl = false;
12804
+ var shift = false;
12805
+ var key = "a";
12806
+ var length_1 = keyExpression.length;
12807
+ var i = 0;
12808
+ var j = 1;
12809
+ for (; j < length_1; ++j) {
12810
+ var c = keyExpression.charAt(j);
12811
+ if (c === "+") {
12812
+ var part = keyExpression.substring(i, j);
12813
+ switch (part) {
12814
+ case "alt":
12815
+ alt = true;
12816
+ break;
12817
+ case "ctrl":
12818
+ ctrl = true;
12819
+ break;
12820
+ case "shift":
12821
+ shift = true;
12822
+ break;
12823
+ default:
12824
+ key = part;
12825
+ break;
12826
+ }
12827
+ j += 1;
12828
+ i = j;
12829
+ }
12830
+ }
12831
+ if (i !== j) {
12832
+ key = keyExpression.substring(i, j);
12801
12833
  }
12802
- var keys = keyExpression.toLowerCase().split("+");
12803
- var alt = 0 <= keys.indexOf("alt");
12804
- var ctrl = 0 <= keys.indexOf("ctrl");
12805
- var shift = 0 <= keys.indexOf("shift");
12806
- var key = keys[keys.length - 1];
12807
12834
  return setShortcutKeyAndWhich({
12808
12835
  alt: alt,
12809
12836
  ctrl: ctrl,
@@ -13269,7 +13296,7 @@
13269
13296
  }
13270
13297
  if (shortcuts != null) {
13271
13298
  for (var i = 0, imax = shortcuts.length; i < imax; ++i) {
13272
- UtilKeyboardEvent.toShortcut(shortcuts[i]);
13299
+ result.push(UtilKeyboardEvent.toShortcut(shortcuts[i]));
13273
13300
  }
13274
13301
  }
13275
13302
  return result;