aboutsummaryrefslogtreecommitdiffstats
path: root/view/js
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2014-03-25 15:27:45 +0100
committermarijus <mario@mariovavti.com>2014-03-25 15:27:45 +0100
commit89b573a6f3b7409ba9f8ba9fe41ed06b8106836b (patch)
tree4ec44719a881d675f62e2556507cdecc67c3fdf1 /view/js
parent50a7e9ce8fe30959d6e4343e8fdafaeca1e7856c (diff)
downloadvolse-hubzilla-89b573a6f3b7409ba9f8ba9fe41ed06b8106836b.tar.gz
volse-hubzilla-89b573a6f3b7409ba9f8ba9fe41ed06b8106836b.tar.bz2
volse-hubzilla-89b573a6f3b7409ba9f8ba9fe41ed06b8106836b.zip
fix lock permissions view and autoload not kicking in on touch devices under certain conditions
Diffstat (limited to 'view/js')
-rw-r--r--view/js/main.js26
1 files changed, 4 insertions, 22 deletions
diff --git a/view/js/main.js b/view/js/main.js
index 5f88ea9ca..38cde749c 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -728,27 +728,10 @@ function updateConvItems(mode,data) {
return cursor;
}
- var lockvisible = false;
-
function lockview(event,id) {
- event = event || window.event;
- cursor = getPosition(event);
- if(lockvisible) {
- lockviewhide();
- }
- else {
- lockvisible = true;
- $.get('lockview/' + id, function(data) {
- $('#panel').html(data);
- $('#panel').css({ 'left': cursor.x + 5 , 'top': cursor.y + 5});
- $('#panel').show();
- });
- }
- }
-
- function lockviewhide() {
- lockvisible = false;
- $('#panel').hide();
+ $.get('lockview/' + id, function(data) {
+ $('#panel-' + id).html(data);
+ });
}
function post_comment(id) {
@@ -1022,7 +1005,7 @@ $(window).scroll(function () {
$('#more').show();
}
- if($(window).scrollTop() + $(window).height() == $(document).height()) {
+ if($(window).scrollTop() + $(window).height() > $(document).height() - 100) {
if((pageHasMoreContent) && (! loadingPage)) {
$('#more').hide();
$('#no-more').hide();
@@ -1032,7 +1015,6 @@ $(window).scroll(function () {
loadingPage = true;
liveUpdate();
}
-
}
}
});