Skip to content

Commit 89b80b1

Browse files
committed
fix iOS innerText bug; fix sound bug
1 parent 473f189 commit 89b80b1

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

2.ui-tweaking/3.read-video-with-external-control.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,11 @@ <h1 style="font-size: 1.5em;">Customized UI</h1>
158158
let scanner = await pScanner;
159159
scanner && scanner.hide();
160160
});
161-
document.getElementById('toggleSound').addEventListener("click", async() => {
161+
document.getElementById('toggleSound').addEventListener("click", async(e) => {
162162
if (pScanner) {
163163
let scanner = await pScanner;
164164
let scanSettings = await scanner.getScanSettings();
165-
scanSettings.whenToPlaySoundforSuccessfulRead = this.checked ? "frame" : "never";
165+
scanSettings.whenToPlaySoundforSuccessfulRead = document.getElementById("toggleSound").checked ? "frame" : "never";
166166
await scanner.updateScanSettings(scanSettings);
167167
}
168168
});
@@ -274,15 +274,15 @@ <h1 style="font-size: 1.5em;">Customized UI</h1>
274274
let li = document.createElement("li");
275275
let span = document.createElement("span");
276276
span.setAttribute("id", camera.deviceId);
277-
span.innerText = camera.label;
277+
span.textContent = camera.label;
278278
li.appendChild(span);
279279
document.getElementById("ul_options_camera").appendChild(li);
280280
});
281281
const camOption = document.querySelectorAll("#ul_options_camera span");
282282
camOption.forEach(sapn => {
283283
sapn.addEventListener("click", camOptionSelected);
284284
if (!currentCamera || sapn.id === currentCamera.deviceId) {
285-
document.getElementById("selector_input_camera").value = sapn.innerText;
285+
document.getElementById("selector_input_camera").value = sapn.textContent;
286286
sapn.classList.add("selected");
287287
} else {
288288
sapn.classList.remove("selected");
@@ -297,10 +297,10 @@ <h1 style="font-size: 1.5em;">Customized UI</h1>
297297
let scanner = await pScanner;
298298
const currentResolution = await scanner.getResolution();
299299
let gotResolution = document.querySelector("#gotResolution span");
300-
gotResolution.innerText = 'got ' + currentResolution[0] + ' x ' + currentResolution[1];
300+
gotResolution.textContent = 'got ' + currentResolution[0] + ' x ' + currentResolution[1];
301301
gotResolution.id = currentResolution[0] + 'x' + currentResolution[1];
302302
gotResolution.classList.add("selected");
303-
document.getElementById("selector_input_resolution").value = gotResolution.innerText;
303+
document.getElementById("selector_input_resolution").value = gotResolution.textContent;
304304
const checked = document.getElementById("toggleScanLight").checked;
305305
setScanLightView(checked);
306306
}

2.ui-tweaking/5.read-video-with-custom-default-ui.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ <h1>Customized Default UI</h1>
135135
let span = document.createElement("span");
136136
span.addEventListener("click", camOptionSelected);
137137
span.setAttribute("id", camera.deviceId);
138-
span.innerText = camera.label;
138+
span.textContent = camera.label;
139139
if (camera.deviceId === currentCamera.deviceId) {
140140
document.getElementById("selector_input_camera").value = camera.label;
141141
span.classList.add("selected");
@@ -151,10 +151,10 @@ <h1>Customized Default UI</h1>
151151
const currentResolution = await scanner.getResolution();
152152
const gotResolution = document.querySelector("#gotResolution span");
153153
const resOptions = document.querySelectorAll("#ul_options_resolution span");
154-
gotResolution.innerText = 'got ' + currentResolution[0] + ' x ' + currentResolution[1];
154+
gotResolution.textContent = 'got ' + currentResolution[0] + ' x ' + currentResolution[1];
155155
gotResolution.id = currentResolution[0] + 'x' + currentResolution[1];
156156
gotResolution.classList.add("selected");
157-
document.getElementById("selector_input_resolution").value = gotResolution.innerText;
157+
document.getElementById("selector_input_resolution").value = gotResolution.textContent;
158158
for (let i = 0; i < resOptions.length; i++) {
159159
resOptions[i].addEventListener("click", resOptionSelected);
160160
};
@@ -199,7 +199,7 @@ <h1>Customized Default UI</h1>
199199
const _currentCamera = await scanner.getCurrentCamera();
200200
camOptions.forEach(span => {
201201
if (span.id === _currentCamera.deviceId) {
202-
document.getElementById("selector_input_camera").value = span.innerText;
202+
document.getElementById("selector_input_camera").value = span.textContent;
203203
span.classList.add("selected");
204204
} else {
205205
span.classList.remove("selected");
@@ -222,9 +222,9 @@ <h1>Customized Default UI</h1>
222222
const _currentResolution = await scanner.getResolution();
223223
const gotResolution = document.querySelector("#gotResolution span");
224224
const resOptions = document.querySelectorAll("#ul_options_resolution span");
225-
gotResolution.innerText = 'got ' + _currentResolution[0] + ' x ' + _currentResolution[1];
225+
gotResolution.textContent = 'got ' + _currentResolution[0] + ' x ' + _currentResolution[1];
226226
gotResolution.id = _currentResolution[0] + 'x' + _currentResolution[1];
227-
document.getElementById("selector_input_resolution").value = gotResolution.innerText;
227+
document.getElementById("selector_input_resolution").value = gotResolution.textContent;
228228
toggleMaskView();
229229
}
230230
// camera's styles mask show or not

0 commit comments

Comments
 (0)