Skip to content

Commit 324bec6

Browse files
authored
Move some code of portOverride from serial_backend to vue (#3992)
1 parent d0599ae commit 324bec6

File tree

4 files changed

+17
-18
lines changed

4 files changed

+17
-18
lines changed

src/components/port-picker/PortOverrideOption.vue

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,28 @@
55
><span>{{ $t("portOverrideText") }}</span>
66
<input
77
id="port-override"
8-
v-model="value"
8+
:value="value"
99
type="text"
10+
@change="inputValue($event)"
1011
></label>
1112
</div>
1213
</template>
1314

1415
<script>
16+
import { set as setConfig } from '../../js/ConfigStorage';
17+
1518
export default {
16-
data() {
17-
return {
18-
value: "/dev/rfcomm0",
19-
};
19+
props: {
20+
value: {
21+
type: String,
22+
default: "/dev/rfcomm0",
23+
},
24+
},
25+
methods: {
26+
inputValue(event) {
27+
setConfig({'portOverride': event.target.value});
28+
this.$emit("input", event.target.value);
29+
},
2030
},
2131
};
2232
</script>

src/components/port-picker/PortsInput.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
</template>
9595

9696
<script>
97-
import { get as getConfig, set as setConfig } from '../../js/ConfigStorage';
97+
import { set as setConfig } from '../../js/ConfigStorage';
9898
import { EventBus } from '../eventBus';
9999
100100
export default {

src/js/port_handler.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const PortHandler = new function () {
2020
this.portPicker = {
2121
selectedPort: DEFAULT_PORT,
2222
selectedBauds: DEFAULT_BAUDS,
23-
portOverride: "/dev/rfcomm0",
23+
portOverride: getConfig('portOverride', '/dev/rfcomm0').portOverride,
2424
virtualMspVersion: "1.46.0",
2525
autoConnect: getConfig('autoConnect').autoConnect,
2626
};

src/js/serial_backend.js

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,6 @@ function disconnectHandler(event) {
5454

5555
export function initializeSerialBackend() {
5656

57-
// TODO move to Vue
58-
$('#port-override').change(function () {
59-
setConfig({'portOverride': $('#port-override').val()});
60-
});
61-
62-
// TODO move to Vue
63-
const data = getConfig('portOverride');
64-
if (data.portOverride) {
65-
$('#port-override').val(data.portOverride);
66-
}
67-
6857
$("div.connect_controls a.connect").on('click', connectDisconnect);
6958

7059
EventBus.$on('port-handler:auto-select-serial-device', function(device) {

0 commit comments

Comments
 (0)