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 2021/10/27 12:51:28 UTC
[myfaces-tobago] branch master updated: fix: demo markup vs class
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
The following commit(s) were added to refs/heads/master by this push:
new 15a4c6c fix: demo markup vs class
15a4c6c is described below
commit 15a4c6c844a3be129ec1776f5f3245b6f93c8bc2
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Oct 27 14:48:53 2021 +0200
fix: demo markup vs class
---
.../tobago-example-demo/src/main/scss/demo.scss | 4 +--
.../webapp/content/900-test/6000-event/Event.xhtml | 42 ++++++++++++++--------
.../src/main/webapp/css/demo.css | 4 +--
.../src/main/webapp/css/demo.css.map | 2 +-
.../src/main/webapp/css/demo.min.css | 2 +-
.../src/main/webapp/css/demo.min.css.map | 2 +-
6 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/scss/demo.scss b/tobago-example/tobago-example-demo/src/main/scss/demo.scss
index 615e016..5173504 100644
--- a/tobago-example/tobago-example-demo/src/main/scss/demo.scss
+++ b/tobago-example/tobago-example-demo/src/main/scss/demo.scss
@@ -78,11 +78,11 @@ demo-highlight {
background-color: #6495ed;
}
-.tobago-sheet-cell-markup-lightgreen {
+td.demo-lightgreen {
background-color: #ddffdd;
}
-.tobago-sheet-cell-markup-lightred {
+td.demo-lightred {
background-color: #ffdddd;
}
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/Event.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/Event.xhtml
index a429302..5a18758 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/Event.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/Event.xhtml
@@ -63,103 +63,117 @@
<tc:column label="Tag Name">
<tc:out value="#{comp.tagName}" labelLayout="skip"/>
</tc:column>
- <tc:column label="change" align="center" markup="#{comp.hasChangeEvent() ? 'lightgreen' : 'lightred'}">
+ <tc:column label="change" align="center">
<tc:button id="changeBehavior" label="X"
actionListener="#{eventController.selectComponent}" rendered="#{comp.hasChangeEvent()}">
<f:attribute name="eventName" value="change"/>
</tc:button>
<tc:out value="-" labelLayout="skip" rendered="#{!comp.hasChangeEvent()}"/>
+ <tc:style customClass="#{comp.hasChangeEvent() ? 'demo-lightgreen' : 'demo-lightred'}"/>
</tc:column>
- <tc:column label="click" align="center" markup="#{comp.hasClickEvent() ? 'lightgreen' : 'lightred'}">
+ <tc:column label="click" align="center">
<tc:button id="clickBehavior" label="X"
actionListener="#{eventController.selectComponent}" rendered="#{comp.hasClickEvent()}">
<f:attribute name="eventName" value="click"/>
</tc:button>
<tc:out value="-" labelLayout="skip" rendered="#{!comp.hasClickEvent()}"/>
+ <tc:style customClass="#{comp.hasClickEvent() ? 'demo-lightgreen' : 'demo-lightred'}"/>
</tc:column>
- <tc:column label="dblclick" align="center" markup="#{comp.hasDblclickEvent() ? 'lightgreen' : 'lightred'}">
+ <tc:column label="dblclick" align="center">
<tc:button id="dblclickBehavior" label="X"
actionListener="#{eventController.selectComponent}" rendered="#{comp.hasDblclickEvent()}">
<f:attribute name="eventName" value="dblclick"/>
</tc:button>
<tc:out value="-" labelLayout="skip" rendered="#{!comp.hasDblclickEvent()}"/>
+ <tc:style customClass="#{comp.hasDblclickEvent() ? 'demo-lightgreen' : 'demo-lightred'}"/>
</tc:column>
- <tc:column label="focus" align="center" markup="#{comp.hasFocusEvent() ? 'lightgreen' : 'lightred'}">
+ <tc:column label="focus" align="center">
<tc:button id="focusBehavior" label="X"
actionListener="#{eventController.selectComponent}" rendered="#{comp.hasFocusEvent()}">
<f:attribute name="eventName" value="focus"/>
</tc:button>
<tc:out value="-" labelLayout="skip" rendered="#{!comp.hasFocusEvent()}"/>
+ <tc:style customClass="#{comp.hasFocusEvent() ? 'demo-lightgreen' : 'demo-lightred'}"/>
</tc:column>
- <tc:column label="blur" align="center" markup="#{comp.hasBlurEvent() ? 'lightgreen' : 'lightred'}">
+ <tc:column label="blur" align="center">
<tc:button id="blurBehavior" label="X"
actionListener="#{eventController.selectComponent}" rendered="#{comp.hasBlurEvent()}">
<f:attribute name="eventName" value="blur"/>
</tc:button>
<tc:out value="-" labelLayout="skip" rendered="#{!comp.hasBlurEvent()}"/>
+ <tc:style customClass="#{comp.hasBlurEvent() ? 'demo-lightgreen' : 'demo-lightred'}"/>
</tc:column>
- <tc:column label="key down" align="center" markup="#{comp.hasKeydownEvent() ? 'lightgreen' : 'lightred'}">
+ <tc:column label="key down" align="center">
<tc:button id="keydownBehavior" label="X"
actionListener="#{eventController.selectComponent}" rendered="#{comp.hasKeydownEvent()}">
<f:attribute name="eventName" value="keydown"/>
</tc:button>
<tc:out value="-" labelLayout="skip" rendered="#{!comp.hasKeydownEvent()}"/>
+ <tc:style customClass="#{comp.hasKeydownEvent() ? 'demo-lightgreen' : 'demo-lightred'}"/>
</tc:column>
- <tc:column label="key press" align="center" markup="#{comp.hasKeypressEvent() ? 'lightgreen' : 'lightred'}">
+ <tc:column label="key press" align="center">
<tc:button id="keypressBehavior" label="X"
actionListener="#{eventController.selectComponent}" rendered="#{comp.hasKeypressEvent()}">
<f:attribute name="eventName" value="keypress"/>
</tc:button>
<tc:out value="-" labelLayout="skip" rendered="#{!comp.hasKeypressEvent()}"/>
+ <tc:style customClass="#{comp.hasKeypressEvent() ? 'demo-lightgreen' : 'demo-lightred'}"/>
</tc:column>
- <tc:column label="key up" align="center" markup="#{comp.hasKeyupEvent() ? 'lightgreen' : 'lightred'}">
+ <tc:column label="key up" align="center">
<tc:button id="keyupBehavior" label="X"
actionListener="#{eventController.selectComponent}" rendered="#{comp.hasKeyupEvent()}">
<f:attribute name="eventName" value="keyup"/>
</tc:button>
<tc:out value="-" labelLayout="skip" rendered="#{!comp.hasKeyupEvent()}"/>
+ <tc:style customClass="#{comp.hasKeyupEvent() ? 'demo-lightgreen' : 'demo-lightred'}"/>
</tc:column>
- <tc:column label="mouse down" align="center" markup="#{comp.hasMousedownEvent() ? 'lightgreen' : 'lightred'}">
+ <tc:column label="mouse down" align="center">
<tc:button id="mousedownBehavior" label="X"
actionListener="#{eventController.selectComponent}" rendered="#{comp.hasMousedownEvent()}">
<f:attribute name="eventName" value="mousedown"/>
</tc:button>
<tc:out value="-" labelLayout="skip" rendered="#{!comp.hasMousedownEvent()}"/>
+ <tc:style customClass="#{comp.hasMousedownEvent() ? 'demo-lightgreen' : 'demo-lightred'}"/>
</tc:column>
- <tc:column label="mouse move" align="center" markup="#{comp.hasMousemoveEvent() ? 'lightgreen' : 'lightred'}">
+ <tc:column label="mouse move" align="center">
<tc:button id="mousemoveBehavior" label="X"
actionListener="#{eventController.selectComponent}" rendered="#{comp.hasMousemoveEvent()}">
<f:attribute name="eventName" value="mousemove"/>
</tc:button>
<tc:out value="-" labelLayout="skip" rendered="#{!comp.hasMousemoveEvent()}"/>
+ <tc:style customClass="#{comp.hasMousemoveEvent() ? 'demo-lightgreen' : 'demo-lightred'}"/>
</tc:column>
- <tc:column label="mouse out" align="center" markup="#{comp.hasMouseoutEvent() ? 'lightgreen' : 'lightred'}">
+ <tc:column label="mouse out" align="center">
<tc:button id="mouseoutBehavior" label="X"
actionListener="#{eventController.selectComponent}" rendered="#{comp.hasMouseoutEvent()}">
<f:attribute name="eventName" value="mouseout"/>
</tc:button>
<tc:out value="-" labelLayout="skip" rendered="#{!comp.hasMouseoutEvent()}"/>
+ <tc:style customClass="#{comp.hasMouseoutEvent() ? 'demo-lightgreen' : 'demo-lightred'}"/>
</tc:column>
- <tc:column label="mouse over" align="center" markup="#{comp.hasMouseoverEvent() ? 'lightgreen' : 'lightred'}">
+ <tc:column label="mouse over" align="center">
<tc:button id="mouseoverBehavior" label="X"
actionListener="#{eventController.selectComponent}" rendered="#{comp.hasMouseoverEvent()}">
<f:attribute name="eventName" value="mouseover"/>
</tc:button>
<tc:out value="-" labelLayout="skip" rendered="#{!comp.hasMouseoverEvent()}"/>
+ <tc:style customClass="#{comp.hasMouseoverEvent() ? 'demo-lightgreen' : 'demo-lightred'}"/>
</tc:column>
- <tc:column label="mouse up" align="center" markup="#{comp.hasMouseupEvent() ? 'lightgreen' : 'lightred'}">
+ <tc:column label="mouse up" align="center">
<tc:button id="mouseupBehavior" label="X"
actionListener="#{eventController.selectComponent}" rendered="#{comp.hasMouseupEvent()}">
<f:attribute name="eventName" value="mouseup"/>
</tc:button>
<tc:out value="-" labelLayout="skip" rendered="#{!comp.hasMouseupEvent()}"/>
+ <tc:style customClass="#{comp.hasMouseupEvent() ? 'demo-lightgreen' : 'demo-lightred'}"/>
</tc:column>
- <tc:column label="select" align="center" markup="#{comp.hasSelectEvent() ? 'lightgreen' : 'lightred'}">
+ <tc:column label="select" align="center">
<tc:button id="selectBehavior" label="X"
actionListener="#{eventController.selectComponent}" rendered="#{comp.hasSelectEvent()}">
<f:attribute name="eventName" value="select"/>
</tc:button>
<tc:out value="-" labelLayout="skip" rendered="#{!comp.hasSelectEvent()}"/>
+ <tc:style customClass="#{comp.hasSelectEvent() ? 'demo-lightgreen' : 'demo-lightred'}"/>
</tc:column>
<tc:column label="special events">
<tc:out value="#{comp.specialEvents}" labelLayout="skip"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/css/demo.css b/tobago-example/tobago-example-demo/src/main/webapp/css/demo.css
index c494722..b1a2c00 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/css/demo.css
+++ b/tobago-example/tobago-example-demo/src/main/webapp/css/demo.css
@@ -76,11 +76,11 @@ demo-highlight {
background-color: #6495ed;
}
-.tobago-sheet-cell-markup-lightgreen {
+td.demo-lightgreen {
background-color: #ddffdd;
}
-.tobago-sheet-cell-markup-lightred {
+td.demo-lightred {
background-color: #ffdddd;
}
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/css/demo.css.map b/tobago-example/tobago-example-demo/src/main/webapp/css/demo.css.map
index 369327d..d0d69e9 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/css/demo.css.map
+++ b/tobago-example/tobago-example-demo/src/main/webapp/css/demo.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../../scss/demo.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAiBA;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;AAAA;AAAA;AAAA;AAAA;AAMA;AACA;EACE;EACA;EACA;AACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAIA;EACE;;AACA;EACE;;;AAKN;EACE;EACA;EACA;EACA","file":"demo.css","sourcesContent":[" [...]
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../../scss/demo.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAiBA;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;AAAA;AAAA;AAAA;AAAA;AAMA;AACA;EACE;EACA;EACA;AACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAIA;EACE;;AACA;EACE;;;AAKN;EACE;EACA;EACA;EACA","file":"demo.css","sourcesContent":[" [...]
\ No newline at end of file
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/css/demo.min.css b/tobago-example/tobago-example-demo/src/main/webapp/css/demo.min.css
index ca716f8..699d849 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/css/demo.min.css
+++ b/tobago-example/tobago-example-demo/src/main/webapp/css/demo.min.css
@@ -1,2 +1,2 @@
-.box-shadow{box-shadow:0 0 5px 5px rgba(200,200,200,.5)}.demo-selected{background-color:#fdf}#demo-view-source .demo-selected{border:1px solid #ccc}.blue{background-color:#2aabff}.demo-data-attribute{height:100px;border:1px solid #000;border-radius:.25rem}demo-highlight{font-size:75%}.language-markup .token.tag{font-weight:inherit;font-size:inherit;line-height:inherit;white-space:inherit;text-align:inherit;padding:inherit}.planet{background-color:#5cb85c}.old-planet{background-color:#b3d [...]
+.box-shadow{box-shadow:0 0 5px 5px rgba(200,200,200,.5)}.demo-selected{background-color:#fdf}#demo-view-source .demo-selected{border:1px solid #ccc}.blue{background-color:#2aabff}.demo-data-attribute{height:100px;border:1px solid #000;border-radius:.25rem}demo-highlight{font-size:75%}.language-markup .token.tag{font-weight:inherit;font-size:inherit;line-height:inherit;white-space:inherit;text-align:inherit;padding:inherit}.planet{background-color:#5cb85c}.old-planet{background-color:#b3d [...]
/*# sourceMappingURL=demo.min.css.map */
\ No newline at end of file
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/css/demo.min.css.map b/tobago-example/tobago-example-demo/src/main/webapp/css/demo.min.css.map
index b3a3bd6..955119a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/css/demo.min.css.map
+++ b/tobago-example/tobago-example-demo/src/main/webapp/css/demo.min.css.map
@@ -1 +1 @@
-{"version":3,"sources":["src/main/webapp/css/demo.css"],"names":[],"mappings":"AAgBA,YACE,WAAY,EAAE,EAAE,IAAI,IAAI,qBAG1B,eACE,iBAAkB,KAGpB,iCACE,OAAQ,IAAI,MAAM,KAGpB,MACE,iBAAkB,QAGpB,qBACE,OAAQ,MACR,OAAQ,IAAI,MAAM,KAClB,cAAe,OAGjB,eACE,UAAW,IASb,4BACE,YAAa,QACb,UAAW,QACX,YAAa,QAEb,YAAa,QACb,WAAY,QACZ,QAAS,QAGX,QACE,iBAAkB,QAGpB,YACE,iBAAkB,QAGpB,8BACE,iBAAkB,QAGpB,iCACE,iBAAkB,QAGpB,+BACE,iBAAkB,QAGpB,qCACE,iBAAkB,KAGpB,mCACE,iBAAkB,KAGpB,6BACE,YAAa,IAEf,+BACE,iBAAkB,QAGpB,mBACE,QAAS,a [...]
\ No newline at end of file
+{"version":3,"sources":["src/main/webapp/css/demo.css"],"names":[],"mappings":"AAgBA,YACE,WAAY,EAAE,EAAE,IAAI,IAAI,qBAG1B,eACE,iBAAkB,KAGpB,iCACE,OAAQ,IAAI,MAAM,KAGpB,MACE,iBAAkB,QAGpB,qBACE,OAAQ,MACR,OAAQ,IAAI,MAAM,KAClB,cAAe,OAGjB,eACE,UAAW,IASb,4BACE,YAAa,QACb,UAAW,QACX,YAAa,QAEb,YAAa,QACb,WAAY,QACZ,QAAS,QAGX,QACE,iBAAkB,QAGpB,YACE,iBAAkB,QAGpB,8BACE,iBAAkB,QAGpB,iCACE,iBAAkB,QAGpB,+BACE,iBAAkB,QAGpB,mBACE,iBAAkB,KAGpB,iBACE,iBAAkB,KAGpB,6BACE,YAAa,IAEf,+BACE,iBAAkB,QAGpB,mBACE,QAAS,a [...]
\ No newline at end of file