Skip to content

Commit

Permalink
Fix zoom on mobile devices
Browse files Browse the repository at this point in the history
  • Loading branch information
wrfz committed Mar 29, 2024
1 parent 36aebe2 commit afdec04
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 2 deletions.
8 changes: 7 additions & 1 deletion power-graph.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38556,7 +38556,7 @@ class $e866791a01b6c100$export$614db49f3febe941 {
{
type: "inside",
filterMode: "none",
zoomLock: !smallDevice,
zoomLock: !this._powerGraph.isMobile(),
start: 50,
end: 100
}
Expand Down Expand Up @@ -38736,6 +38736,7 @@ class $e866791a01b6c100$export$614db49f3febe941 {
if (this._globalConfig.showInfo) {
const clientArea = this._powerGraph.getClientArea();
// info += `Current time: ${DateTime.local().toISO()}\n`;
info += `IsMobile: ${this._powerGraph.isMobile()}\n`;
info += `Size: ${clientArea.first} x ${clientArea.second} \n`;
info += `Renderer: ${this._globalConfig.renderer} \n`;
info += `Sampling: ${this._globalConfig.sampling} \n`;
Expand Down Expand Up @@ -67304,6 +67305,8 @@ class $e23f1e1a76e2d7ce$var$PowerGraph extends HTMLElement {
this._graphs = [];
for (const graphConfig of this._config.graphs)this._graphs.push(new (0, $e866791a01b6c100$export$614db49f3febe941)(this, graphConfig));
this._config.validate();
const userAgent = navigator.userAgent || navigator.vendor;
this._isMobile = /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(userAgent) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(userAgent.substr(0, 4));
this.createContent();
}
set hass(hass) {
Expand Down Expand Up @@ -67393,6 +67396,9 @@ class $e23f1e1a76e2d7ce$var$PowerGraph extends HTMLElement {
getClientArea() {
return new (0, $53eba6098f86b86c$export$d63d7cff08fe4dc9)(this._mainContener.clientWidth, this._mainContener.clientHeight);
}
isMobile() {
return this._isMobile;
}
connectedCallback() {
//console.log("connectedCallback");
this._resizeObserver.observe(this._mainContener);
Expand Down
3 changes: 2 additions & 1 deletion src/Graph.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ export class Graph {
{
type: 'inside',
filterMode: 'none',
zoomLock: !smallDevice,
zoomLock: !this._powerGraph.isMobile(),
start: 50,
end: 100
// zoomOnMouseWheel: smallDevice ? true : 'ctrl',
Expand Down Expand Up @@ -382,6 +382,7 @@ export class Graph {
if (this._globalConfig.showInfo) {
const clientArea: Pair<number, number> = this._powerGraph.getClientArea();
// info += `Current time: ${DateTime.local().toISO()}\n`;
info += `IsMobile: ${this._powerGraph.isMobile()}\n`;
info += `Size: ${clientArea.first} x ${clientArea.second} \n`;
info += `Renderer: ${this._globalConfig.renderer} \n`;
info += `Sampling: ${this._globalConfig.sampling} \n`;
Expand Down
13 changes: 13 additions & 0 deletions src/PowerGraph.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export interface IPowerGraph {
getTimeRange(): TimeRange;
setTimeRange(timeRange: TimeRange): void;
getClientArea(): Pair<number, number>;
isMobile(): boolean;
}

class PowerGraph extends HTMLElement implements IPowerGraph {
Expand All @@ -84,6 +85,7 @@ class PowerGraph extends HTMLElement implements IPowerGraph {
private _infoBox: HTMLElement;
private _range: TimeRange;
private _resizeObserver;
private _isMobile: boolean;

constructor() {
super();
Expand All @@ -100,6 +102,13 @@ class PowerGraph extends HTMLElement implements IPowerGraph {
this._graphs.push(new Graph(this, graphConfig));
}
this._config.validate();

const userAgent: string = navigator.userAgent || navigator.vendor;
this._isMobile = (
/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(userAgent) ||
/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(userAgent.substr(0, 4))
);

this.createContent();
}

Expand Down Expand Up @@ -212,6 +221,10 @@ class PowerGraph extends HTMLElement implements IPowerGraph {
return new Pair<number, number>(this._mainContener.clientWidth, this._mainContener.clientHeight);
}

isMobile(): boolean {
return this._isMobile;
}

connectedCallback(): void {
//console.log("connectedCallback");
this._resizeObserver.observe(this._mainContener);
Expand Down

0 comments on commit afdec04

Please sign in to comment.