use 0x01 for seps in labels string so users can use pipe if they want to

This commit is contained in:
2017-08-05 23:56:35 +02:00
parent 4551ad6dbe
commit 0b3cfe0e74
6 changed files with 10 additions and 17 deletions
+2 -1
View File
@@ -6,13 +6,14 @@
* are given to JavaScript, to avoid syntax errors with %%
*/
return [
'%term_title%' => 'ESP8266 Wireless Terminal',
'%term_title%' => 'ESPTerm local debug',
'%btn1%' => '1',
'%btn2%' => '2',
'%btn3%' => '3',
'%btn4%' => '',
'%btn5%' => '5',
'%labels_seq%' => 'TESPTerm local debug1235',
'%screenData%' => '  HELLOx NRE3',//'\u000b\u0001\u001b\u0001\u0001\u0001\u0001\u0001\f\u0005\u0001\u0010\u0003HELLOx\u0002\u000b\u0001\u0001N\u0001RE\u00023\u0001', //,
/*'{
+1 -1
View File
@@ -1408,7 +1408,7 @@ var Screen = (function () {
}
function _load_labels(str) {
var pieces = str.split('|');
var pieces = str.split('\x01');
qs('h1').textContent = pieces[0];
qsa('#buttons button').forEach(function(x, i) {
var s = pieces[i+1].trim();
+1 -1
View File
@@ -216,7 +216,7 @@ var Screen = (function () {
}
function _load_labels(str) {
var pieces = str.split('|');
var pieces = str.split('\x01');
qs('h1').textContent = pieces[0];
qsa('#buttons button').forEach(function(x, i) {
var s = pieces[i+1].trim();
+1 -1
View File
@@ -32,7 +32,7 @@
</nav>
<!-- this avoids having to escape quotes for JSON -->
<span class="hidden" id="initial_data">T%term_title%|%btn1%|%btn2%|%btn3%|%btn4%|%btn5%</span>
<span class="hidden" id="initial_data">%labels_seq%</span>
<script>
try {