Skip to content

D
domotikad
Commit d6035ba8 authored by nextime's avatar nextime
Browse files
Options

Some iOS (crap OS!) specific fixes and prevent horizontal scroll on window object

parent 76e85c65
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 10 deletions
Web/htdocs/gui/css/combined.min.css
View file @ d6035ba8
This source diff could not be displayed because it is too large. You can view the blob instead.
Web/htdocs/gui/css/style.css
View file @ d6035ba8
html {
overflow: hidden;
overflow-y: auto;
width:100%;
}
.alert-container { .alert-container {
position: fixed; position: fixed;
......
Web/htdocs/gui/includes/page.php
View file @ d6035ba8
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<?=$PAGE_BUFFER['head']?> <?=$PAGE_BUFFER['head']?>
<?=$PAGE_ADDHEAD?> <?=$PAGE_ADDHEAD?>
</head> </head>
<body class="scrollable-vertical theme-<?=$_DOMOTIKA['gui_theme']?>"> <body class="scrollable-vertical theme-<?=$_DOMOTIKA['gui_theme']?>">
<?=$PAGE_BUFFER['alerts']?> <?=$PAGE_BUFFER['alerts']?>
<?=$PAGE_BUFFER['navbar']?> <?=$PAGE_BUFFER['navbar']?>
<div class="drawers"> <div class="drawers">
......
Web/htdocs/gui/js/combined.min.js
View file @ d6035ba8
...@@ -119,6 +119,38 @@ window.matchMedia=window.matchMedia||function(a){"use strict";var c,d=a.document ...@@ -119,6 +119,38 @@ window.matchMedia=window.matchMedia||function(a){"use strict";var c,d=a.document
} }
*/ */
(function () {
var previousScroll = 0;
$(window).scroll(function(event){
$(this).scrollLeft()!=0;
$(window).scrollLeft(0);
event.preventDefault();
});
}()); // to disable right scroll on panels open
$(window).scroll(function(event){
console.debug(event);
});
if(window.navigator.userAgent.match(/(iPad|iPhone|iPod)/g))
{
$(document).ready(function(){
if (("standalone" in window.navigator) && window.navigator.standalone) {
// For iOS Apps
$('a').on('click', function(e){
e.preventDefault();
var new_location = $(this).attr('href');
if (new_location != undefined && new_location.substr(0, 1) != '#' && $(this).attr('data-method') == undefined){
window.location = new_location;
}
});
}
});
}
if(window.navigator.userAgent.match(/firefox/i) && window.navigator.userAgent.match(/mobile/i)) if(window.navigator.userAgent.match(/firefox/i) && window.navigator.userAgent.match(/mobile/i))
{ {
......
Web/htdocs/gui/js/domotika.js
View file @ d6035ba8
...@@ -34,6 +34,38 @@ ...@@ -34,6 +34,38 @@
} }
*/ */
(function () {
var previousScroll = 0;
$(window).scroll(function(event){
$(this).scrollLeft()!=0;
$(window).scrollLeft(0);
event.preventDefault();
});
}()); // to disable right scroll on panels open
$(window).scroll(function(event){
console.debug(event);
});
if(window.navigator.userAgent.match(/(iPad|iPhone|iPod)/g))
{
$(document).ready(function(){
if (("standalone" in window.navigator) && window.navigator.standalone) {
// For iOS Apps
$('a').on('click', function(e){
e.preventDefault();
var new_location = $(this).attr('href');
if (new_location != undefined && new_location.substr(0, 1) != '#' && $(this).attr('data-method') == undefined){
window.location = new_location;
}
});
}
});
}
if(window.navigator.userAgent.match(/firefox/i) && window.navigator.userAgent.match(/mobile/i)) if(window.navigator.userAgent.match(/firefox/i) && window.navigator.userAgent.match(/mobile/i))
{ {
......
Web/htdocs/gui/pages/settings.php
View file @ d6035ba8
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<!-- <li <? if($GUISUBSECTION=="gui") {?>class="active"<?}?>><a href="<?=$BASEGUIPATH.'/'.$GUISECTION?>/gui">GUI options</a></li> --> <!-- <li <? if($GUISUBSECTION=="gui") {?>class="active"<?}?>><a href="<?=$BASEGUIPATH.'/'.$GUISECTION?>/gui">GUI options</a></li> -->
</ul> </ul>
<? if($GUISUBSECTION=="") {?> <? if($GUISUBSECTION=="") {?>
<div class="formcontainer"> <div class="formcontainer" >
<form id="userform" name="userform" class="form-horizontal" style="display:none"> <form id="userform" name="userform" class="form-horizontal" style="display:none;margin-bottom:60px;">
<div class="form-group"> <div class="form-group">
<label for="username" class="col-lg-2 control-label">Username:</label> <label for="username" class="col-lg-2 control-label">Username:</label>
<div class="col-lg-3"> <div class="col-lg-3">
......
Web/htdocs/gui/panels/footjs/graph.php
View file @ d6035ba8
...@@ -28,7 +28,7 @@ function plotGraph(settings) ...@@ -28,7 +28,7 @@ function plotGraph(settings)
}); });
} }
<? <?
foreach($_SESSION[PANELS_CHARTS] as $eid => $chart) foreach($_SESSION['PANELS_CHARTS'] as $eid => $chart)
{ {
?> ?>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment