tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-12-13 Sergio Martin <sergio.martin@artica.es> 

* mobile/operation/events.php, mobile/operation/modules.php,
	mobile/operation/agents.php: fixed the scroll of list for old
	browser in android mobiles devices.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9223 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-12-13 11:50:20 +00:00
parent 6a0212c5d4
commit 182b594c1c
4 changed files with 93 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-12-13 Sergio Martin <sergio.martin@artica.es>
* mobile/operation/events.php, mobile/operation/modules.php,
mobile/operation/agents.php: fixed the scroll of list for old
browser in android mobiles devices.
2013-12-13 Sergio Martin <sergio.martin@artica.es>
* include/graphs/flot/pandora.flot.js: Fixed wrong

13
pandora_console/mobile/operation/agents.php
View File

@ -354,8 +354,8 @@ class Agents {
$ui->contentAddHtml("<script type=\"text/javascript\">
var load_more_rows = 1;
var page = 1;
$(document).ready(function() {
$(window).bind(\"scroll\", function () {
function custom_scroll() {
if (load_more_rows) {
if ($(this).scrollTop() + $(this).height()
@ -404,6 +404,15 @@ class Agents {
\"json\");
}
}
}
$(document).ready(function() {
$(window).bind(\"scroll\", function () {
custom_scroll();
});
$(window).on(\"touchmove\", function(event) {
custom_scroll();
});
});
</script>");

14
pandora_console/mobile/operation/events.php
View File

@ -944,14 +944,24 @@ class Events {
}
$(document).ready(function() {
ajax_load_rows();
$(window).bind(\"scroll\", function () {
custom_scroll();
});
$(window).on(\"touchmove\", function(event) {
custom_scroll();
});
});
function custom_scroll() {
if ($(this).scrollTop() + $(this).height()
>= ($(document).height() - 100)) {
ajax_load_rows();
}
});
});
}
</script>");
}

12
pandora_console/mobile/operation/modules.php
View File

@ -593,9 +593,8 @@ class Modules {
$ui->contentAddHtml("<script type=\"text/javascript\">
var load_more_rows = 1;
var page = 1;
$(document).ready(function() {
$(window).bind(\"scroll\", function () {
function custom_scroll() {
if (load_more_rows) {
if ($(this).scrollTop() + $(this).height()
>= ($(document).height() - 100)) {
@ -641,6 +640,15 @@ class Modules {
\"json\");
}
}
}
$(document).ready(function() {
$(window).bind(\"scroll\", function () {
custom_scroll();
});
$(window).on(\"touchmove\", function(event) {
custom_scroll();
});
});
</script>");