Skip to content

Commit

Permalink
Merge branch 'hotfix/3.2.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
gegu committed Apr 2, 2021
2 parents 6f9a5ef + aa6999c commit fa7c985
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions js/touchBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class TouchBar {
el.classList = name + " touchBarElement";
el.style.lineHeight = self.height;
el.style.fontSize = ($('#touch-bar-container').height()*0.8) + 'px';
$(el).on('touchend', function(event) {
$(el).on('click', function(event) {
// don't bubble up events to prevent disappearing sweetalert messages
event.preventDefault();
clearTimeout(self.autoHideTimerId);
Expand All @@ -47,7 +47,7 @@ class TouchBar {

touchBarContainer.appendChild(touchBarBlur);
touchBarContainer.appendChild(touchBar);
$("#touch-container").on('touchend', function(event) {
$("#touch-container").on('click', function(event) {
self.toggle()
});
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "teleframe",
"version": "3.2.1",
"version": "3.2.2",
"description": "",
"main": "main.js",
"scripts": {
Expand Down

6 comments on commit fa7c985

@gegu
Copy link
Collaborator Author

@gegu gegu commented on fa7c985 Apr 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix for #124 and #156.

@LukeSkywalker92
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey,

are you sure that this does not break the usage of "normal" touchscreens (e.g. the rpi touchscreen)?

@gegu
Copy link
Collaborator Author

@gegu gegu commented on fa7c985 Apr 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately I can not test this on a rpi touchscreen. However, I think it should already work .

I will still look at this on a hdmi touchscreen with a pi. I have tested new features with this so far.

@gegu
Copy link
Collaborator Author

@gegu gegu commented on fa7c985 Apr 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Normally, browsers fire 'touchend' first and then 'click'.

@gegu
Copy link
Collaborator Author

@gegu gegu commented on fa7c985 Apr 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be on the safe side, both events are now handled.
Now everyone should be satisfied 😄

@LukeSkywalker92
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect 👍

Please sign in to comment.