Skip to content

Commit 682353e

Browse files
authored
Correcting display.input.option() signature (#2)
Correcting display.input.option() signature so that it will get parsed correctly in json and lua definition file
1 parent 671716e commit 682353e

File tree

10 files changed

+38
-58
lines changed

10 files changed

+38
-58
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
1616
Security -- in case of vulnerabilities.
1717
-->
1818

19+
## [0.15.3]
20+
21+
### Fixed
22+
- display.input.option() command signature has been corrected for all tti models
23+
1924
## [0.15.0]
2025

2126
### Fixed
@@ -34,6 +39,7 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
3439
- Language feature has been added for DAQ6510 and DMM6500 command set(TSP-304)
3540
- Language feature has been added for 24XX and DMM7510 command set(TSP-232)
3641

42+
[0.15.3]: https://github.com/tektronix/tsp-toolkit-webhelp/releases/tag/v0.15.3
3743
[0.15.0]: https://github.com/tektronix/tsp-toolkit-webhelp/releases/tag/v0.15.0
3844
[0.14.1]: https://github.com/tektronix/tsp-toolkit-webhelp/releases/tag/v0.14.1
3945
[0.11.2]: https://github.com/tektronix/tsp-toolkit-webhelp/releases/tag/v0.11.2

WebHelpDocs/Commands_2450/40052.htm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ <h2 id="t40052" class="heading2-icl">display.input.option()</h2>
5656

5757
</table>
5858
<p class="iclsubheading">Usage</p>
59-
<p class="iclcode">display.BUTTON_OPTION<em class="emphasis">n</em> = display.input.option(&quot;<em class="emphasis">dialogTitle</em>&quot;, &quot;<em class="emphasis">buttonTitle1</em>&quot;, ...)</p>
59+
<p class="iclcode">BUTTON_OPTION<em class="emphasis">n</em> = display.input.option(&quot;<em class="emphasis">dialogTitle</em>&quot;, &quot;<em class="emphasis">buttonTitle1</em>&quot;, ...)</p>
6060
<p class="iclspacing"></p>
6161
<table class="tableintopic" width="600" cellpadding="2" cellspacing="0" border="1" style="border-collapse:collapse; border:1px solid #C0C0C0">
6262
<tr align="left" valign="top">
63-
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable"><em class="emphasis">n</em></p>
63+
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable">BUTTON_OPTION<em class="emphasis">n</em></p>
6464
</td>
65-
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext">The number of the button that is selected from the front-panel display; <code class="monospace">nil</code> if Cancel is pressed on the keypad; buttons are numbered top to bottom, left to right</p>
65+
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext"><em class="emphasis">n</em> is the number of the button that is selected from the front-panel display; <code class="monospace">nil</code> if Cancel is pressed on the keypad; buttons are numbered top to bottom, left to right</p>
6666
</td>
6767
</tr>
6868
<tr align="left" valign="top">

WebHelpDocs/Commands_2460/40052.htm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ <h2 id="t40052" class="heading2-icl">display.input.option()</h2>
5656

5757
</table>
5858
<p class="iclsubheading">Usage</p>
59-
<p class="iclcode">display.BUTTON_OPTION<em class="emphasis">n</em> = display.input.option(&quot;<em class="emphasis">dialogTitle</em>&quot;, &quot;<em class="emphasis">buttonTitle1</em>&quot;, ...)</p>
59+
<p class="iclcode">BUTTON_OPTION<em class="emphasis">n</em> = display.input.option(&quot;<em class="emphasis">dialogTitle</em>&quot;, &quot;<em class="emphasis">buttonTitle1</em>&quot;, ...)</p>
6060
<p class="iclspacing"></p>
6161
<table class="tableintopic" width="600" cellpadding="2" cellspacing="0" border="1" style="border-collapse:collapse; border:1px solid #C0C0C0">
6262
<tr align="left" valign="top">
63-
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable"><em class="emphasis">n</em></p>
63+
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable">BUTTON_OPTION<em class="emphasis">n</em></p>
6464
</td>
65-
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext">The number of the button that is selected from the front-panel display; <code class="monospace">nil</code> if Cancel is pressed on the keypad; buttons are numbered top to bottom, left to right</p>
65+
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext"><em class="emphasis">n</em> is the number of the button that is selected from the front-panel display; <code class="monospace">nil</code> if Cancel is pressed on the keypad; buttons are numbered top to bottom, left to right</p>
6666
</td>
6767
</tr>
6868
<tr align="left" valign="top">

WebHelpDocs/Commands_2461/40052.htm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ <h2 id="t40052" class="heading2-icl">display.input.option()</h2>
5656

5757
</table>
5858
<p class="iclsubheading">Usage</p>
59-
<p class="iclcode">display.BUTTON_OPTION<em class="emphasis">n</em> = display.input.option(&quot;<em class="emphasis">dialogTitle</em>&quot;, &quot;<em class="emphasis">buttonTitle1</em>&quot;, ...)</p>
59+
<p class="iclcode">BUTTON_OPTION<em class="emphasis">n</em> = display.input.option(&quot;<em class="emphasis">dialogTitle</em>&quot;, &quot;<em class="emphasis">buttonTitle1</em>&quot;, ...)</p>
6060
<p class="iclspacing"></p>
6161
<table class="tableintopic" width="600" cellpadding="2" cellspacing="0" border="1" style="border-collapse:collapse; border:1px solid #C0C0C0">
6262
<tr align="left" valign="top">
63-
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable"><em class="emphasis">n</em></p>
63+
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable">BUTTON_OPTION<em class="emphasis">n</em></p>
6464
</td>
65-
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext">The number of the button that is selected from the front-panel display; <code class="monospace">nil</code> if Cancel is pressed on the keypad; buttons are numbered top to bottom, left to right</p>
65+
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext"><em class="emphasis">n</em> is the number of the button that is selected from the front-panel display; <code class="monospace">nil</code> if Cancel is pressed on the keypad; buttons are numbered top to bottom, left to right</p>
6666
</td>
6767
</tr>
6868
<tr align="left" valign="top">

WebHelpDocs/Commands_2470/40052.htm

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ <h2 id="t40052" class="heading2-icl">display.input.option()</h2>
5656

5757
</table>
5858
<p class="iclsubheading">Usage</p>
59-
<p class="iclcode">display.BUTTON_OPTION<em class="emphasis">n</em> = display.input.option(&quot;<em class="emphasis">dialogTitle</em>&quot;, &quot;<em class="emphasis">buttonTitle1</em>&quot;, ...)</p>
59+
<p class="iclcode">BUTTON_OPTION<em class="emphasis">n</em> = display.input.option(&quot;<em class="emphasis">dialogTitle</em>&quot;, &quot;<em class="emphasis">buttonTitle1</em>&quot;, ...)</p>
6060
<p class="iclspacing"></p>
6161
<table class="tableintopic" width="600" cellpadding="2" cellspacing="0" border="1" style="border-collapse:collapse; border:1px solid #C0C0C0">
6262
<tr align="left" valign="top">
63-
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable"><em class="emphasis">n</em></p>
63+
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable">BUTTON_OPTION<em class="emphasis">n</em></p>
6464
</td>
65-
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext">The number of the button that is selected from the front-panel display; <code class="monospace">nil</code> if Cancel is pressed on the keypad; buttons are numbered top to bottom, left to right</p>
65+
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext"><em class="emphasis">n</em> is the number of the button that is selected from the front-panel display; <code class="monospace">nil</code> if Cancel is pressed on the keypad; buttons are numbered top to bottom, left to right</p>
6666
</td>
6767
</tr>
6868
<tr align="left" valign="top">
@@ -78,15 +78,9 @@ <h2 id="t40052" class="heading2-icl">display.input.option()</h2>
7878
</td>
7979
</tr>
8080
<tr align="left" valign="top">
81-
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable"><em class="emphasis">buttonTitle2</em></p>
81+
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable"><em class="emphasis">...</em></p>
8282
</td>
83-
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext">A string that contains the name of the second button; up to 15 characters</p>
84-
</td>
85-
</tr>
86-
<tr align="left" valign="top">
87-
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable"><em class="emphasis">buttonTitleN</em></p>
88-
</td>
89-
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext">A string that contains the names of subsequent buttons, where <span class="monospaceitalic">N</span> is a number from 3 to 10; you can define up to 10 buttons; each button can be up to 15 characters</p>
83+
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext">A string that contains the names of subsequent buttons, where <span class="monospaceitalic">N</span> is a number from 2 to 10; you can define up to 10 buttons; each button can be up to 15 characters</p>
9084
</td>
9185
</tr>
9286

WebHelpDocs/Commands_DAQ6510/40052.htm

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,13 @@ <h2 id="t40052" class="heading2-icl">display.input.option()</h2>
5656

5757
</table>
5858
<p class="iclsubheading">Usage</p>
59-
<p class="iclcode">display.BUTTON_OPTION<em class="emphasis">n</em> = display.input.option(&quot;<em class="emphasis">dialogTitle</em>&quot;, &quot;<em class="emphasis">buttonTitle1</em>&quot;, &quot;<em class="emphasis">buttonTitle2</em>&quot;)</p>
60-
<p class="iclcode">display.BUTTON_OPTION<em class="emphasis">n</em> = display.input.option(&quot;<em class="emphasis">dialogTitle</em>&quot;, &quot;<em class="emphasis">buttonTitle1</em>&quot;, &quot;<em class="emphasis">buttonTitle2</em>&quot;<em class="emphasis">, </em>&quot;<em class="emphasis">buttonTitleN</em>&quot;<em class="emphasis">, ... </em>&quot;<em class="emphasis">buttonTitleN</em>&quot;)</p>
59+
<p class="iclcode">BUTTON_OPTION<em class="emphasis">n</em> = display.input.option(&quot;<em class="emphasis">dialogTitle</em>&quot;, &quot;<em class="emphasis">buttonTitle1</em>&quot;, ...)</p>
6160
<p class="iclspacing"></p>
6261
<table class="tableintopic" width="600" cellpadding="2" cellspacing="0" border="1" style="border-collapse:collapse; border:1px solid #C0C0C0">
6362
<tr align="left" valign="top">
64-
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable"><em class="emphasis">n</em></p>
63+
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable">BUTTON_OPTION<em class="emphasis">n</em></p>
6564
</td>
66-
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext">The number of the button that is selected from the front-panel display; <code class="monospace">nil</code> if Cancel is pressed on the keypad; buttons are numbered top to bottom, left to right</p>
65+
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext"><em class="emphasis">n</em> is the number of the button that is selected from the front-panel display; <code class="monospace">nil</code> if Cancel is pressed on the keypad; buttons are numbered top to bottom, left to right</p>
6766
</td>
6867
</tr>
6968
<tr align="left" valign="top">
@@ -79,15 +78,9 @@ <h2 id="t40052" class="heading2-icl">display.input.option()</h2>
7978
</td>
8079
</tr>
8180
<tr align="left" valign="top">
82-
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable"><em class="emphasis">buttonTitle2</em></p>
81+
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable"><em class="emphasis">...</em></p>
8382
</td>
84-
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext">A string that contains the name of the second button; up to 15 characters</p>
85-
</td>
86-
</tr>
87-
<tr align="left" valign="top">
88-
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable"><em class="emphasis">buttonTitleN</em></p>
89-
</td>
90-
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext">A string that contains the names of subsequent buttons, where <span class="monospaceitalic">N</span> is a number from 3 to 10; you can define up to 10 buttons; each button can be up to 15 characters</p>
83+
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext">A string that contains the names of subsequent buttons, where <span class="monospaceitalic">N</span> is a number from 2 to 10; you can define up to 10 buttons; each button can be up to 15 characters</p>
9184
</td>
9285
</tr>
9386

WebHelpDocs/Commands_DMM6500/40052.htm

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,13 @@ <h2 id="t40052" class="heading2-icl">display.input.option()</h2>
5656

5757
</table>
5858
<p class="iclsubheading">Usage</p>
59-
<p class="iclcode">display.BUTTON_OPTION<em class="emphasis">n</em> = display.input.option(&quot;<em class="emphasis">dialogTitle</em>&quot;, &quot;<em class="emphasis">buttonTitle1</em>&quot;, &quot;<em class="emphasis">buttonTitle2</em>&quot;)</p>
60-
<p class="iclcode">display.BUTTON_OPTION<em class="emphasis">n</em> = display.input.option(&quot;<em class="emphasis">dialogTitle</em>&quot;, &quot;<em class="emphasis">buttonTitle1</em>&quot;, &quot;<em class="emphasis">buttonTitle2</em>&quot;<em class="emphasis">, </em>&quot;<em class="emphasis">buttonTitleN</em>&quot;<em class="emphasis">, ... </em>&quot;<em class="emphasis">buttonTitleN</em>&quot;)</p>
59+
<p class="iclcode">BUTTON_OPTION<em class="emphasis">n</em> = display.input.option(&quot;<em class="emphasis">dialogTitle</em>&quot;, &quot;<em class="emphasis">buttonTitle1</em>&quot;, ...)</p>
6160
<p class="iclspacing"></p>
6261
<table class="tableintopic" width="600" cellpadding="2" cellspacing="0" border="1" style="border-collapse:collapse; border:1px solid #C0C0C0">
6362
<tr align="left" valign="top">
64-
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable"><em class="emphasis">n</em></p>
63+
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable">BUTTON_OPTION<em class="emphasis">n</em></p>
6564
</td>
66-
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext">The number of the button that is selected from the front-panel display; <code class="monospace">nil</code> if Cancel is pressed on the keypad; buttons are numbered top to bottom, left to right</p>
65+
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext"><em class="emphasis">n</em> is the number of the button that is selected from the front-panel display; <code class="monospace">nil</code> if Cancel is pressed on the keypad; buttons are numbered top to bottom, left to right</p>
6766
</td>
6867
</tr>
6968
<tr align="left" valign="top">
@@ -79,15 +78,9 @@ <h2 id="t40052" class="heading2-icl">display.input.option()</h2>
7978
</td>
8079
</tr>
8180
<tr align="left" valign="top">
82-
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable"><em class="emphasis">buttonTitle2</em></p>
81+
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable"><em class="emphasis">...</em></p>
8382
</td>
84-
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext">A string that contains the name of the second button; up to 15 characters</p>
85-
</td>
86-
</tr>
87-
<tr align="left" valign="top">
88-
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable"><em class="emphasis">buttonTitleN</em></p>
89-
</td>
90-
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext">A string that contains the names of subsequent buttons, where <span class="monospaceitalic">N</span> is a number from 3 to 10; you can define up to 10 buttons; each button can be up to 15 characters</p>
83+
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext">A string that contains the names of subsequent buttons, where <span class="monospaceitalic">N</span> is a number from 2 to 10; you can define up to 10 buttons; each button can be up to 15 characters</p>
9184
</td>
9285
</tr>
9386

WebHelpDocs/Commands_DMM7510/40052.htm

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ <h2 id="t40052" class="heading2-icl">display.input.option()</h2>
5656

5757
</table>
5858
<p class="iclsubheading">Usage</p>
59-
<p class="iclcode">display.BUTTON_OPTION<em class="emphasis">n</em> = display.input.option(&quot;<em class="emphasis">dialogTitle</em>&quot;, &quot;<em class="emphasis">buttonTitle1</em>&quot;, ...)</p>
59+
<p class="iclcode">BUTTON_OPTION<em class="emphasis">n</em> = display.input.option(&quot;<em class="emphasis">dialogTitle</em>&quot;, &quot;<em class="emphasis">buttonTitle1</em>&quot;, ...)</p>
6060
<p class="iclspacing"></p>
6161
<table class="tableintopic" width="600" cellpadding="2" cellspacing="0" border="1" style="border-collapse:collapse; border:1px solid #C0C0C0">
6262
<tr align="left" valign="top">
63-
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable"><em class="emphasis">n</em></p>
63+
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable">BUTTON_OPTION<em class="emphasis">n</em></p>
6464
</td>
65-
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext">The number of the button that is selected from the front-panel display; <code class="monospace">nil</code> if Cancel is pressed on the keypad; buttons are numbered top to bottom, left to right</p>
65+
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext"><em class="emphasis">n</em> is the number of the button that is selected from the front-panel display; <code class="monospace">nil</code> if Cancel is pressed on the keypad; buttons are numbered top to bottom, left to right</p>
6666
</td>
6767
</tr>
6868
<tr align="left" valign="top">
@@ -78,15 +78,9 @@ <h2 id="t40052" class="heading2-icl">display.input.option()</h2>
7878
</td>
7979
</tr>
8080
<tr align="left" valign="top">
81-
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable"><em class="emphasis">buttonTitle2</em></p>
81+
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable"><em class="emphasis">...</em></p>
8282
</td>
83-
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext">A string that contains the name of the second button; up to 15 characters</p>
84-
</td>
85-
</tr>
86-
<tr align="left" valign="top">
87-
<td style="border:1px solid #C0C0C0;" width="139"><p class="codetable"><em class="emphasis">buttonTitleN</em></p>
88-
</td>
89-
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext">A string that contains the names of subsequent buttons, where <span class="monospaceitalic">N</span> is a number from 3 to 10; you can define up to 10 buttons; each button can be up to 15 characters</p>
83+
<td style="border:1px solid #C0C0C0;" width="461"><p class="tablebodytext">A string that contains the names of subsequent buttons, where <span class="monospaceitalic">N</span> is a number from 2 to 10; you can define up to 10 buttons; each button can be up to 15 characters</p>
9084
</td>
9185
</tr>
9286

WebHelpDocs/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

WebHelpDocs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tektronix/web-help-documents",
3-
"version": "0.15.0",
3+
"version": "0.15.3",
44
"description": "",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)