Skip to content

Commit 2cdc262

Browse files
committed
Merge branch 'master' into pehecke-plugin
2 parents 5560a28 + 564f710 commit 2cdc262

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

powerapps-docs/maker/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,6 @@
196196
href: ./canvas-apps/use-line-pie-bar-chart.md
197197
- name: Add multimedia
198198
href: ./canvas-apps/add-images-pictures-audio-video.md
199-
- name: Scan a barcode
200-
href: ./canvas-apps/scan-barcode.md
201199
- name: Add Power BI data
202200
href: ./canvas-apps/powerapps-custom-visual.md
203201
- name: Control reference
@@ -209,6 +207,8 @@
209207
href: ./canvas-apps/controls/control-attachments.md
210208
- name: Audio
211209
href: ./canvas-apps/controls/control-audio-video.md
210+
- name: Barcode scanner (experimental)
211+
href: ./canvas-apps/controls/control-barcodescanner.md
212212
- name: Barcode scanner
213213
href: ./canvas-apps/controls/control-new-barcode-scanner.md
214214
- name: Button

powerapps-docs/maker/canvas-apps/controls/control-new-barcode-scanner.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ The control supports QR codes, data-matrix codes, and these types of barcodes:
3939

4040
**Text** - Text that appears on the button that activates the scanner.
4141

42+
**OnScan** – How an app responds when a barcode is successfully scanned.
43+
4244
## Additional properties
4345

4446
**[BorderColor](properties-color-border.md)** – The color of a control's border.
@@ -63,4 +65,4 @@ The control supports QR codes, data-matrix codes, and these types of barcodes:
6365

6466
**[X](properties-size-___location.md)** – The distance between the left edge of a control and the left edge of its parent container (screen if no parent container).
6567

66-
**[Y](properties-size-___location.md)** – The distance between the top edge of a control and the top edge of the parent container (screen if no parent container).
68+
**[Y](properties-size-___location.md)** – The distance between the top edge of a control and the top edge of the parent container (screen if no parent container).

powerapps-docs/maker/canvas-apps/reference-properties.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ Configure the appearance and behavior of a control by setting one of its propert
2626

2727
**[Audio](controls/control-audio-video.md)** – Play an audio clip or the audio portion of a video clip.
2828

29+
**[Barcode scanner (experimental)](controls/control-barcodescanner.md)** – Scans codes in a web browser (legacy/obsolete).
30+
2931
**[Barcode scanner](controls/control-new-barcode-scanner.md)** – Scans barcodes, QR codes, and data-matrix codes on an Android or iOS device.
3032

3133
**[Button](controls/control-button.md)** – Interact with the app by clicking or tapping.

0 commit comments

Comments
 (0)