You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2022/11/02 08:14:00 UTC
[myfaces-tobago] 02/02: Merge remote-tracking branch 'origin/tobago-5.x' into t5_selectMany
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch t5_selectMany
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 9749585ceb666eebfd0d032eb5b55f8aa7d31f51
Merge: 24b9c5ecf2 f96dc9e8c6
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Wed Nov 2 09:13:25 2022 +0100
Merge remote-tracking branch 'origin/tobago-5.x' into t5_selectMany
# Conflicts:
# tobago-theme/tobago-theme-standard/src/main/ts/tobago-dropdown.ts
.../tobago-example-demo/package-lock.json | 336 +--
tobago-example/tobago-example-demo/package.json | 4 +-
.../src/main/webapp/js/jasmine.js | 268 +--
tobago-example/tobago-example-spring-boot/pom.xml | 2 +-
tobago-theme/package-lock.json | 2241 ++++++++++----------
tobago-theme/package.json | 20 +-
.../src/main/css/tobago.css | 52 -
.../src/main/css/tobago.css.map | 2 +-
.../src/main/css/tobago.min.css | 2 +-
.../src/main/css/tobago.min.css.map | 2 +-
.../src/main/css/tobago.css | 52 -
.../src/main/css/tobago.css.map | 2 +-
.../src/main/css/tobago.min.css | 2 +-
.../src/main/css/tobago.min.css.map | 2 +-
.../src/main/css/tobago.css | 52 -
.../src/main/css/tobago.css.map | 2 +-
.../src/main/css/tobago.min.css | 2 +-
.../src/main/css/tobago.min.css.map | 2 +-
.../tobago-theme-speyside/src/main/css/tobago.css | 52 -
.../src/main/css/tobago.css.map | 2 +-
.../src/main/css/tobago.min.css | 2 +-
.../src/main/css/tobago.min.css.map | 2 +-
.../tobago-theme-standard/src/main/css/tobago.css | 52 -
.../src/main/css/tobago.css.map | 2 +-
.../src/main/css/tobago.min.css | 2 +-
.../src/main/css/tobago.min.css.map | 2 +-
.../tobago-theme-standard/src/main/js/jsf.js | 2 +-
.../tobago-theme-standard/src/main/js/jsf.js.map | 2 +-
.../src/main/ts/tobago-dropdown.ts | 14 +-
29 files changed, 1495 insertions(+), 1684 deletions(-)
diff --cc tobago-theme/tobago-theme-standard/src/main/ts/tobago-dropdown.ts
index a89102f0ed,edcfbd2194..545b4d0152
--- a/tobago-theme/tobago-theme-standard/src/main/ts/tobago-dropdown.ts
+++ b/tobago-theme/tobago-theme-standard/src/main/ts/tobago-dropdown.ts
@@@ -16,8 -16,14 +16,15 @@@
*/
import {MenuStore} from "./tobago-menu-store";
+import {BootstrapEvents} from "./BootstrapEvents";
+ const TobagoDropdownEvent = {
+ HIDE: "tobago.dropdown.hide",
+ HIDDEN: "tobago.dropdown.hidden",
+ SHOW: "tobago.dropdown.show",
+ SHOWN: "tobago.dropdown.shown"
+ };
+
/**
* The dropdown implementation of Bootstrap does not move the menu to the tobago-page-menuStore. This behavior is
* implemented in this class.