Fixed sticky modal issue mostly by removing anims
This commit is contained in:
@@ -97,13 +97,12 @@ module.exports = {
|
|||||||
|
|
||||||
'state.bitDiameter': {
|
'state.bitDiameter': {
|
||||||
handler: function (bitDiameter) {
|
handler: function (bitDiameter) {
|
||||||
console.log("New bitDiameter " + bitDiameter);
|
if(this.mach_units == 'IMPERIAL') {
|
||||||
console.log("Units: " + this.mach_units);
|
|
||||||
if(this.mach_units == 'IMPERIAL')
|
|
||||||
this.tool_diameter = bitDiameter / 25.4;
|
this.tool_diameter = bitDiameter / 25.4;
|
||||||
else
|
}
|
||||||
|
else {
|
||||||
this.tool_diameter = bitDiameter;
|
this.tool_diameter = bitDiameter;
|
||||||
console.log("Tool diameter: " + this.tool_diameter);
|
}
|
||||||
},
|
},
|
||||||
immediate: true
|
immediate: true
|
||||||
},
|
},
|
||||||
@@ -482,25 +481,23 @@ module.exports = {
|
|||||||
|
|
||||||
this.showGcodeMessage = true;
|
this.showGcodeMessage = true;
|
||||||
|
|
||||||
let done = false;
|
while (this.showGcodeMessage) {
|
||||||
while (!done) {
|
|
||||||
const toolpath = await api.get(`path/${file}`);
|
const toolpath = await api.get(`path/${file}`);
|
||||||
|
this.toolpath_progress = toolpath.progress;
|
||||||
|
|
||||||
if (typeof toolpath.progress == 'undefined') {
|
if (typeof toolpath.progress == 'undefined') {
|
||||||
done = true;
|
this.showGcodeMessage = false
|
||||||
|
|
||||||
toolpath.filename = file;
|
toolpath.filename = file;
|
||||||
this.toolpath_progress = 1;
|
this.toolpath_progress = 1;
|
||||||
this.showGcodeMessage = false;
|
|
||||||
this.toolpath = toolpath;
|
this.toolpath = toolpath;
|
||||||
|
|
||||||
var state = this.$root.state;
|
const state = this.$root.state;
|
||||||
var bounds = toolpath.bounds;
|
const bounds = toolpath.bounds;
|
||||||
for (var axis of 'xyzabc') {
|
for (let axis of 'xyzabc') {
|
||||||
Vue.set(state, 'path_min_' + axis, bounds.min[axis]);
|
Vue.set(state, 'path_min_' + axis, bounds.min[axis]);
|
||||||
Vue.set(state, 'path_max_' + axis, bounds.max[axis]);
|
Vue.set(state, 'path_max_' + axis, bounds.max[axis]);
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
this.toolpath_progress = toolpath.progress;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
//-/////////////////////////////////////////////////////////////////////////////
|
//-/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
script#message-template(type="text/x-template")
|
script#message-template(type="text/x-template")
|
||||||
.modal-mask(v-show="show", transition="modal")
|
.modal-mask(v-if="show")
|
||||||
.modal-wrapper
|
.modal-wrapper
|
||||||
.modal-container
|
.modal-container
|
||||||
.modal-header
|
.modal-header
|
||||||
|
|||||||
Reference in New Issue
Block a user