Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release v2.1.2 #639

Merged
merged 9 commits into from
Feb 14, 2022
Merged

release v2.1.2 #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
25752af
chore: push version number to v2.1.2
meteyou Feb 12, 2022
5796ab5
fix: fix button text when click "firmwareRestart" while printing
meteyou Feb 12, 2022
1cea3b8
fix: display sensors with a - in the name
meteyou Feb 12, 2022
94f59f5
fix: display sensors with a - in the name in the tempchart tooltip
meteyou Feb 12, 2022
1fa705a
fix: size of the gcode dragzone in Safari to upload gcode files
meteyou Feb 12, 2022
cddb772
fix: request klippy error messages when klippy state === shutdown
meteyou Feb 12, 2022
b272311
fix: trigger timelapse settings when timelapse webcam will be changed
meteyou Feb 12, 2022
212a5b7
locale(pl): update PL from develop
meteyou Feb 14, 2022
6a5400e
locale(da): update DA from develop
meteyou Feb 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mainsail",
"version": "2.1.1",
"version": "2.1.2",
"private": true,
"decription": "a klipper web interface",
"author": {
Expand Down
4 changes: 3 additions & 1 deletion src/components/TheTopCornerMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,13 @@ export default class TheTopCornerMenu extends Mixins(BaseMixin) {
const actionUppercase = action.trim().charAt(0).toUpperCase() + action.trim().slice(1)
let titleKey = 'App.TopCornerMenu.ConfirmationDialog.Title.Service' + actionUppercase
let descriptionKey = 'App.TopCornerMenu.ConfirmationDialog.Description.Service' + actionUppercase
const buttonKey = 'App.TopCornerMenu.' + actionUppercase
let buttonKey = 'App.TopCornerMenu.' + actionUppercase

if (serviceName === 'klipper' && ['stop', 'restart', 'firmwareRestart'].includes(action)){
titleKey = 'App.TopCornerMenu.ConfirmationDialog.Title.' + (action !== 'stop' ? 'Klipper' : 'Service') + actionUppercase
descriptionKey = 'App.TopCornerMenu.ConfirmationDialog.Description.Klipper' + actionUppercase

if (action === 'firmwareRestart') buttonKey = 'App.TopCornerMenu.KlipperFirmwareRestart'
} else if (serviceName === 'host') {
titleKey = 'App.TopCornerMenu.ConfirmationDialog.Title.Host' + actionUppercase
descriptionKey = 'App.TopCornerMenu.ConfirmationDialog.Description.Host' + actionUppercase
Expand Down
14 changes: 13 additions & 1 deletion src/components/charts/TempChart.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,19 @@ export default class TempChart extends Mixins(BaseMixin) {
tooltipFormater(datasets: any) {
let output = ''

const mainDatasets = datasets.filter((dataset: any) => !dataset.seriesName.includes('-') && dataset.seriesName !== 'date')
const mainDatasets = datasets.filter((dataset: any) => {
if (dataset.seriesName === 'date') return false
if (dataset.seriesName.includes('-')) {
if (dataset.seriesName.lastIndexOf('-') > -1) {
const suffix = dataset.seriesName.slice(dataset.seriesName.lastIndexOf('-') + 1)
return !['target', 'power'].includes(suffix)
}

return true
}

return true
})
if (datasets.length) {
let outputTime = datasets[0]['axisValueLabel']
outputTime = outputTime.substr(outputTime.indexOf(' '))
Expand Down
9 changes: 3 additions & 6 deletions src/components/panels/GcodefilesPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@
}

.dragzone {
display: table;
position: absolute;
top: 0; left: 0;
width: 100%; height: 100%;
top: 0; left: 0; right: 0; bottom: 0;
height: 100%;
z-index: 9999999999;
background-color: rgba(0, 0, 0, 0.5);
transition: visibility 175ms, opacity 175ms;
Expand All @@ -36,9 +35,7 @@
}

.dragzone .textnode {
display: table-cell;
text-align: center;
vertical-align: middle;
transition: font-size 175ms;
}
</style>
Expand Down Expand Up @@ -222,7 +219,7 @@
</tr>
</template>
</v-data-table>
<div class="dragzone" :style="'visibility: '+dropzone.visibility+'; opacity: '+dropzone.hidden">
<div class="dragzone d-flex justify-center flex-column" :style="'visibility: '+dropzone.visibility+'; opacity: '+dropzone.hidden">
<div class="textnode">{{ $t('Files.DropFilesToAddGcode')}}</div>
</div>
</panel>
Expand Down
Loading