Merge remote-tracking branch 'origin/dev'

Duet3D · Oct 8, 2019 · df0551a · df0551a
2 parents 6d619f6 + 2aa7b2c
commit df0551a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "duetwebcontrol",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "repository": "github:chrishamm/DuetWebControl",
   "homepage": "https://forum.duet3d.com/category/27/duet-web-control",
   "license": "GPL-3.0",

diff --git a/src/components/panels/MovementPanel.vue b/src/components/panels/MovementPanel.vue
@@ -32,7 +32,7 @@
 
 				<v-card>
 					<v-list>
-						<template v-if="move.compensation">
+						<template v-show="move.compensation">
 							<v-list-tile class="center-menu-item">
 								{{ $t('panel.movement.compensationInUse', [move.compensation]) }}
 							</v-list-tile>
@@ -140,10 +140,10 @@
 		<mesh-edit-dialog :shown.sync="showMeshEditDialog"></mesh-edit-dialog>
 		<input-dialog :shown.sync="moveStepDialog.shown" :title="$t('dialog.changeMoveStep.title')" :prompt="$t('dialog.changeMoveStep.prompt')" :preset="moveStepDialog.preset" is-numeric-value @confirmed="moveStepDialogConfirmed"></input-dialog>
 
-		<v-alert v-if="unhomedAxes.length" :value="true" type="warning">
+		<v-alert :value="!!unhomedAxes.length" type="warning">
 			{{ $tc('panel.movement.axesNotHomed', unhomedAxes.length) }}
 			<strong>
-				{{ unhomedAxes.map(axis => axis.letter).reduce((a, b) => `${a}, ${b}`) }}
+				{{ unhomedAxes.length ? unhomedAxes.map(axis => axis.letter).reduce((a, b) => `${a}, ${b}`) : '' }}
 			</strong>
 		</v-alert>
 

diff --git a/src/components/panels/SettingsAboutPanel.vue b/src/components/panels/SettingsAboutPanel.vue
@@ -3,13 +3,13 @@
 		<v-card-title>
 			<span>Duet Web Control {{ version }}</span>
 			<v-spacer></v-spacer>
-			<a href="https://github.com/chrishamm/DuetWebControl/tree/next" target="_blank">
+			<a href="https://github.com/chrishamm/DuetWebControl" target="_blank">
 				<v-icon small>star</v-icon> GitHub
 			</a>
 		</v-card-title>
 
 		<v-card-text class="pt-0">
-			{{ $t('panel.settingsAbout.developedBy') }} <a href="mailto:chr.hammacher@gmail.com">Christian Hammacher</a> {{ $t('panel.settingsAbout.for') }} <a href="https://www.duet3d.com" target="_blank">Duet3D</a>
+			{{ $t('panel.settingsAbout.developedBy') }} <a href="mailto:christian@duet3d.com">Christian Hammacher</a> {{ $t('panel.settingsAbout.for') }} <a href="https://www.duet3d.com" target="_blank">Duet3D</a>
 			<br/>
 			{{ $t('panel.settingsAbout.licensedUnder') }} <a href="https://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank">GNU General Public License v3</a>
 		</v-card-text>

diff --git a/src/components/panels/ToolsPanel.vue b/src/components/panels/ToolsPanel.vue
@@ -391,7 +391,7 @@ export default {
 		getHeaterColor: heater => getHeaterColor(heater),
 		getExtraHeaterColor: heater => getExtraHeaterColor(heater),
 		formatHeaterName(heater, index) {
-			if (heater.name) {
+			if (heater && heater.name) {
 				const matches = /(.*)\[(.*)\]$/.exec(heater.name);
 				if (matches) {
 					return matches[1];

diff --git a/src/store/machine/connector/PollConnector.js b/src/store/machine/connector/PollConnector.js
@@ -432,12 +432,16 @@ export default class PollConnector extends BaseConnector {
 				});
 			}
 		} else if (statusType === 3) {
+			if (!newData.job) {
+				newData.job = {};
+			}
+
 			// Print Status Response
-			newData.job  = {
+			quickPatch(newData.job, {
 				file: {},
 				filePosition: response.data.filePosition,
 				extrudedRaw: response.data.extrRaw
-			}
+			});
 
 			// Update some stats only if the print is still live
 			if (isPrinting) {

diff --git a/src/store/machine/modelItems.js b/src/store/machine/modelItems.js
@@ -1,5 +1,7 @@
 'use strict'
 
+import Vue from 'vue'
+
 import { quickPatch } from '../../utils/patch.js'
 
 export class Axis {
@@ -272,7 +274,7 @@ function fixItems(items, ClassType) {
 		if (item !== null) {
 			for (let key in preset) {
 				if (!item.hasOwnProperty(key)) {
-					item[key] = preset[key];
+					Vue.set(item, key, preset[key]);
 					if (preset[key] instanceof Object) {
 						preset = new ClassType();
 					}