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 2023/03/31 22:15:14 UTC
[myfaces-tobago] branch tobago-5.x-hotfix updated (705dd1a332 -> 960d090284)
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a change to branch tobago-5.x-hotfix
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
from 705dd1a332 chore(release): set next SNAPSHOT version (#3918)
new 58e7b72937 fix(StyleTag): Wrong java.lang.Number declaration in StyleTagDeclaration in flexGrow and flexShrink attribute should be float issue: TOBAGO-2209
new 76977e1b7b fix: CSS broken after AJAX e.g. GridLayout
new 960d090284 chore(release): prepare
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
package.json | 2 +-
.../internal/component/AbstractUIFlexLayout.java | 2 +-
.../tobago/internal/component/AbstractUIStyle.java | 8 ++---
.../taglib/component/StyleTagDeclaration.java | 4 +--
.../internal/taglib/component/package-info.java | 4 +--
.../tobago-example-demo/package-lock.json | 4 +--
tobago-example/tobago-example-demo/package.json | 2 +-
.../myfaces/tobago/example/demo/ApiController.java | 2 +-
.../myfaces/tobago/example/demo/Release.java | 3 +-
tobago-theme/package-lock.json | 34 +++++++++++-----------
tobago-theme/package.json | 4 +--
.../tobago-theme-standard/src/main/js/jsf.js | 2 +-
.../tobago-theme-standard/src/main/js/jsf.js.map | 2 +-
.../org/apache/myfaces/tobago/apt/component.stg | 4 +++
14 files changed, 41 insertions(+), 36 deletions(-)
[myfaces-tobago] 02/03: fix: CSS broken after AJAX e.g. GridLayout
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch tobago-5.x-hotfix
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 76977e1b7bc9d80cf334dd06e4cdbebdff608169
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Sat Apr 1 00:02:51 2023 +0200
fix: CSS broken after AJAX e.g. GridLayout
issue: TOBAGO-2210
---
tobago-theme/package-lock.json | 30 +++++++++++-----------
tobago-theme/package.json | 2 +-
.../tobago-theme-standard/src/main/js/jsf.js | 2 +-
.../tobago-theme-standard/src/main/js/jsf.js.map | 2 +-
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/tobago-theme/package-lock.json b/tobago-theme/package-lock.json
index 3d450ec4e9..b03659ddf1 100644
--- a/tobago-theme/package-lock.json
+++ b/tobago-theme/package-lock.json
@@ -29,7 +29,7 @@
"eslint": "^8.35.0",
"eslint-plugin-compat": "^4.1.2",
"jest": "^29.4.3",
- "jsf.js_next_gen": "4.0.1-beta.7",
+ "jsf.js_next_gen": "4.0.1-beta.9",
"ncp": "^2.0.0",
"npm-run-all": "^4.1.5",
"postcss-cli": "^10.1.0",
@@ -4376,12 +4376,12 @@
}
},
"node_modules/jsf.js_next_gen": {
- "version": "4.0.1-beta.7",
- "resolved": "https://registry.npmjs.org/jsf.js_next_gen/-/jsf.js_next_gen-4.0.1-beta.7.tgz",
- "integrity": "sha512-uglSdeaCzJY8/kyk5Q4NzhuSOdf3CWEQtH0/5A/HDDPCk1nv+kildv7sqbr9nIJggMWhBRXCKIY37dvjeT0jYg==",
+ "version": "4.0.1-beta.9",
+ "resolved": "https://registry.npmjs.org/jsf.js_next_gen/-/jsf.js_next_gen-4.0.1-beta.9.tgz",
+ "integrity": "sha512-0huNEzqsxNg//xuIrL91tMHJ6r4OhPOHlFk20MQS9D2PyoKByX+iinXG5vtY+OXhLIzZYsvWAraWZcd3OcZeoA==",
"dev": true,
"dependencies": {
- "mona-dish": "0.28.7"
+ "mona-dish": "0.28.10"
}
},
"node_modules/json-parse-better-errors": {
@@ -4681,9 +4681,9 @@
}
},
"node_modules/mona-dish": {
- "version": "0.28.7",
- "resolved": "https://registry.npmjs.org/mona-dish/-/mona-dish-0.28.7.tgz",
- "integrity": "sha512-T82iByIJRJgiSjqqiSaStvDoJgNAtzJFvLu74aI6Wu3Uj33n+Bjf4sfXeZFy+IrKr3Joeq4kz+reNdu3eT+qxA==",
+ "version": "0.28.10",
+ "resolved": "https://registry.npmjs.org/mona-dish/-/mona-dish-0.28.10.tgz",
+ "integrity": "sha512-m7SZ8HsFZCCuadDWLaea6jekGeDZ8f2NdhsBkjVgChQoud4gIHCf7zf0lYrz5HDzLNL0zmI9wdzAoRavzidwuA==",
"dev": true
},
"node_modules/ms": {
@@ -9736,12 +9736,12 @@
"dev": true
},
"jsf.js_next_gen": {
- "version": "4.0.1-beta.7",
- "resolved": "https://registry.npmjs.org/jsf.js_next_gen/-/jsf.js_next_gen-4.0.1-beta.7.tgz",
- "integrity": "sha512-uglSdeaCzJY8/kyk5Q4NzhuSOdf3CWEQtH0/5A/HDDPCk1nv+kildv7sqbr9nIJggMWhBRXCKIY37dvjeT0jYg==",
+ "version": "4.0.1-beta.9",
+ "resolved": "https://registry.npmjs.org/jsf.js_next_gen/-/jsf.js_next_gen-4.0.1-beta.9.tgz",
+ "integrity": "sha512-0huNEzqsxNg//xuIrL91tMHJ6r4OhPOHlFk20MQS9D2PyoKByX+iinXG5vtY+OXhLIzZYsvWAraWZcd3OcZeoA==",
"dev": true,
"requires": {
- "mona-dish": "0.28.7"
+ "mona-dish": "0.28.10"
}
},
"json-parse-better-errors": {
@@ -9977,9 +9977,9 @@
}
},
"mona-dish": {
- "version": "0.28.7",
- "resolved": "https://registry.npmjs.org/mona-dish/-/mona-dish-0.28.7.tgz",
- "integrity": "sha512-T82iByIJRJgiSjqqiSaStvDoJgNAtzJFvLu74aI6Wu3Uj33n+Bjf4sfXeZFy+IrKr3Joeq4kz+reNdu3eT+qxA==",
+ "version": "0.28.10",
+ "resolved": "https://registry.npmjs.org/mona-dish/-/mona-dish-0.28.10.tgz",
+ "integrity": "sha512-m7SZ8HsFZCCuadDWLaea6jekGeDZ8f2NdhsBkjVgChQoud4gIHCf7zf0lYrz5HDzLNL0zmI9wdzAoRavzidwuA==",
"dev": true
},
"ms": {
diff --git a/tobago-theme/package.json b/tobago-theme/package.json
index 01246383b4..4111198dbc 100644
--- a/tobago-theme/package.json
+++ b/tobago-theme/package.json
@@ -87,7 +87,7 @@
"eslint": "^8.35.0",
"eslint-plugin-compat": "^4.1.2",
"jest": "^29.4.3",
- "jsf.js_next_gen": "4.0.1-beta.7",
+ "jsf.js_next_gen": "4.0.1-beta.9",
"ncp": "^2.0.0",
"npm-run-all": "^4.1.5",
"postcss-cli": "^10.1.0",
diff --git a/tobago-theme/tobago-theme-standard/src/main/js/jsf.js b/tobago-theme/tobago-theme-standard/src/main/js/jsf.js
index bb05b4e6a9..0cd77dac3c 100644
--- a/tobago-theme/tobago-theme-standard/src/main/js/jsf.js
+++ b/tobago-theme/tobago-theme-standard/src/main/js/jsf.js
@@ -1,3 +1,3 @@
/*! For license information please see jsf.js.LICENSE.txt */
-(()=>{"use strict";var e={289:(e,t,n)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.shallowMerge=t.simpleShallowMerge=t.deepCopy=t.buildPath=t.resolve=t.appendIf=t.assignIf=t.append=t.assign=void 0;const r=n(225);class s{constructor(e){this.parent=e}set value(e){}get value(){return this.parent}}function l(e,...t){if(t.length<1)return new s(e);const n=d(e,...t);return new class{set value(e){n.target[n.key]=e}get value(){return n.target[n.key]}}}function o(e,...t){if(t.length<1)retu [...]
+(()=>{"use strict";var e={289:(e,t,n)=>{Object.defineProperty(t,"__esModule",{value:!0}),t.shallowMerge=t.simpleShallowMerge=t.deepCopy=t.buildPath=t.resolve=t.appendIf=t.assignIf=t.append=t.assign=void 0;const r=n(225);class s{constructor(e){this.parent=e}set value(e){}get value(){return this.parent}}function l(e,...t){if(t.length<1)return new s(e);const n=d(e,...t);return new class{set value(e){n.target[n.key]=e}get value(){return n.target[n.key]}}}function o(e,...t){if(t.length<1)retu [...]
//# sourceMappingURL=jsf.js.map
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-standard/src/main/js/jsf.js.map b/tobago-theme/tobago-theme-standard/src/main/js/jsf.js.map
index e316cc13c6..62bc8a0df4 100644
--- a/tobago-theme/tobago-theme-standard/src/main/js/jsf.js.map
+++ b/tobago-theme/tobago-theme-standard/src/main/js/jsf.js.map
@@ -1 +1 @@
-{"version":3,"file":"jsf.js","mappings":";6MAuBA,eAKA,MAAMA,EACFC,YAAoBC,GAAA,KAAAA,OAAAA,CAAc,CAE9BC,UAAMA,GACV,CACIA,YACA,OAAOC,KAAKF,MAChB,EASJ,SAAgBG,EAAUC,KAAiCC,GACvD,GAAIA,EAAWC,OAAS,EACpB,OAAO,IAAIR,EAAaM,GAE5B,MAAMG,EAAeC,EAAUJ,KAAWC,GAU1C,OATgC,IAAI,MAC5BJ,UAAMA,GACNM,EAAaH,OAAOG,EAAaE,KAAOR,CAC5C,CAEIA,YACA,OAAOM,EAAaH,OAAOG,EAAaE,IAC5C,EAGR,CAGA,SAAgBC,EAAUN,KAAiCC,GACvD,GAAIA,EAAWC,OAAS,EACpB,OAAO,IAAIR,EAAaM,GAE5B,MAAMG,EAAeC,EAAUJ,KAAWC,GAgB1C,OAfgC,IAAI,MAC5BJ,UAAMA,GACFU [...]
\ No newline at end of file
+{"version":3,"file":"jsf.js","mappings":";6MAuBA,eAKA,MAAMA,EACFC,YAAoBC,GAAA,KAAAA,OAAAA,CAAc,CAE9BC,UAAMA,GACV,CACIA,YACA,OAAOC,KAAKF,MAChB,EASJ,SAAgBG,EAAUC,KAAiCC,GACvD,GAAIA,EAAWC,OAAS,EACpB,OAAO,IAAIR,EAAaM,GAE5B,MAAMG,EAAeC,EAAUJ,KAAWC,GAU1C,OATgC,IAAI,MAC5BJ,UAAMA,GACNM,EAAaH,OAAOG,EAAaE,KAAOR,CAC5C,CAEIA,YACA,OAAOM,EAAaH,OAAOG,EAAaE,IAC5C,EAGR,CAGA,SAAgBC,EAAUN,KAAiCC,GACvD,GAAIA,EAAWC,OAAS,EACpB,OAAO,IAAIR,EAAaM,GAE5B,MAAMG,EAAeC,EAAUJ,KAAWC,GAgB1C,OAfgC,IAAI,MAC5BJ,UAAMA,GACFU [...]
\ No newline at end of file
[myfaces-tobago] 01/03: fix(StyleTag): Wrong java.lang.Number declaration in StyleTagDeclaration in flexGrow and flexShrink attribute should be float issue: TOBAGO-2209
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch tobago-5.x-hotfix
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 58e7b72937f3d089a72ff83056418c65abdfa02b
Author: Bernd Bohmann <bo...@apache.org>
AuthorDate: Thu Mar 30 16:13:48 2023 +0200
fix(StyleTag): Wrong java.lang.Number declaration in StyleTagDeclaration in flexGrow and flexShrink attribute should be float
issue: TOBAGO-2209
---
.../myfaces/tobago/internal/component/AbstractUIFlexLayout.java | 2 +-
.../apache/myfaces/tobago/internal/component/AbstractUIStyle.java | 8 ++++----
.../tobago/internal/taglib/component/StyleTagDeclaration.java | 4 ++--
.../main/resources/org/apache/myfaces/tobago/apt/component.stg | 4 ++++
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlexLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlexLayout.java
index d8469c997f..6275483d66 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlexLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlexLayout.java
@@ -79,7 +79,7 @@ public abstract class AbstractUIFlexLayout extends AbstractUILayoutBase {
if (unit == Measure.Unit.FR) {
final float factor = token.getValue();
style.setFlexGrow(factor);
- style.setFlexShrink(0);
+ style.setFlexShrink(0f);
style.setFlexBasis(Measure.ZERO);
// style.setFlexBasis(Measure.AUTO); // is unbalanced when mixing e.g. <p> with <textarea>
} else {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStyle.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStyle.java
index 7368a22027..9078410ccf 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStyle.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStyle.java
@@ -166,13 +166,13 @@ public abstract class AbstractUIStyle extends UIComponentBase {
public abstract void setBackgroundImage(String backgroundImage);
- public abstract Number getFlexGrow();
+ public abstract Float getFlexGrow();
- public abstract void setFlexGrow(Number flexGrow);
+ public abstract void setFlexGrow(Float flexGrow);
- public abstract Number getFlexShrink();
+ public abstract Float getFlexShrink();
- public abstract void setFlexShrink(Number flexShrink);
+ public abstract void setFlexShrink(Float flexShrink);
public abstract Measure getFlexBasis();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
index 4256761b3f..b674a22afe 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
@@ -289,7 +289,7 @@ public interface StyleTagDeclaration extends HasIdBindingAndRendered {
* @since 4.0.0
*/
@TagAttribute
- @UIComponentTagAttribute(type = "java.lang.Number")
+ @UIComponentTagAttribute(type = "java.lang.Float")
void setFlexGrow(String flexGrow);
/**
@@ -298,7 +298,7 @@ public interface StyleTagDeclaration extends HasIdBindingAndRendered {
* @since 4.0.0
*/
@TagAttribute
- @UIComponentTagAttribute(type = "java.lang.Number")
+ @UIComponentTagAttribute(type = "java.lang.Float")
void setFlexShrink(String flexShrink);
/**
diff --git a/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component.stg b/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component.stg
index d3484898c5..81ef7c40c3 100644
--- a/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component.stg
+++ b/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component.stg
@@ -443,6 +443,10 @@ NumberProperty(property) ::= <<
<NormalProperty(property)>
>>
+FloatProperty(property) ::= <<
+<NormalProperty(property)>
+>>
+
MethodExpressionProperty(property) ::= <<
public <property.type> get<property.upperCamelCaseName>Expression() {
[myfaces-tobago] 03/03: chore(release): prepare
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch tobago-5.x-hotfix
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 960d0902847dcb07f46f94e7b9a5a068333e1d72
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Sat Apr 1 00:14:39 2023 +0200
chore(release): prepare
---
package.json | 2 +-
.../apache/myfaces/tobago/internal/taglib/component/package-info.java | 4 ++--
tobago-example/tobago-example-demo/package-lock.json | 4 ++--
tobago-example/tobago-example-demo/package.json | 2 +-
.../java/org/apache/myfaces/tobago/example/demo/ApiController.java | 2 +-
.../src/main/java/org/apache/myfaces/tobago/example/demo/Release.java | 3 ++-
tobago-theme/package-lock.json | 4 ++--
tobago-theme/package.json | 2 +-
8 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/package.json b/package.json
index 37fd94d49a..a163102649 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "myfaces-tobago",
- "version": "5.6.1-SNAPSHOT",
+ "version": "5.6.1",
"description": "The goal of Tobago is to provide the community with a well designed set of user interface components based on JSF and run on MyFaces.",
"repository": {
"type": "git",
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java
index 5c6b346390..072aa02f9d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java
@@ -18,13 +18,13 @@
*/
/**
- * <b>Tobago Framework Component Tag Library 5.6.1-SNAPSHOT -
+ * <b>Tobago Framework Component Tag Library 5.6.1 -
* (C) Copyright 2005-2023 The Apache Software Foundation</b>
*/
@org.apache.myfaces.tobago.apt.annotation.Taglib(
shortName = "tc",
uri = "http://myfaces.apache.org/tobago/component",
name = "tobago",
- displayName = "Tobago Components 5.6.1-SNAPSHOT")
+ displayName = "Tobago Components 5.6.1")
package org.apache.myfaces.tobago.internal.taglib.component;
diff --git a/tobago-example/tobago-example-demo/package-lock.json b/tobago-example/tobago-example-demo/package-lock.json
index 90cb13e3b3..9b972bd179 100644
--- a/tobago-example/tobago-example-demo/package-lock.json
+++ b/tobago-example/tobago-example-demo/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "tobago-example-demo",
- "version": "5.6.1-SNAPSHOT",
+ "version": "5.6.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "tobago-example-demo",
- "version": "5.6.1-SNAPSHOT",
+ "version": "5.6.1",
"license": "Apache-2.0",
"dependencies": {
"font-awesome": "4.7.0",
diff --git a/tobago-example/tobago-example-demo/package.json b/tobago-example/tobago-example-demo/package.json
index 4042bc1453..ce3eabdc68 100644
--- a/tobago-example/tobago-example-demo/package.json
+++ b/tobago-example/tobago-example-demo/package.json
@@ -1,6 +1,6 @@
{
"name": "tobago-example-demo",
- "version": "5.6.1-SNAPSHOT",
+ "version": "5.6.1",
"description": "The demo for the Tobago framework",
"repository": {
"type": "git",
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java
index 069578ffb9..5385a93b39 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java
@@ -97,7 +97,7 @@ public class ApiController implements Serializable {
}
}
LOG.error("No current release found!");
- return Release.v5_6_0.getVersion(); // should not happen
+ return Release.v5_6_1.getVersion(); // should not happen
}
public String getJiraUrl(final String version) {
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Release.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Release.java
index 8033d05f84..2f262b69b7 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Release.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Release.java
@@ -156,7 +156,8 @@ public enum Release {
v5_3_0("12350747"),
v5_4_0("12352274"),
v5_5_0("12352597"),
- v5_6_0("12352743", true),
+ v5_6_0("12352743"),
+ v5_6_1("12353083", true),
v5_7_0("12352928", false, true),
v6_0_0("12350675", false, true);
diff --git a/tobago-theme/package-lock.json b/tobago-theme/package-lock.json
index b03659ddf1..9a3e981267 100644
--- a/tobago-theme/package-lock.json
+++ b/tobago-theme/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "tobago-theme",
- "version": "5.6.1-SNAPSHOT",
+ "version": "5.6.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "tobago-theme",
- "version": "5.6.1-SNAPSHOT",
+ "version": "5.6.1",
"license": "Apache-2.0",
"dependencies": {
"@trevoreyre/autocomplete-js": "^2.4.1",
diff --git a/tobago-theme/package.json b/tobago-theme/package.json
index 4111198dbc..e1ada23af4 100644
--- a/tobago-theme/package.json
+++ b/tobago-theme/package.json
@@ -1,6 +1,6 @@
{
"name": "tobago-theme",
- "version": "5.6.1-SNAPSHOT",
+ "version": "5.6.1",
"description": "The themes of the Tobago framework",
"repository": {
"type": "git",