From 454aa6bff38ee540b7467f3caa3d6651b70f14ef Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 13 Oct 2013 20:09:11 -0700
Subject: turn off endless scroll if we have no more content to load -
 currently for mod_display, need to add to other content modules

---
 js/main.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'js/main.js')

diff --git a/js/main.js b/js/main.js
index d5260a4be..11a3b360c 100644
--- a/js/main.js
+++ b/js/main.js
@@ -137,7 +137,9 @@
 			e.tipTip({defaultPosition: pos, edgeOffset: 8});
 		});*/
 		
-		
+		var e = document.getElementById('content-complete');
+		if(typeof e !== 'undefined')
+			pageHasMoreContent = false;		
 		
 		/* setup onoff widgets */
 		$(".onoff input").each(function(){
-- 
cgit v1.2.3


From 3991db62d49878bc7e48d1ab1b71bad5ad925785 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 13 Oct 2013 21:21:13 -0700
Subject: fix endless scroll

---
 js/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/main.js')

diff --git a/js/main.js b/js/main.js
index 11a3b360c..432b02bee 100644
--- a/js/main.js
+++ b/js/main.js
@@ -138,7 +138,7 @@
 		});*/
 		
 		var e = document.getElementById('content-complete');
-		if(typeof e !== 'undefined')
+		if(e)
 			pageHasMoreContent = false;		
 		
 		/* setup onoff widgets */
-- 
cgit v1.2.3


From b4efbfbce73336829aee75843cf1d18fdd7c031f Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 20 Oct 2013 21:02:24 -0700
Subject: partial fix for issue #123 - this doesn't actually fix the reported
 problem, but does instantly reset the notification count when you click 'mark
 all xyz notifications seen'

---
 js/main.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'js/main.js')

diff --git a/js/main.js b/js/main.js
index 432b02bee..a19f9feb6 100644
--- a/js/main.js
+++ b/js/main.js
@@ -98,6 +98,7 @@
   function markRead(notifType) {
 	$.get('ping?f=&markRead='+notifType);
 	if(timer) clearTimeout(timer);
+	$('#' + notifType + '-update').html('');
 	timer = setTimeout(NavUpdate,2000);
   }
 
-- 
cgit v1.2.3


From d98da77f2a093c662006936c2fc5521f17518d8f Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 20 Oct 2013 21:11:21 -0700
Subject: issue #123 - this will leave a very very short interval between the
 time a notification shows up and the time it is cleared. This is about as
 fast as we can clear it. Previously it could have been as long as the network
 poll interval.

---
 js/main.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'js/main.js')

diff --git a/js/main.js b/js/main.js
index a19f9feb6..79f11f424 100644
--- a/js/main.js
+++ b/js/main.js
@@ -576,7 +576,8 @@ function updateConvItems(mode,data) {
 			updateConvItems(update_mode,data);
 			$("#page-spinner").spin(false);
 			$("#profile-jot-text-loading").spin(false);
-
+			if(timer) clearTimeout(timer);
+			timer = setTimeout(NavUpdate,10);
 		});
 
 
-- 
cgit v1.2.3