Skip to content

Commit d24252e

Browse files
committed
draw choose enum fields as dropdown list
html <select> element
1 parent 30ee027 commit d24252e

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

examples/esp8266/WebMenu/WebMenu/data/1.0/bootstrap.xslt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -198,17 +198,17 @@
198198
</xsl:choose>
199199
</xsl:variable>
200200
<xsl:choose>
201-
<xsl:when test="$ln>=10000"><!-- disabled in pactice, with a large value -->
201+
<xsl:when test="$ln>=100"><!-- disabled in pactice, with a large value -->
202202
<!-- some fancy slider.. not working yet -->
203-
<xsl:element name="input">
203+
<!-- <xsl:element name="input">
204204
<xsl:attribute name="id">fld_<xsl:value-of select="/menuLib/panel/@id"/>_<xsl:value-of select="../../@i"/></xsl:attribute>
205205
<xsl:attribute name="data-slider-id">fld_<xsl:value-of select="/menuLib/panel/@id"/>_<xsl:value-of select="../../@i"/></xsl:attribute>
206206
<xsl:attribute name="type">text</xsl:attribute>
207207
<xsl:attribute name="data-slider-min"><xsl:value-of select="@l"/></xsl:attribute>
208208
<xsl:attribute name="data-slider-max"><xsl:value-of select="@h"/></xsl:attribute>
209209
<xsl:attribute name="data-slider-step"><xsl:value-of select="@t"/></xsl:attribute>
210210
<xsl:attribute name="data-slider-value"><xsl:apply-templates/></xsl:attribute>
211-
</xsl:element>
211+
</xsl:element> -->
212212
<!-- standard slider -->
213213
<xsl:element name="input">
214214
<xsl:copy-of select="node/@*"/>
@@ -221,7 +221,7 @@
221221
</xsl:element>
222222
</xsl:when>
223223
<xsl:otherwise>
224-
<xsl:element name="input">
224+
<xsl:element name="input">
225225
<xsl:attribute name="id">fld_<xsl:value-of select="/menuLib/panel/@id"/>_<xsl:value-of select="../../@i"/></xsl:attribute>
226226
<xsl:attribute name="type">text</xsl:attribute>
227227
<xsl:attribute name="size"><xsl:value-of select="$sz"/></xsl:attribute>
@@ -237,11 +237,11 @@
237237
</xsl:choose>
238238
</xsl:template>
239239

240-
<xsl:template match="select">
240+
<xsl:template match="select|choose">
241241
<xsl:apply-templates select="node"/>
242242
</xsl:template>
243243

244-
<xsl:template match="select/node">
244+
<xsl:template match="node">
245245
<xsl:element name="select">
246246
<xsl:attribute name="id">fld_<xsl:value-of select="/menuLib/panel/@id"/>_<xsl:value-of select="../../../p/@i"/></xsl:attribute>
247247
<xsl:attribute name="class">form-control</xsl:attribute>
@@ -251,7 +251,7 @@
251251
</xsl:element>
252252
</xsl:template>
253253

254-
<xsl:template match="select/node/value">
254+
<xsl:template match="node/value">
255255
<xsl:element name="option">
256256
<xsl:copy-of select="@*"/>
257257
<xsl:apply-templates/>

examples/esp8266/WebMenu/WebMenu/data/1.0/r-site.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ function connectWS() {
1212
connection.onopen = init;
1313
connection.onerror = function(e) {console.log("WebSocket Error ", e)};
1414
connection.onmessage = function(e) {
15-
console.log(JSON.parse(e.data));//just for checking it
15+
try {
16+
console.log(JSON.parse(e.data));//just for checking it
17+
} catch(err) {
18+
console.log("NO JSON!",e.data);
19+
}
1620
eval("lastResult="+e.data);
1721
updatePage();
1822
};

0 commit comments

Comments
 (0)