You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2019/09/04 08:59:59 UTC
[myfaces-tobago] 04/04: Merge remote-tracking branch
'upstream/master'
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 6a867ee45b4407b6cb3d29cc7dfaae72b00e9c95
Merge: 50a6df0 cc838e6
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Sep 4 10:55:16 2019 +0200
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlElements.java
.../renderkit/renderer/TabGroupRenderer.java | 14 +--
.../tobago/renderkit/html/HtmlElements.java | 4 +-
.../src/main/npm/ts/tobago-command.ts | 80 ++++++++-------
.../src/main/npm/ts/tobago-tab.ts | 110 +++++++++++----------
4 files changed, 111 insertions(+), 97 deletions(-)
diff --cc tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlElements.java
index 8766a3d,372dde8..b84f6e1
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlElements.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlElements.java
@@@ -135,10 -135,11 +135,12 @@@ public enum HtmlElements
TOBAGO_IN("tobago-in"),
TOBAGO_PANEL("tobago-panel"),
- TOBAGO_TAB("tobago-tab"),
- TOBAGO_TAB_GROUP("tobago-tab-group"),
+ TOBAGO_POPUP("tobago-popup"),
TOBAGO_SPLIT_LAYOUT("tobago-split-layout"),
TOBAGO_STARS("tobago-stars"),
-- TOBAGO_SUGGEST("tobago-suggest");
++ TOBAGO_SUGGEST("tobago-suggest"),
++ TOBAGO_TAB("tobago-tab"),
++ TOBAGO_TAB_GROUP("tobago-tab-group");
private final String value;
private final boolean voidElement;