aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-12-09 13:43:15 -0800
committerfriendica <info@friendica.com>2013-12-09 13:43:15 -0800
commitf8e19271502035473197c8bf1b4cd267aa827851 (patch)
treeed6c5c0ecec54cf27b0e1b29aac05abd860f24a8
parent7459d2c9e33290b27982e2be66d9a2b7a607715a (diff)
downloadvolse-hubzilla-f8e19271502035473197c8bf1b4cd267aa827851.tar.gz
volse-hubzilla-f8e19271502035473197c8bf1b4cd267aa827851.tar.bz2
volse-hubzilla-f8e19271502035473197c8bf1b4cd267aa827851.zip
this should fix the "always loads page 2 first if you're scrolled down the page a fair ways and reload the page".
-rw-r--r--js/main.js53
1 files changed, 25 insertions, 28 deletions
diff --git a/js/main.js b/js/main.js
index f9dc95daa..ba36861b2 100644
--- a/js/main.js
+++ b/js/main.js
@@ -150,7 +150,7 @@
var scroll_next = false;
var next_page = 1;
var page_load = true;
- var loadingPage = false;
+ var loadingPage = true;
var pageHasMoreContent = true;
var updateCountsOnly = false;
@@ -511,6 +511,10 @@ function updateConvItems(mode,data) {
}
prev = ident;
});
+
+ if(loadingPage) {
+ loadingPage = false;
+ }
}
$('.like-rotator').spin(false);
@@ -984,35 +988,28 @@ function previewTheme(elm) {
$(document).ready(function() {
-jQuery.timeago.settings.strings = {
- prefixAgo : aStr['t01'],
- prefixFromNow : aStr['t02'],
- suffixAgo : aStr['t03'],
- suffixFromNow : aStr['t04'],
- seconds : aStr['t05'],
- minute : aStr['t06'],
- minutes : aStr['t07'],
- hour : aStr['t08'],
- hours : aStr['t09'],
- day : aStr['t10'],
- days : aStr['t11'],
- month : aStr['t12'],
- months : aStr['t13'],
- year : aStr['t14'],
- years : aStr['t15'],
- wordSeparator : aStr['t16'],
- numbers : aStr['t17'],
-};
-
-
-$(".autotime").timeago();
-//$("div.wall-item-body").divgrow({ initialHeight: 400 });
-
-//reCalcHeight();
-
-
+ jQuery.timeago.settings.strings = {
+ prefixAgo : aStr['t01'],
+ prefixFromNow : aStr['t02'],
+ suffixAgo : aStr['t03'],
+ suffixFromNow : aStr['t04'],
+ seconds : aStr['t05'],
+ minute : aStr['t06'],
+ minutes : aStr['t07'],
+ hour : aStr['t08'],
+ hours : aStr['t09'],
+ day : aStr['t10'],
+ days : aStr['t11'],
+ month : aStr['t12'],
+ months : aStr['t13'],
+ year : aStr['t14'],
+ years : aStr['t15'],
+ wordSeparator : aStr['t16'],
+ numbers : aStr['t17'],
+ };
+ $(".autotime").timeago();
});